From 8994407e96b661a7c67606f45a0aab9420c85552 Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Tue, 8 Oct 2024 15:51:15 +0800
Subject: [PATCH] 优化

---
 src/assets/style/common.scss                           |   3 +++
 src/components/CompanyForm/index.vue                   |   8 ++++----
 src/components/InfoForm/index.vue                      |   6 +++---
 src/store/modules/user.js                              |   6 ++++++
 src/views/DisposalSuggestions/Form.vue                 |  10 +++++++++-
 src/views/DisposalSuggestions/HandleForm.vue           |   9 +++++++++
 src/views/DisposalSuggestions/index.vue                |  24 +++++++++++++++++++-----
 src/views/baseCaseHandling/Form.vue                    |  13 +++++++++----
 src/views/baseComapnyInfo/Form.vue                     |   6 +++---
 src/views/baseComapnyInfo/index.vue                    |  10 +++++++---
 src/views/baseInspectionReport/Form.vue                |   2 +-
 src/views/baseInspectionReport/index.vue               |  22 ++++++++++++++++++----
 src/views/basePrincipalResponsibility/Form.vue         |   2 +-
 src/views/baseSpecialAction/Form.vue                   |   2 +-
 src/views/baseSpecialAction/dynamicModel/list/Form.vue |   2 +-
 src/views/baseSystemInfo/DetailForm.vue                |  64 ++++++++++++++++++++++++++++++++--------------------------------
 src/views/baseSystemInfo/index.vue                     |   5 ++++-
 src/views/overView/Overview.vue                        | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
 18 files changed, 231 insertions(+), 90 deletions(-)

diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss
index 075a0e8..0c13132 100644
--- a/src/assets/style/common.scss
+++ b/src/assets/style/common.scss
@@ -80,6 +80,9 @@ a {
     &.w-120 {
       width: 120px;
     }
+    &.w-150 {
+      width: 150px;
+    }
     &.w-180 {
       width: 180px;
     }
diff --git a/src/components/CompanyForm/index.vue b/src/components/CompanyForm/index.vue
index dba2df1..d5ffe87 100644
--- a/src/components/CompanyForm/index.vue
+++ b/src/components/CompanyForm/index.vue
@@ -2,7 +2,7 @@
   <div class="companyForm">
     <div class="userSelect-input" @click="openDialog">
       <el-button type="text" icon="el-icon-circle-plus-outline" size="small"
-        >点击新增运营主体</el-button
+        >点击新增运营主体/个人</el-button
       >
     </div>
     <el-dialog
@@ -17,7 +17,7 @@
       class="NCC-dialog NCC-dialog_center company-dialog"
     >
 		<el-row :gutter="15" class="NCC-dialog-content">
-			<el-form ref="elForm" :model="dataForm" size="small" label-width="120px" label-position="right" :rules="rules">
+			<el-form ref="elForm" :model="dataForm" size="small" label-width="150px" label-position="right" :rules="rules">
 				<el-col :span="24" v-if="false">
 					<el-form-item label="主键" prop="id">
 						<el-input v-model="dataForm.id" placeholder="请输入" clearable :style='{ "width": "100%" }'>
@@ -25,8 +25,8 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
-					<el-form-item label="运营主体名称" prop="companyName">
-						<el-input v-model="dataForm.companyName" placeholder="请输入运营主体名称" clearable required
+					<el-form-item label="运营主体/个人名称" prop="companyName">
+						<el-input v-model="dataForm.companyName" placeholder="请输入运营主体/个人名称" clearable required
 							:style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue
index 0e80f13..fd095c5 100644
--- a/src/components/InfoForm/index.vue
+++ b/src/components/InfoForm/index.vue
@@ -22,15 +22,15 @@
         ref="infoForm"
         size="small"
         v-loading="infoForm_loading"
-        label-width="100px"
+        label-width="120px"
       >
         <el-row :gutter="20" style="margin: unset;">
           <el-col :span="24">
             <el-col :span="12">
-              <el-form-item label="运营主体" prop="companyId">
+              <el-form-item label="运营主体/个人" prop="companyId">
                 <el-select
                   v-model="infoForm.companyId"
-                  placeholder="请选择运营主体"
+                  placeholder="请选择运营主体/个人"
                   clearable
                   style="width: 100%"
                   @change="companyChange"
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index f457d6d..7a0ed97 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -19,6 +19,7 @@ const user = {
         menuList: [],
         socket: '',
         islader: false,
+        laderType: 0, // 0区县1外协2市级
     },
 
     mutations: {
@@ -55,6 +56,9 @@ const user = {
         SET_ISLADER: (state, islader) => {
             state.islader = islader
         },
+        SET_LADERTYPE: (state, laderType) => {
+            state.laderType = laderType
+        },
     },
 
     actions: {
@@ -193,6 +197,8 @@ const user = {
                     commit('SET_USERINFO', userInfo)
                     // 是否为市级领导
                     commit('SET_ISLADER', userInfo.organizeId == '580547494862128389')
+                    const laderTypeList = ['587869689288328453', '613171998939415813', '582426909564994821']
+                    commit('SET_LADERTYPE', laderTypeList.findIndex(v => v == userInfo.roleId))
                     commit('SET_MENULIST', menuList)
                     resolve(routerList)
                 }).catch(error => {
diff --git a/src/views/DisposalSuggestions/Form.vue b/src/views/DisposalSuggestions/Form.vue
index 55b2187..3c6740b 100644
--- a/src/views/DisposalSuggestions/Form.vue
+++ b/src/views/DisposalSuggestions/Form.vue
@@ -79,11 +79,19 @@
                 {{ dataForm.areaName || "--" }}
               </div>
             </el-col>
-            <el-col :span="24">
+            <!-- <el-col :span="24">
               <div class="form-item">
                 <div class="label w-100">所属外协：</div>
                 {{ dataForm.externalAssistanceId || "--" }}
               </div>
+            </el-col> -->
+            <el-col :span="24" v-if="dataForm.annex && dataForm.annex.length">
+              <div class="form-item">
+                <div class="label w-100">附件：</div>
+                <div class="text" style="width: calc(100% - 100px);">
+                  <NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
+                </div>
+              </div>
             </el-col>
             <el-col :span="24" v-if="dataForm.disposalSuggestions">
               <div class="form-item">
diff --git a/src/views/DisposalSuggestions/HandleForm.vue b/src/views/DisposalSuggestions/HandleForm.vue
index d8b7246..fdeea3c 100644
--- a/src/views/DisposalSuggestions/HandleForm.vue
+++ b/src/views/DisposalSuggestions/HandleForm.vue
@@ -62,12 +62,21 @@
                   {{ dataForm.questionClass || "--" }}
                 </div>
               </el-col>
+              <el-col :span="24" v-if="dataForm.annex && dataForm.annex.length">
+                <div class="form-item">
+                  <div class="label w-100">附件：</div>
+                  <div class="text" style="width: calc(100% - 100px);">
+                    <NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
+                  </div>
+                </div>
+              </el-col>
               <el-col :span="24" v-if="dataForm.judgmentOpinions">
                 <div class="form-item">
                   <div class="label w-100">处置建议：</div>
                   {{ dataForm.judgmentOpinions || "--" }}
                 </div>
               </el-col>
+             
             </el-row>
         </el-col>
         <el-col :span="14">
diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue
index 6b4ca09..4c6eab5 100644
--- a/src/views/DisposalSuggestions/index.vue
+++ b/src/views/DisposalSuggestions/index.vue
@@ -6,29 +6,42 @@
        <div class="NCC-common-layout-center">
            <el-row class="NCC-common-search-box" :gutter="16">
                <el-form @submit.native.prevent size="mini">
-                   <el-col :span="4">
+                    <el-col :span="5">
+                      <el-form-item label="">
+                        <el-date-picker
+                          v-model="query.creatorTime"
+                          type="datetimerange"
+                          value-format="timestamp"
+                          format="yyyy-MM-dd HH:mm:ss"
+                          start-placeholder="登记开始日期"
+                          end-placeholder="登记结束日期"
+                        >
+                        </el-date-picker>
+                      </el-form-item>
+                    </el-col>
+                   <el-col :span="3">
                        <el-form-item label="">
                            <el-input v-model="query.platformName" placeholder="请输入应用名称" clearable />	
                        </el-form-item>
                    </el-col>
-                   <el-col :span="4">
+                   <el-col :span="3">
                        <el-form-item label="">
                            <el-select v-model="query.platformType" placeholder="请选择应用类型" clearable >
                                <el-option v-for="(item, index) in systemTypeOptions" :key="index" :label="item.FullName" :value="item.Id"  />
                            </el-select>
                        </el-form-item>
                    </el-col>
-                   <!-- <el-col :span="4">
+                   <!-- <el-col :span="3">
                        <el-form-item label="">
                            <depSelect v-model="query.department" placeholder="请选择部门" />
                        </el-form-item>
                    </el-col> -->
-                   <el-col :span="4">
+                   <el-col :span="3">
                        <el-form-item label="">
                            <el-input v-model="query.questionType" placeholder="请选择问题类型" clearable />	
                        </el-form-item>
                    </el-col>
-                   <el-col :span="4">
+                   <el-col :span="3">
                        <el-form-item>
                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
                            <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
@@ -97,6 +110,7 @@
                    department:undefined,
                    questionType:undefined,
                    questionClass:undefined,
+                   creatorTime: [],
                },
                list: [],
                listLoading: true,
diff --git a/src/views/baseCaseHandling/Form.vue b/src/views/baseCaseHandling/Form.vue
index 9f468f0..7139f2b 100644
--- a/src/views/baseCaseHandling/Form.vue
+++ b/src/views/baseCaseHandling/Form.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="!dataForm.id ? '新建' : isDetail ? '详情' : formType ? '案件处理' : '编辑'"
+    :title="!dataForm.id ? '新增' : isDetail ? '详情' : formType == 1 ? '编辑' : '案件处理'"
     :close-on-click-modal="false"
     :visible.sync="visible"
     class="NCC-dialog NCC-dialog_center"
@@ -29,12 +29,17 @@
             <el-input v-model="dataForm.sourceRegistration" placeholder="请输入来源登记" clearable :disabled="formType != 0"/>
           </el-form-item>
         </el-col>
+        <!-- <el-col :span="24">
+          <el-form-item label="来源登记" prop="sourceRegistration">
+            <el-input v-model="dataForm.sourceRegistration" placeholder="请输入来源登记" clearable :disabled="formType != 0"/>
+          </el-form-item>
+        </el-col> -->
         <el-col :span="24">
-          <el-form-item label="运营主体" prop="registeredEntity">
+          <el-form-item label="运营主体/个人" prop="registeredEntity">
             <el-select
               ref="companySelect"
               v-model="dataForm.registeredEntity"
-              placeholder="请选择运营主体"
+              placeholder="请选择运营主体/个人"
               clearable
               filterable 
               style="width: 100%"
@@ -218,7 +223,7 @@
         <div class="text">{{ dataForm.systemNameStr || '--' }}</div>
       </el-col>
       <el-col class="form-item">
-        <div class="label w-180">运营主体：</div>
+        <div class="label w-180">运营主体/个人：</div>
         <div class="text">{{ dataForm.registeredEntityStr || '--' }}</div>
       </el-col>
       <el-col class="form-item">
diff --git a/src/views/baseComapnyInfo/Form.vue b/src/views/baseComapnyInfo/Form.vue
index 0f4dc4f..c00c704 100644
--- a/src/views/baseComapnyInfo/Form.vue
+++ b/src/views/baseComapnyInfo/Form.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false"
+	<el-dialog :title="!dataForm.id ? '新增' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false"
 		:visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="70%" v-loading="loading">
 		<el-row :gutter="15" class="NCC-dialog-content">
 			<el-form ref="elForm" :model="dataForm" size="small" label-width="120px" label-position="right"
@@ -11,8 +11,8 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
-					<el-form-item label="运营主体名称" prop="companyName">
-						<el-input v-model="dataForm.companyName" placeholder="请输入运营主体名称" clearable required
+					<el-form-item label="运营主体/个人名称" prop="companyName">
+						<el-input v-model="dataForm.companyName" placeholder="请输入运营主体/个人名称" clearable required
 							:style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
diff --git a/src/views/baseComapnyInfo/index.vue b/src/views/baseComapnyInfo/index.vue
index fbf0f3c..fca40d0 100644
--- a/src/views/baseComapnyInfo/index.vue
+++ b/src/views/baseComapnyInfo/index.vue
@@ -1,13 +1,13 @@
 <template>
   <div>
     <div class="common-info-box item-box companyInfo">
-      <div class="item-title">公司信息</div>
+      <div class="item-title">运营主体信息</div>
       <div class="item-body">
         <div class="NCC-common-layout-center">
           <el-row class="NCC-common-search-box" :gutter="16">
             <el-form @submit.native.prevent size="mini">
               <el-col :span="4">
-                <el-form-item label="">
+                <el-form-item label=""  v-if="laderType != 0">
                   <el-select v-model="query.areaId" placeholder="请选择所属区（市）县" clearable>
                     <el-option v-for="item in areaOptions" :key="item.id" :label="item.fullName" :value="item.id"/>
                   </el-select>
@@ -126,7 +126,11 @@ export default {
       ],
     };
   },
-  computed: {},
+  computed: {
+    laderType() {
+      return this.$store.state.user.laderType;
+    }
+  },
   created() {
     this.initAreaTypeList();
     this.initData();
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index 6a87d78..019bc44 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'"
+    :title="!dataForm.id ? '新增' : isDetail ? '详情' : '编辑'"
     :close-on-click-modal="false"
     :visible.sync="visible"
     class="NCC-dialog NCC-dialog_center dialog-box baseInspectionReportForm"
diff --git a/src/views/baseInspectionReport/index.vue b/src/views/baseInspectionReport/index.vue
index 1b68064..22de56d 100644
--- a/src/views/baseInspectionReport/index.vue
+++ b/src/views/baseInspectionReport/index.vue
@@ -6,24 +6,37 @@
 		<div class="NCC-common-layout-center">
 			<el-row class="NCC-common-search-box" :gutter="16">
 				<el-form @submit.native.prevent size="mini">
-					<el-col :span="4">
+                    <el-col :span="5">
+                      <el-form-item label="">
+                        <el-date-picker
+                          v-model="query.creatorTime"
+                          type="datetimerange"
+                          value-format="timestamp"
+                          format="yyyy-MM-dd HH:mm:ss"
+                          start-placeholder="登记开始日期"
+                          end-placeholder="登记结束日期"
+                        >
+                        </el-date-picker>
+                      </el-form-item>
+                    </el-col>
+					<el-col :span="3">
 						<el-form-item label="">
 							<el-input v-model="query.platformName" placeholder="请输入应用名称" clearable />	
 						</el-form-item>
 					</el-col>
-					<el-col :span="4">
+					<el-col :span="3">
 						<el-form-item label="">
 							<el-select v-model="query.platformType" placeholder="请选择系统类型" clearable >
 								<el-option v-for="(item, index) in systemTypeOptions" :key="index" :label="item.FullName" :value="item.Id"  />
 							</el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :span="4">
+					<el-col :span="3">
 						<el-form-item label="">
 							<el-input v-model="query.questionType" placeholder="请选择问题类型" clearable />	
 						</el-form-item>
 					</el-col>
-					<el-col :span="4">
+					<el-col :span="3">
 						<el-form-item>
                             <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
                             <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
@@ -103,6 +116,7 @@
                     department:undefined,
                     questionType:undefined,
                     questionClass:undefined,
+                    creatorTime: [],
 				},
                 list: [],
                 listLoading: true,
diff --git a/src/views/basePrincipalResponsibility/Form.vue b/src/views/basePrincipalResponsibility/Form.vue
index e2b8355..10eedb6 100644
--- a/src/views/basePrincipalResponsibility/Form.vue
+++ b/src/views/basePrincipalResponsibility/Form.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center basePrincipalResponsibilityForm" lock-scroll width="40%">
+	<el-dialog :title="!dataForm.id ? '新增' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center basePrincipalResponsibilityForm" lock-scroll width="40%">
 		<el-row :gutter="15" class="NCC-dialog-content" v-loading="dialogLoading">
 				<el-form ref="elForm" :model="dataForm" size="small" label-width="110px" label-position="right" :disabled="!!isDetail" :rules="rules">
 					<el-col :span="24" v-if="false" >
diff --git a/src/views/baseSpecialAction/Form.vue b/src/views/baseSpecialAction/Form.vue
index fd5e145..53b4004 100644
--- a/src/views/baseSpecialAction/Form.vue
+++ b/src/views/baseSpecialAction/Form.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'"
+    :title="!dataForm.id ? '新增' : isDetail ? '详情' : '编辑'"
     :close-on-click-modal="false"
     :visible.sync="visible"
     class="NCC-dialog NCC-dialog_center"
diff --git a/src/views/baseSpecialAction/dynamicModel/list/Form.vue b/src/views/baseSpecialAction/dynamicModel/list/Form.vue
index ba99753..d6835bf 100644
--- a/src/views/baseSpecialAction/dynamicModel/list/Form.vue
+++ b/src/views/baseSpecialAction/dynamicModel/list/Form.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
 
-    <el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false" :visible.sync="visible"
+    <el-dialog :title="!dataForm.id ? '新增' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false" :visible.sync="visible"
       class="NCC-dialog NCC-dialog_center" lock-scroll :width="formConf.generalWidth" :modal="false">
       <parser :form-conf="formConf" @submit="sumbitForm" :key="key" ref="dynamicForm" :setFormData="setFormData"
         :setShowOrHide="setShowOrHide" :setRequired="setRequired" :setDisabled="setDisabled"
diff --git a/src/views/baseSystemInfo/DetailForm.vue b/src/views/baseSystemInfo/DetailForm.vue
index e538e6a..a74e2b1 100644
--- a/src/views/baseSystemInfo/DetailForm.vue
+++ b/src/views/baseSystemInfo/DetailForm.vue
@@ -13,25 +13,25 @@
           <div class="system-info" style="overflow:auto;height: calc(65vh - 65px); margin-bottom: -10px;">
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">运营主体:</div>
+                    <div class="label w-120">运营主体/个人:</div>
                     <p class="text">{{ dataForm.companyName || '--' }}</p>
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">应用类型:</div>
+                    <div class="label w-120">应用类型:</div>
                     <p class="text">{{ dataForm.systemType | dynamicTextUP(systemTypeOptions) }}</p>
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">应用名称:</div>
+                    <div class="label w-120">应用名称:</div>
                     <p class="text">{{ dataForm.systemName || "--" }}</p>
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">应用分类:</div>
+                    <div class="label w-120">应用分类:</div>
                     <p class="text">{{ dataForm.systemClass | dynamicTextClassName(systemClassOptions) }}</p>
                 </div>
             </el-col>
@@ -43,112 +43,112 @@
             >
               <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">特殊备案类型:</div>
+                    <div class="label w-120">特殊备案类型:</div>
                     <p class="text">{{ dataForm.specialRecordType || "--" }}</p>
                 </div>
               </el-col>
               <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">特殊备案内容:</div>
+                    <div class="label w-120">特殊备案内容:</div>
                     <p class="text">{{ dataForm.specialRecordContent || "--" }}</p>
                 </div>
               </el-col>
               <el-col :span="24" v-if="dataForm.systemType == '576280043370579205'">
                 <div class="form-item">
-                    <div class="label w-100">域名:</div>
+                    <div class="label w-120">域名:</div>
                     <p class="text">{{ dataForm.domain || "--" }}</p>
                 </div>
               </el-col>
               <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">特殊备案号:</div>
+                    <div class="label w-120">特殊备案号:</div>
                     <p class="text">{{ dataForm.specialRecordNumber || "--" }}</p>
                 </div>
               </el-col>
               <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">特殊备案时间:</div>
+                    <div class="label w-120">特殊备案时间:</div>
                     <p class="text">{{ ncc.dateFormat(dataForm.specialRecordTime, 'YYYY-MM-DD HH:mm:ss') || "--" }}</p>
                 </div>
               </el-col>
             </template>
             <el-col :span="24" v-if="dataForm.systemType == '576280004254500101'">
               <div class="form-item">
-                  <div class="label w-100">安装次数:</div>
+                  <div class="label w-120">安装次数:</div>
                   <p class="text">{{ dataForm.systemDownloadVolume || "--" }}<span class="start-span">更新时间：{{ ncc.dateFormat(dataForm.lastModifyTime) || ncc.dateFormat(dataForm.creatorTime) }}</span></p>
               </div>
             </el-col>
             <el-col :span="24" v-if="dataForm.systemType == '576280043370579205' || dataForm.systemType == '576280085330396421'">
               <div class="form-item">
-                  <div class="label w-100">月活:</div>
+                  <div class="label w-120">月活:</div>
                   <p class="text">{{ dataForm.MAU || "--" }}<span class="start-span">更新时间：{{ ncc.dateFormat(dataForm.lastModifyTime) || ncc.dateFormat(dataForm.creatorTime) }}</span></p>
               </div>
             </el-col>
             <el-col :span="24" v-if="dataForm.systemType == '580634746028033285'">
               <div class="form-item">
-                  <div class="label w-100">粉丝量:</div>
+                  <div class="label w-120">粉丝量:</div>
                   <p class="text">{{ dataForm.followerCount || "--" }}<span class="start-span">更新时间：{{ ncc.dateFormat(dataForm.lastModifyTime) || ncc.dateFormat(dataForm.creatorTime) }}</span></p>
               </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">备案许可证:</div>
+                    <div class="label w-120">备案许可证:</div>
                     <p class="text">{{ dataForm.recordLicense || "--" }}</p>
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">归属平台:</div>
+                    <div class="label w-120">归属平台:</div>
                     <p class="text">{{ dataForm.platform || "--" }}</p>
                 </div>
             </el-col>
             
             <!-- <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">下载量:</div>
+                    <div class="label w-120">下载量:</div>
                     <p class="text">{{ dataForm.systemDownloadVolume || "--" }}</p>
                 </div>
             </el-col> -->
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">版本:</div>
+                    <div class="label w-120">版本:</div>
                     <p class="text">{{ dataForm.version || "--" }}</p>
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">负责人姓名:</div>
+                    <div class="label w-120">负责人姓名:</div>
                     {{ dataForm.principalName || "--" }}
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">负责人电话:</div>
+                    <div class="label w-120">负责人电话:</div>
                     {{ dataForm.principalPhone || "--" }}
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">办公地址:</div>
+                    <div class="label w-120">办公地址:</div>
                     <p class="text">{{ dataForm.officeAddress || "--" }}</p>
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">应用图标:</div>
+                    <div class="label w-120">应用图标:</div>
                     <img v-if="dataForm.systemIconModel" class="avatar" :src="define.comUrl + dataForm.systemIconModel.url">
                     <span v-else>无</span>
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">所属区域:</div>
+                    <div class="label w-120">所属区域:</div>
                     <p class="text">{{ dataForm.areaId | dynamicText(areaOptions) }}</p>
                 </div>
             </el-col>
             <!-- <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">所属外协:</div>
+                    <div class="label w-120">所属外协:</div>
                     <p class="text">{{ dataForm.externalAssistanceId ? '外协一' : "--" }}</p>
                 </div>
             </el-col> -->
@@ -158,57 +158,57 @@
           <div class="company-info">
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">运营主体名称:</div>
+                    <div class="label w-120">运营主体/个人名称:</div>
                     <p class="text">{{ companyForm.companyName || "--" }}</p>
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                  <div class="label w-100">社会信用代码:</div>
+                  <div class="label w-120">社会信用代码:</div>
                   <p class="text">{{ companyForm.socialCreditAgency || "--" }}</p>
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">运营主体法人:</div>
+                    <div class="label w-120">运营主体法人:</div>
                     <p class="text">{{ companyForm.legalPerson || "--" }}</p>
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">运营主体地址:</div>
+                    <div class="label w-120">运营主体地址:</div>
                     <p class="text">{{ companyForm.address || "--" }}</p>
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">资质证明:</div>
-                  <div class="text" style="width: calc(100% - 100px);">
+                    <div class="label w-120">资质证明:</div>
+                  <div class="text" style="width: calc(120% - 120px);">
                     <NCC-UploadFz v-model="companyForm.qualificationCertificate" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
                   </div>
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">联系人:</div>
+                    <div class="label w-120">联系人:</div>
                     <p class="text">{{ companyForm.contactUser || "--" }}</p>
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">联系电话:</div>
+                    <div class="label w-120">联系电话:</div>
                     <p class="text">{{ companyForm.contactPhone || "--" }}</p>
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">所属区县:</div>
+                    <div class="label w-120">所属区县:</div>
                     <p class="text">{{ companyForm.areaName || "--" }}</p>
                 </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-100">其他信息:</div>
+                    <div class="label w-120">其他信息:</div>
                     <div v-html="companyForm.otherInfo"></div>
                 </div>
             </el-col>
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index 73823d9..ef91391 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -12,7 +12,7 @@
                   <el-input clearable v-model="query.keyword" placeholder="请输入应用名称、运营主体名称进行查询"/>
                 </el-form-item>
               </el-col> -->
-              <el-col :span="3">
+              <el-col :span="3" v-if="laderType != 0">
                 <el-form-item label="">
                   <el-select v-model="query.areaId" placeholder="请选择所属区（市）县" clearable>
                     <el-option v-for="item in areaOptions" :key="item.id" :label="item.fullName" :value="item.id"/>
@@ -207,6 +207,9 @@ export default {
       // 判断角色是否为‘市级办公室’
       return this.$store.state.user.islader;
     },
+    laderType() {
+      return this.$store.state.user.laderType;
+    }
   },
   watch: {
     $route: {
diff --git a/src/views/overView/Overview.vue b/src/views/overView/Overview.vue
index 1fe30ad..d5e02de 100644
--- a/src/views/overView/Overview.vue
+++ b/src/views/overView/Overview.vue
@@ -18,7 +18,7 @@
                 <el-table-column type="index" width="40"> </el-table-column>
                 <el-table-column prop="taskTitle" label="任务名称" show-overflow-tooltip/>
                 <el-table-column prop="taskType" label="任务类型" show-overflow-tooltip width="100"/>
-                <el-table-column prop="taskContent" label="任务内容" show-overflow-tooltip />
+                <el-table-column prop="taskContent" label="任务内容" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="taskState" label="状态" show-overflow-tooltip width="80">
                   <template slot-scope="scope">
                     <el-tag type="success">{{ scope.row.taskState }}</el-tag>
@@ -132,12 +132,27 @@
     <MsgForm v-if="MsgFormVisible" ref="MsgForm" @refresh="msgRefresh"/>
     <HandleInspectForm v-if="HandleInspectFormVisible" ref="HandleInspectForm" @refresh="(val) => {taskRefresh('HandleInspectFormVisible', val)}"/>
     <NCC-Form v-if="formVisible" ref="NCCForm" @refreshDataList="(val) => {taskRefresh('formVisible', val)}" />
+
       <!-- 案件处理 -->
     <HandForm v-if="HandFormVisible" ref="HandForm" @refresh="(val) => {taskRefresh('HandFormVisible', val)}" />
       <!-- 研判 -->
     <DisposalForm v-if="DisposalFormVisible" ref="DisposalForm" @refresh="(val) => {taskRefresh('DisposalFormVisible', val)}"/>
     <DisposalHandleForm v-if="DisposalHandleFormVisible" ref="DisposalHandleForm" @refresh="(val) => {taskRefresh('DisposalHandleFormVisible', val)}"/>
-
+    <el-dialog
+      title="专项行动详情"
+      :visible.sync="dialogVisible"
+      class="NCC-dialog NCC-dialog_center baseSpecialAction"
+      width="60%"
+      :before-close="closeDis">
+      <el-row :gutter="15" class="NCC-dialog-content">
+        <h4>{{dataForm.title}}</h4>
+        <div class="content" v-html="dataForm.content"></div>
+      </el-row>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="handleEditForm(dataForm.row)">填写表单</el-button>
+        <el-button @click="closeDis">取 消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -188,6 +203,8 @@ export default {
       HandFormVisible: false,
       DisposalHandleFormVisible: false,
       DisposalFormVisible: false,
+      dialogVisible: false,
+      dataForm: {},
     };
   },
   created() {
@@ -309,30 +326,36 @@ export default {
     },
     async handleTask(row) {
       if(row.taskType == '专项行动') {
-        let loadingInstance = Loading.service({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(255, 255, 255, 0.7)'
-        });
-        this.formVisible = true;
-        // let data = await this.getBaseSpecialActionInfo('588008032122701061');
-        let data = await this.getBaseSpecialActionInfo(row.taskCorrelationId);
-        var  Itemid = data.itemId || '';//数据id，没有的话就是新增 ，有的话就是修改
-        var  modelId = data.formId;//关联的表单id
-        var taskId = data.id; // 当前专项行动id
-        var isPreview = false;//固定死，值不变
-        var useFormPermission = false;//固定死，值不变
-        var formData = [];
-        request({
-          url: '/visualdev/OnlineDev/'+modelId+'/Config',
-          method: "GET",
-          params:null
-        }).then(res => {
-          formData = res.data.formData;
-          this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId);
-          loadingInstance.close();
-        });
+        this.dialogVisible = true;
+        this.dataForm = {
+          content: row.taskContent,
+          title: row.taskTitle,
+          row: row,
+        };
+        // let loadingInstance = Loading.service({
+        //   lock: true,
+        //   text: 'Loading',
+        //   spinner: 'el-icon-loading',
+        //   background: 'rgba(255, 255, 255, 0.7)'
+        // });
+        // this.formVisible = true;
+        // // let data = await this.getBaseSpecialActionInfo('588008032122701061');
+        // let data = await this.getBaseSpecialActionInfo(row.taskCorrelationId);
+        // var  Itemid = data.itemId || '';//数据id，没有的话就是新增 ，有的话就是修改
+        // var  modelId = data.formId;//关联的表单id
+        // var taskId = data.id; // 当前专项行动id
+        // var isPreview = false;//固定死，值不变
+        // var useFormPermission = false;//固定死，值不变
+        // var formData = [];
+        // request({
+        //   url: '/visualdev/OnlineDev/'+modelId+'/Config',
+        //   method: "GET",
+        //   params:null
+        // }).then(res => {
+        //   formData = res.data.formData;
+        //   this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId);
+        //   loadingInstance.close();
+        // });
       } else {
         let type = row.taskType;
         if(row.taskType == '核查处理' || row.taskType == '研判') {
@@ -346,6 +369,37 @@ export default {
         })
       }
     },
+    closeDis() {
+      this.dialogVisible = false; 
+      this.dataForm = {};
+      this.$forceUpdate();
+    },
+    async handleEditForm(row) {
+      let loadingInstance = Loading.service({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(255, 255, 255, 0.7)'
+      });
+      this.formVisible = true;
+      // let data = await this.getBaseSpecialActionInfo('588008032122701061');
+      let data = await this.getBaseSpecialActionInfo(row.taskCorrelationId);
+      var  Itemid = data.itemId || '';//数据id，没有的话就是新增 ，有的话就是修改
+      var  modelId = data.formId;//关联的表单id
+      var taskId = data.id; // 当前专项行动id
+      var isPreview = false;//固定死，值不变
+      var useFormPermission = false;//固定死，值不变
+      var formData = [];
+      request({
+        url: '/visualdev/OnlineDev/'+modelId+'/Config',
+        method: "GET",
+        params:null
+      }).then(res => {
+        formData = res.data.formData;
+        this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId);
+        loadingInstance.close();
+      });
+    },
     getDialog(type) {
       switch (type) {
         case '归属地变更':
@@ -377,6 +431,7 @@ export default {
     },
     taskRefresh(key, val) {
       this[key] = false;
+      key == 'formVisible' && (this.dialogVisible = false);
       val && this.getAllTaskList();
     }
   },
@@ -500,4 +555,24 @@ export default {
     }
   }
 }
+.baseSpecialAction {
+  h4 {
+    text-align: center;
+    line-height: 40px;
+    border-bottom: 1px solid #ccc;
+  }
+  .content {
+    padding: 20px;
+    border-bottom: 1px solid #ccc;
+  }
+  .tag-group {
+    margin: 10px 0;
+  }
+  .title-tag {
+    margin: 5px 8px;
+  }
+  :deep(.el-tag) {
+    margin: 4px 4px;
+  }
+}
 </style>
--
libgit2 0.21.4