From 93186f57197c321120355c7d2ce7a55436e38526 Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Fri, 26 Jul 2024 17:36:55 +0800
Subject: [PATCH] 前端整改页面

---
 src/views/DisposalSuggestions/Form.vue            |  24 ++++++++++++------------
 src/views/baseComapnyInfo/Form.vue                |   7 -------
 src/views/baseInspectionReport/Form.vue           |  90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
 src/views/baseInspectionReport/index.vue          |   3 ---
 src/views/baseSpecialAction/Form.vue              | 427 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/baseSpecialAction/index.vue             |  52 ++++++++++++++++++----------------------------------
 src/views/baseSystemInfo/ChangeRecord.vue         |  56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/baseSystemInfo/Form.vue                 | 295 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/baseSystemInfo/index.vue                |  31 ++++++++++++++++++++++++++-----
 src/views/homePage/components/Header.vue          |   2 +-
 src/views/homePage/components/news/NewsDialog.vue |  40 +++++++++++++++++++++++++---------------
 src/views/homePage/components/news/index.vue      |  18 ++++++++++--------
 src/views/overView/Overview.vue                   |  12 ++++++------
 13 files changed, 434 insertions(+), 623 deletions(-)
 create mode 100644 src/views/baseSystemInfo/ChangeRecord.vue
 delete mode 100644 src/views/baseSystemInfo/Form.vue

diff --git a/src/views/DisposalSuggestions/Form.vue b/src/views/DisposalSuggestions/Form.vue
index 61c8378..e170dfc 100644
--- a/src/views/DisposalSuggestions/Form.vue
+++ b/src/views/DisposalSuggestions/Form.vue
@@ -68,21 +68,14 @@
 			</el-col>
 			<el-form ref="suggestionForm" :model="suggestionForm" size="small" label-width="100px" label-position="right">
 				<el-col :span="24">
-					<el-form-item label="处置建议" prop="disposalSuggestions">
+					<el-form-item :label="isSHILevel ? '处置要求' : '处置建议'" prop="disposalSuggestions">
 						<el-input v-model="suggestionForm.disposalSuggestions" placeholder="请输入处置建议" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
 						</el-input>
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
-					<el-form-item label="判断意见" prop="judgmentOpinions">
-						<el-input v-model="suggestionForm.judgmentOpinions" placeholder="请输入判断意见" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24">
-					<el-form-item label="判断分类" prop="judgmentClass">
-						<el-input v-model="suggestionForm.judgmentClass" placeholder="请输入判断分类" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
-						</el-input>
+					<el-form-item label="截止时间" prop="endTime">
+						<el-date-picker v-model="suggestionForm.endTime" type="date" placeholder="选择日期"></el-date-picker>
 					</el-form-item>
 				</el-col>
 			</el-form>
@@ -90,6 +83,7 @@
 		<span slot="footer" class="dialog-footer">
 			<el-button @click="visible = false">取 消</el-button>
 			<el-button type="primary" @click="dataFormSubmit()">确 定</el-button>
+			<el-button type="primary" @click="dataFormSubmit()">存 档</el-button>
 		</span>
 	</el-dialog>
 </template>
@@ -127,11 +121,17 @@
 				suggestionForm: {
 					disposalSuggestions: "", //处置建议
 					judgmentOpinions: "", //判断意见
-					judgmentClass: "" //判断分类
+					judgmentClass: "", //判断分类
+					endTime: '',
 				}
 			}
 		},
-		computed: {},
+		computed: {
+			isSHILevel() {
+    		  // 判断角色是否为‘市级办公室’
+    		  return this.$store.state.user.userInfo.organizeId == '580547494862128389';
+    		},
+		},
         watch: {},
         created() {
 			this.getplatformTypeOptions();
diff --git a/src/views/baseComapnyInfo/Form.vue b/src/views/baseComapnyInfo/Form.vue
index 9c5c2b8..d2d87f4 100644
--- a/src/views/baseComapnyInfo/Form.vue
+++ b/src/views/baseComapnyInfo/Form.vue
@@ -44,13 +44,6 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
-					<el-form-item label="资质证明" prop="qualificationCertificate">
-						<NCC-UploadFz v-model="dataForm.qualificationCertificate" :fileSize="5" sizeUnit="MB" :limit="9"
-							buttonText="点击上传">
-						</NCC-UploadFz>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24">
 					<el-form-item label="其他信息" prop="otherInfo">
 						<NCC-Quill v-model="dataForm.otherInfo" placeholder="请输入内容...">
 						</NCC-Quill>
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index 16c0755..c3e4435 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -17,7 +17,7 @@
         :disabled="!!isDetail"
         :rules="rules"
       >
-        <el-col :span="24" v-if="false">
+        <el-col :span="23" v-if="false">
           <el-form-item label="主键" prop="id">
             <el-input
               v-model="dataForm.id"
@@ -28,7 +28,18 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="23">
+          <el-form-item label="问题来源" prop="platformName">
+            <el-input
+              v-model="dataForm.platformName"
+              placeholder="请输入问题来源"
+              clearable
+              :style="{ width: '100%' }"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="23">
           <el-form-item label="平台名称" prop="platformName">
             <SelsctLoad v-model="dataForm.platformName"/>
             <!-- <el-input
@@ -40,25 +51,20 @@
             </el-input> -->
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="23">
           <el-form-item label="平台类型" prop="platformType">
-            <el-select
-              v-model="dataForm.platformType"
-              placeholder="请选择"
-              clearable
-              :style="{ width: '100%' }"
-            >
-              <el-option
+            <el-radio-group v-model="dataForm.platformType" :style="{}">
+              <el-radio
                 v-for="(item, index) in platformTypeOptions"
                 :key="index"
-                :label="item.FullName"
-                :value="item.Id"
-              ></el-option>
-            </el-select>
+                :label="item.Id"
+                >{{ item.FullName }}</el-radio
+              >
+            </el-radio-group>
           </el-form-item>
         </el-col>
 
-        <el-col :span="24">
+        <el-col :span="23">
           <el-form-item label="问题类型" prop="questionType">
             <el-radio-group v-model="dataForm.questionType" :style="{}">
               <el-radio
@@ -70,8 +76,8 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="问题分类" prop="questionClass">
+        <el-col :span="23">
+          <el-form-item label="关键词" prop="questionClass">
             <el-select
               v-model="dataForm.questionClass"
               placeholder="请选择"
@@ -87,7 +93,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="23">
           <el-form-item label="问题内容" prop="questionContent">
             <el-input
               v-model="dataForm.questionContent"
@@ -100,7 +106,7 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="23">
           <el-form-item label="有害链接" prop="link">
             <el-input
               v-model="dataForm.link"
@@ -111,22 +117,32 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="取证内容" prop="obtainEvidence">
-            <NCC-UploadFz
-              v-model="dataForm.obtainEvidence"
-              :fileSize="5"
-              sizeUnit="MB"
-              :limit="9"
-              buttonText="点击上传"
+        <el-col :span="12">
+          <el-form-item label="正确描述" prop="platformName">
+            <el-input
+              v-model="dataForm.platformName"
+              placeholder="请输入正确描述"
+              clearable
+              :style="{ width: '100%' }"
             >
-            </NCC-UploadFz>
+            </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
-          <el-form-item label="附件上传" prop="annex">
+        <el-col :span="11">
+          <el-form-item label="错误描述" prop="platformName">
+            <el-input
+              v-model="dataForm.platformName"
+              placeholder="请输入错误描述"
+              clearable
+              :style="{ width: '100%' }"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="23">
+          <el-form-item label="取证内容" prop="obtainEvidence">
             <NCC-UploadFz
-              v-model="dataForm.annex"
+              v-model="dataForm.obtainEvidence"
               :fileSize="5"
               sizeUnit="MB"
               :limit="9"
@@ -169,7 +185,17 @@ export default {
         obtainEvidence: [],
         annex: [],
       },
-      rules: {},
+      rules: {
+        platformType: [
+          { required: true, message: "请选择平台类型", trigger: "change" },
+        ],
+        questionType: [
+          { required: true, message: "请选择问题类型", trigger: "change" },
+        ],
+        questionClass: [
+          { required: true, message: "请选择关键词", trigger: "change" },
+        ],
+      },
       sourceOptions: [
         { fullName: "市网信办线索", id: "市网信办线索" },
         { fullName: "自主巡查发现", id: "自主巡查发现" },
diff --git a/src/views/baseInspectionReport/index.vue b/src/views/baseInspectionReport/index.vue
index 7caa82d..686f37c 100644
--- a/src/views/baseInspectionReport/index.vue
+++ b/src/views/baseInspectionReport/index.vue
@@ -230,8 +230,5 @@
     height: calc(100% - 47px);
     overflow-y: scroll;
   }
-  .item-body {
-	height: calc(100% - 35px);
-  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/baseSpecialAction/Form.vue b/src/views/baseSpecialAction/Form.vue
index 40b1355..cb5a337 100644
--- a/src/views/baseSpecialAction/Form.vue
+++ b/src/views/baseSpecialAction/Form.vue
@@ -1,209 +1,226 @@
 <template>
-	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="70%">
-		<el-row :gutter="15" class="" >
-				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :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%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="ncc.hasFormP('specialActionType')">
-						<el-form-item label="类型" prop="specialActionType">
-							<el-select v-model="dataForm.specialActionType" placeholder="请选择" clearable required :style='{"width":"100%"}' >
-								<el-option v-for="(item, index) in specialActionTypeOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="ncc.hasFormP('title')">
-						<el-form-item label="标题" prop="title">
-							<el-input v-model="dataForm.title" placeholder="请输入" clearable required :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="ncc.hasFormP('content')">
-						<el-form-item label="内容" prop="content">
-							<el-input v-model="dataForm.content" placeholder="请输入" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="ncc.hasFormP('releaseTime')">
-						<el-form-item label="发布时间" prop="releaseTime">
-							<el-date-picker v-model="dataForm.releaseTime" placeholder="请选择" clearable :style='{"width":"100%"}' type='datetime' format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" >
-							</el-date-picker>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="ncc.hasFormP('annex')">
-						<el-form-item label="附件" prop="annex">
-							<NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
-							</NCC-UploadFz>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="ncc.hasFormP('communicationArea')">
-						<el-form-item label="传达区域" prop="communicationArea">
-							<el-checkbox-group v-model="dataForm.communicationArea" :style='{}' >
-								<el-checkbox v-for="(item, index) in communicationAreaOptions" :key="index" :label="item.id" >{{item.fullName}}</el-checkbox>
-							</el-checkbox-group>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="false" >
-						<el-form-item label="状态" prop="state">
-							<el-input v-model="dataForm.state" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="false" >
-						<el-form-item label="创建用户" prop="creatorUserId">
-							<el-input v-model="dataForm.creatorUserId" placeholder="系统自动生成" readonly >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="false" >
-						<el-form-item label="创建时间" prop="creatorTime">
-							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="false" >
-						<el-form-item label="修改用户" prop="lastModifyUserId">
-							<el-input v-model="dataForm.lastModifyUserId" placeholder="系统自动生成" readonly >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="false" >
-						<el-form-item label="修改时间" prop="lastModifyTime">
-							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
-							</el-input>
-						</el-form-item>
-					</el-col>
-				</el-form>
-		</el-row>
-		<span slot="footer" class="dialog-footer">
-			<el-button @click="visible = false">取 消</el-button>
-			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
-		</span>
-	</el-dialog>
+  <el-dialog
+    :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center"
+    lock-scroll
+    width="70%"
+  >
+    <el-row :gutter="15" style="padding-top: 10px">
+      <el-form
+        ref="elForm"
+        :model="dataForm"
+        size="small"
+        label-width="100px"
+        label-position="right"
+        :disabled="!!isDetail"
+        :rules="rules"
+      >
+        <el-col :span="23" v-if="false">
+          <el-form-item label="主键" prop="id">
+            <el-input
+              v-model="dataForm.id"
+              placeholder="请输入"
+              clearable
+              :style="{ width: '100%' }"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="23" v-if="ncc.hasFormP('title')">
+          <el-form-item label="标题" prop="title">
+            <el-input
+              v-model="dataForm.title"
+              placeholder="请输入"
+              clearable
+              required
+              :style="{ width: '100%' }"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="23" v-if="ncc.hasFormP('annex')">
+          <el-form-item label="附件" prop="annex">
+            <NCC-UploadFz
+              v-model="dataForm.annex"
+              :fileSize="5"
+              sizeUnit="MB"
+              :limit="9"
+              buttonText="点击上传"
+            >
+            </NCC-UploadFz>
+          </el-form-item>
+        </el-col>
+        <el-col :span="23" v-if="ncc.hasFormP('communicationArea')">
+          <el-form-item label="传达区域" prop="communicationArea">
+            <el-checkbox-group v-model="dataForm.communicationArea" :style="{}">
+              <el-checkbox
+                v-for="(item, index) in areaOptions"
+                :key="index"
+                :label="item.id"
+                >{{ item.fullName }}</el-checkbox
+              >
+            </el-checkbox-group>
+            <div style="margin-top: 10px">
+              <el-button size="mini" @click="selectAreaAll">全选</el-button>
+              <el-button size="mini" @click="closeAreaAll">反选</el-button>
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="23" v-if="ncc.hasFormP('communicationArea')">
+          <el-form-item label="传达外协" prop="communicationArea">
+            <el-checkbox-group v-model="dataForm.communicationArea" :style="{}">
+              <el-checkbox
+                v-for="(item, index) in communicationAreaOptions"
+                :key="index"
+                :label="item.id"
+                >{{ item.fullName }}</el-checkbox
+              >
+            </el-checkbox-group>
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取 消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
 </template>
 <script>
-	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-	import { previewDataInterface } from '@/api/systemData/dataInterface'
-	export default {
-		components: {},
-		props: [],
-		data() {
-			return {
-				loading: false,
-				visible: false,
-				isDetail: false,
-				dataForm: {
-					id:'',
-					id:undefined,
-					specialActionType:undefined,
-					title:undefined,
-					content:undefined,
-					releaseTime:undefined,
-					annex:[],
-					communicationArea:[],
-					state:undefined,
-					creatorUserId:undefined,
-					creatorTime:undefined,
-					lastModifyUserId:undefined,
-					lastModifyTime:undefined,
-				},
-				rules: {
-					specialActionType:[
-						{
-							required:true,
-							message:'请输入类型',
-							trigger:'change'
-						},
-					],
-					title:[
-						{
-							required:true,
-							message:'请输入标题',
-							trigger:'blur'
-						},
-					],
-				},
-				specialActionTypeOptions : [],
-				communicationAreaOptions:[],
-			}
-		},
-		computed: {},
-        watch: {},
-        created() {
-			this.getspecialActionTypeOptions();
-		},
-		mounted() {
-        },
-		methods: {
-			getspecialActionTypeOptions(){
-				getDictionaryDataSelector('576310654982423813').then(res => {
-					this.specialActionTypeOptions = res.data.list
-				});
-			},
-			goBack() {
-                this.$emit('refresh')
-            },
-			init(id, isDetail) {
-				this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-				this.$nextTick(() => {
-					this.$refs['elForm'].resetFields();
-					if (this.dataForm.id) {
-						request({
-							url: '/Extend/BaseSpecialAction/' + this.dataForm.id,
-							method: 'get'
-						}).then(res =>{
-							this.dataForm = res.data;
-							if(!this.dataForm.annex)this.dataForm.annex=[];
-							if(!this.dataForm.communicationArea)this.dataForm.communicationArea=[];
-						})
-					}
-				})
-			},
-			dataFormSubmit() {
-				this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                        if (!this.dataForm.id) {
-                            request({
-                                url: `/Extend/BaseSpecialAction`,
-                                method: 'post',
-                                data: this.dataForm,
-                            }).then((res) => {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'success',
-                                    duration: 1000,
-                                    onClose: () => {
-                                        this.visible = false,
-                                            this.$emit('refresh', true)
-                                    }
-                                })
-                            })
-                        } else {
-                            request({
-                                url: '/Extend/BaseSpecialAction/' + this.dataForm.id,
-                                method: 'PUT',
-                                data: this.dataForm
-                            }).then((res) => {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'success',
-                                    duration: 1000,
-                                    onClose: () => {
-                                        this.visible = false
-                                        this.$emit('refresh', true)
-                                    }
-                                })
-                            })
-                        }
-                    }
-                })
-			},
-		}
-	}
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import { previewDataInterface } from "@/api/systemData/dataInterface";
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      loading: false,
+      visible: false,
+      isDetail: false,
+      dataForm: {
+        id: "",
+        id: undefined,
+        specialActionType: undefined,
+        title: undefined,
+        content: undefined,
+        releaseTime: undefined,
+        annex: [],
+        communicationArea: [],
+        state: undefined,
+        creatorUserId: undefined,
+        creatorTime: undefined,
+        lastModifyUserId: undefined,
+        lastModifyTime: undefined,
+      },
+      rules: {
+        specialActionType: [
+          {
+            required: true,
+            message: "请输入类型",
+            trigger: "change",
+          },
+        ],
+        title: [
+          {
+            required: true,
+            message: "请输入标题",
+            trigger: "blur",
+          },
+        ],
+      },
+      areaOptions: [],
+      communicationAreaOptions: [],
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {
+    this.initAreaTypeList();
+  },
+  mounted() {},
+  methods: {
+    async initAreaTypeList() {
+      let list = this.$store.state.meta.area;
+      !list && (list = await this.$store.dispatch("getTypeListByCode", "area"));
+      this.areaOptions = list;
+    },
+    selectAreaAll() {
+      this.dataForm.communicationArea = this.areaOptions.map(
+        (option) => option.id
+      );
+    },
+    closeAreaAll() {
+      this.dataForm.communicationArea = this.areaOptions
+        .filter(
+          (option) => !this.dataForm.communicationArea.includes(option.id)
+        )
+        .map((option) => option.id);
+    },
+    goBack() {
+      this.$emit("refresh");
+    },
+    init(id, isDetail) {
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.isDetail = isDetail || false;
+      this.$nextTick(() => {
+        this.$refs["elForm"].resetFields();
+        if (this.dataForm.id) {
+          request({
+            url: "/Extend/BaseSpecialAction/" + this.dataForm.id,
+            method: "get",
+          }).then((res) => {
+            this.dataForm = res.data;
+            if (!this.dataForm.annex) this.dataForm.annex = [];
+            if (!this.dataForm.communicationArea)
+              this.dataForm.communicationArea = [];
+          });
+        }
+      });
+    },
+    dataFormSubmit() {
+      this.$refs["elForm"].validate((valid) => {
+        if (valid) {
+          if (!this.dataForm.id) {
+            request({
+              url: `/Extend/BaseSpecialAction`,
+              method: "post",
+              data: this.dataForm,
+            }).then((res) => {
+              this.$message({
+                message: res.msg,
+                type: "success",
+                duration: 1000,
+                onClose: () => {
+                  (this.visible = false), this.$emit("refresh", true);
+                },
+              });
+            });
+          } else {
+            request({
+              url: "/Extend/BaseSpecialAction/" + this.dataForm.id,
+              method: "PUT",
+              data: this.dataForm,
+            }).then((res) => {
+              this.$message({
+                message: res.msg,
+                type: "success",
+                duration: 1000,
+                onClose: () => {
+                  this.visible = false;
+                  this.$emit("refresh", true);
+                },
+              });
+            });
+          }
+        }
+      });
+    },
+  },
+};
 </script>
diff --git a/src/views/baseSpecialAction/index.vue b/src/views/baseSpecialAction/index.vue
index 02a4532..97351db 100644
--- a/src/views/baseSpecialAction/index.vue
+++ b/src/views/baseSpecialAction/index.vue
@@ -55,55 +55,42 @@
               </div>
             </div>
             <NCC-table v-loading="listLoading" :data="list">
-              <el-table-column prop="id" label="主键" align="left" />
-              <el-table-column
-                label="类型"
-                prop="specialActionType"
-                align="left"
-              >
-                <template slot-scope="scope">{{
-                  scope.row.specialActionType
-                    | dynamicText(specialActionTypeOptions)
-                }}</template>
-              </el-table-column>
-              <el-table-column prop="title" label="标题" align="left" />
+              <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/>
+              <el-table-column prop="title" label="标题" align="left" show-overflow-tooltip/>
               <el-table-column
                 prop="releaseTime"
                 label="发布时间"
                 align="left"
+                show-overflow-tooltip
               />
               <el-table-column
                 label="传达区域"
                 prop="communicationArea"
                 align="left"
+                show-overflow-tooltip
               >
                 <template slot-scope="scope">{{
                   scope.row.communicationArea
                     | dynamicText(communicationAreaOptions)
                 }}</template>
               </el-table-column>
-              <el-table-column prop="state" label="状态" align="left" />
               <el-table-column
-                prop="creatorUserId"
-                label="创建用户"
-                align="left"
-              />
-              <el-table-column
-                prop="creatorTime"
-                label="创建时间"
-                align="left"
-              />
-              <el-table-column
-                prop="lastModifyUserId"
-                label="修改用户"
+                label="传达外协"
+                prop="communicationArea"
                 align="left"
-              />
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">{{
+                  scope.row.communicationArea
+                    | dynamicText(communicationAreaOptions)
+                }}</template>
+              </el-table-column>
               <el-table-column
-                prop="lastModifyTime"
-                label="修改时间"
+                prop="creatorUserId"
+                show-overflow-tooltip
+                label="创建用户"
                 align="left"
               />
-              <el-table-column prop="content" label="内容" align="left" />
               <el-table-column label="操作" fixed="right" width="100">
                 <template slot-scope="scope">
                   <el-button
@@ -183,8 +170,8 @@ export default {
   },
   computed: {},
   created() {
-    // this.initData()
-    // this.getspecialActionTypeOptions();
+    this.initData()
+    this.getspecialActionTypeOptions();
   },
   methods: {
     getspecialActionTypeOptions() {
@@ -295,8 +282,5 @@ export default {
     height: calc(100% - 47px);
     overflow-y: scroll;
   }
-  .item-body {
-    height: calc(100% - 35px);
-  }
 }
 </style>
diff --git a/src/views/baseSystemInfo/ChangeRecord.vue b/src/views/baseSystemInfo/ChangeRecord.vue
new file mode 100644
index 0000000..7cf1b97
--- /dev/null
+++ b/src/views/baseSystemInfo/ChangeRecord.vue
@@ -0,0 +1,56 @@
+<template>
+  <!-- 整改清单 -->
+  <el-dialog
+    title="整改清单"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center"
+    lock-scroll
+    width="70%"
+  >
+    <el-row :gutter="15" style="height: 65vh;">
+      <el-table :data="tableData" style="width: 100%" v-loading="loading" stripe>
+		<el-table-column type="index" width="50" />
+        <el-table-column prop="date" label="整改原因" width="180" />
+        <el-table-column prop="date" label="整改内容" width="180" />
+        <el-table-column prop="date" label="整改人员" width="180" />
+        <el-table-column prop="name" label="开始时间" width="180" />
+        <el-table-column prop="address" label="完成时间" />
+      </el-table>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取 消</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import request from "@/utils/request";
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      loading: false,
+      visible: false,
+	  tableData: [{}],
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {
+	init(id) {
+		this.visible = true;
+		// this.loading = true;
+		this.tableData = [{}, {}, {},{}, {}, {},{}, {}, {},{}, {}, {},{}, {}, {},{}, {}, {},{}, {}, {},{}, {}, {},];
+		// request({
+		// 	url: "",
+		// 	method: "get",
+		// }).then(res => {
+		// 	this.tableData = res.data;
+		// });
+	},
+  },
+};
+</script>
diff --git a/src/views/baseSystemInfo/Form.vue b/src/views/baseSystemInfo/Form.vue
deleted file mode 100644
index edb8db0..0000000
--- a/src/views/baseSystemInfo/Form.vue
+++ /dev/null
@@ -1,295 +0,0 @@
-<template>
-	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="70%">
-		<el-row :gutter="15" class="" >
-				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :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%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="ncc.hasFormP('companyId')">
-						<el-form-item label="所属公司" prop="companyId">
-							<el-select v-model="dataForm.companyId" placeholder="请选择" clearable required :style='{"width":"100%"}' filterable >
-								<el-option v-for="(item, index) in companyIdOptions" :key="index" :label="item.F_CompanyName" :value="item.F_id" ></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12" v-if="ncc.hasFormP('systemClass')">
-						<el-form-item label="系统分类" prop="systemClass">
-							<el-select v-model="dataForm.systemClass" placeholder="请选择" clearable required :style='{"width":"100%"}' >
-								<el-option v-for="(item, index) in systemClassOptions" :key="index" :label="item.F_ClassName" :value="item.F_Id" ></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12" v-if="ncc.hasFormP('systemType')">
-						<el-form-item label="系统类型" prop="systemType">
-							<el-select v-model="dataForm.systemType" placeholder="请选择" clearable required :style='{"width":"100%"}' >
-								<el-option v-for="(item, index) in systemTypeOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="ncc.hasFormP('systemName')">
-						<el-form-item label="系统名称" prop="systemName">
-							<el-input v-model="dataForm.systemName" placeholder="请输入" clearable required :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12" v-if="ncc.hasFormP('systemState')">
-						<el-form-item label="状态" prop="systemState">
-							<el-radio-group v-model="dataForm.systemState" required :style='{}' >
-								<el-radio v-for="(item, index) in systemStateOptions" :key="index" :label="item.id"  >{{item.fullName}}</el-radio>
-							</el-radio-group>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12" v-if="ncc.hasFormP('systemChangeSituation')">
-						<el-form-item label="变更情况" prop="systemChangeSituation">
-							<el-radio-group v-model="dataForm.systemChangeSituation" required :style='{}' >
-								<el-radio v-for="(item, index) in systemChangeSituationOptions" :key="index" :label="item.id"  >{{item.fullName}}</el-radio>
-							</el-radio-group>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="ncc.hasFormP('systemIcon')">
-						<el-form-item label="系统图标" prop="systemIcon">
-							<NCC-UploadImg v-model="dataForm.systemIcon" :fileSize="5" sizeUnit="MB" :limit="9" >
-							</NCC-UploadImg>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="ncc.hasFormP('systemRecordNumber')">
-						<el-form-item label="备案号" prop="systemRecordNumber">
-							<el-input v-model="dataForm.systemRecordNumber" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="ncc.hasFormP('systemLocation')">
-						<el-form-item label="所在区县" prop="systemLocation">
-							<NCC-Address v-model="dataForm.systemLocation" placeholder="请选择" clearable :level="2" >
-							</NCC-Address>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="ncc.hasFormP('systemIntroduce')">
-						<el-form-item label="简介" prop="systemIntroduce">
-							<el-input v-model="dataForm.systemIntroduce" placeholder="请输入" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="ncc.hasFormP('systemDownloadVolume')">
-						<el-form-item label="下载量" prop="systemDownloadVolume">
-							<el-input-number v-model="dataForm.systemDownloadVolume" placeholder="数字文本" :step="1" >
-							</el-input-number>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="false" >
-						<el-form-item label="创建用户" prop="creatorUserId">
-							<el-input v-model="dataForm.creatorUserId" placeholder="系统自动生成" readonly >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="false" >
-						<el-form-item label="创建时间" prop="creatorTime">
-							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="false" >
-						<el-form-item label="修改用户" prop="lastModifyUserId">
-							<el-input v-model="dataForm.lastModifyUserId" placeholder="系统自动生成" readonly >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24" v-if="false" >
-						<el-form-item label="修改时间" prop="lastModifyTime">
-							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
-							</el-input>
-						</el-form-item>
-					</el-col>
-				</el-form>
-		</el-row>
-		<span slot="footer" class="dialog-footer">
-			<el-button @click="visible = false">取 消</el-button>
-			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
-		</span>
-	</el-dialog>
-</template>
-<script>
-	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-	import { previewDataInterface } from '@/api/systemData/dataInterface'
-	export default {
-		components: {},
-		props: [],
-		data() {
-			return {
-				loading: false,
-				visible: false,
-				isDetail: false,
-				dataForm: {
-					id:'',
-					id:undefined,
-					companyId:undefined,
-					systemClass:undefined,
-					systemType:undefined,
-					systemName:undefined,
-					systemState:undefined,
-					systemChangeSituation:undefined,
-					systemIcon:[],
-					systemRecordNumber:undefined,
-					systemLocation:[],
-					systemIntroduce:undefined,
-					systemDownloadVolume:undefined,
-					creatorUserId:undefined,
-					creatorTime:undefined,
-					lastModifyUserId:undefined,
-					lastModifyTime:undefined,
-				},
-				rules: {
-					companyId:[
-						{
-							required:true,
-							message:'请输入所属公司',
-							trigger:'change'
-						},
-					],
-					systemClass:[
-						{
-							required:true,
-							message:'请输入系统分类',
-							trigger:'change'
-						},
-					],
-					systemType:[
-						{
-							required:true,
-							message:'请输入系统类型',
-							trigger:'change'
-						},
-					],
-					systemName:[
-						{
-							required:true,
-							message:'请输入系统名称',
-							trigger:'blur'
-						},
-					],
-					systemState:[
-						{
-							required:true,
-							message:'请输入状态',
-							trigger:'change'
-						},
-					],
-					systemChangeSituation:[
-						{
-							required:true,
-							message:'请输入变更情况',
-							trigger:'change'
-						},
-					],
-				},
-				companyIdOptions : [],
-				systemClassOptions : [],
-				systemTypeOptions : [],
-				systemStateOptions : [],
-				systemChangeSituationOptions : [],
-			}
-		},
-		computed: {},
-        watch: {},
-        created() {
-			this.getcompanyIdOptions();
-			this.getsystemClassOptions();
-			this.getsystemTypeOptions();
-			this.getsystemStateOptions();
-			this.getsystemChangeSituationOptions();
-		},
-		mounted() {
-        },
-		methods: {
-			getcompanyIdOptions(){
-				previewDataInterface('576296400682222853').then(res => {
-					this.companyIdOptions = res.data
-				});
-			},
-			getsystemClassOptions(){
-				previewDataInterface('576295179435115781').then(res => {
-					this.systemClassOptions = res.data
-				});
-			},
-			getsystemTypeOptions(){
-				getDictionaryDataSelector('576279943168656645').then(res => {
-					this.systemTypeOptions = res.data.list
-				});
-			},
-			getsystemStateOptions(){
-				getDictionaryDataSelector('576291549546022149').then(res => {
-					this.systemStateOptions = res.data.list
-				});
-			},
-			getsystemChangeSituationOptions(){
-				getDictionaryDataSelector('576291912521090309').then(res => {
-					this.systemChangeSituationOptions = res.data.list
-				});
-			},
-			goBack() {
-                this.$emit('refresh')
-            },
-			init(id, isDetail) {
-				this.dataForm.id = id || 0;
-                this.visible = true;
-                this.isDetail = isDetail || false;
-				this.$nextTick(() => {
-					this.$refs['elForm'].resetFields();
-					if (this.dataForm.id) {
-						request({
-							url: '/api/Extend/BaseSysteminfo/' + this.dataForm.id,
-							method: 'get'
-						}).then(res =>{
-							this.dataForm = res.data;
-							if(!this.dataForm.systemIcon)this.dataForm.systemIcon=[];
-							if(!this.dataForm.systemLocation)this.dataForm.systemLocation=[];
-						})
-					}
-				})
-			},
-			dataFormSubmit() {
-				this.$refs['elForm'].validate((valid) => {
-                    if (valid) {
-                        if (!this.dataForm.id) {
-                            request({
-                                url: `/api/Extend/BaseSysteminfo`,
-                                method: 'post',
-                                data: this.dataForm,
-                            }).then((res) => {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'success',
-                                    duration: 1000,
-                                    onClose: () => {
-                                        this.visible = false,
-                                            this.$emit('refresh', true)
-                                    }
-                                })
-                            })
-                        } else {
-                            request({
-                                url: '/api/Extend/BaseSysteminfo/' + this.dataForm.id,
-                                method: 'PUT',
-                                data: this.dataForm
-                            }).then((res) => {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'success',
-                                    duration: 1000,
-                                    onClose: () => {
-                                        this.visible = false
-                                        this.$emit('refresh', true)
-                                    }
-                                })
-                            })
-                        }
-                    }
-                })
-			},
-		}
-	}
-</script>
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index 0d105e4..b7d076f 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -128,7 +128,7 @@
                 label="所属区域"
                 align="center"
               />
-              <el-table-column label="操作" width="200">
+              <el-table-column label="操作" width="250">
                 <!-- 查看，修改，归属地变更，上报 -->
                 <template slot-scope="scope">
                   <InfoEditRecord class="btn_dialog" :systemId="scope.row.Id">
@@ -154,6 +154,12 @@
                     @click="toInspection(scope.row)"
                     >上报</el-button
                   >
+                  <el-button
+                    size="mini"
+                    type="text"
+                    @click="toChangeRecord(scope.row)"
+                    >整改清单</el-button
+                  >
                 </template>
               </el-table-column>
             </NCC-table>
@@ -178,6 +184,13 @@
             label-width="100px"
             v-loading="areaDialogLoading"
           >
+            <el-form-item label="市属" prop="city">
+              <el-input
+                v-model="areaForm.city"
+                placeholder="请输入市属"
+                maxlength="20"
+              ></el-input>
+            </el-form-item>
             <el-form-item label="所属区县" prop="areaId">
               <el-radio-group
                 v-model="areaForm.areaId"
@@ -209,6 +222,7 @@
           ref="InspectionForm"
           @refresh="refresh"
         />
+        <ChangeRecord v-if="ChangeRecordVisible" ref="ChangeRecord"/>
       </div>
     </div>
   </div>
@@ -219,12 +233,13 @@ import { getInfoList } from "@/api/baseData/info";
 import { applnyChageArea } from "@/api/baseData/info";
 import infoMixin from "@/mixins/info";
 import InspectionForm from "./InspectForm.vue";
+import ChangeRecord from "./ChangeRecord.vue";
 
 export default {
   name: "SystemInfo",
   mixins: [infoMixin],
   components: {
-    InspectionForm,
+    InspectionForm, ChangeRecord
   },
   data() {
     return {
@@ -250,6 +265,7 @@ export default {
       areaDialogLoading: false,
       activeAreaId: "",
       areaForm: {
+        city: '',
         areaId: "",
         applnycontent: "",
       },
@@ -264,6 +280,7 @@ export default {
 
       // 上报
       InspectionFormVisible: false,
+      ChangeRecordVisible: false
     };
   },
   created() {
@@ -342,6 +359,13 @@ export default {
         this.$refs.InspectionForm.init(row);
       });
     },
+    // 整改清单
+    toChangeRecord(row) {
+      this.ChangeRecordVisible = true;
+      this.$nextTick(() => {
+        this.$refs.ChangeRecord.init(row);
+      });
+    },
     refresh(isrRefresh) {
       this.InspectionFormVisible = false;
       if (isrRefresh) this.reset();
@@ -375,8 +399,5 @@ export default {
     height: calc(100% - 47px);
     overflow-y: scroll;
   }
-  .item-body {
-    height: calc(100% - 35px);
-  }
 }
 </style>
diff --git a/src/views/homePage/components/Header.vue b/src/views/homePage/components/Header.vue
index e3eecbb..af6bf94 100644
--- a/src/views/homePage/components/Header.vue
+++ b/src/views/homePage/components/Header.vue
@@ -1,7 +1,7 @@
 <template>
   <header>
     <div class="slogin">
-      举旗帜聚民心、防风险保安全、强治理惠民生、 增动能促发展、谋合作图共赢
+      <!-- 举旗帜聚民心、防风险保安全、强治理惠民生、 增动能促发展、谋合作图共赢 -->
     </div>
     <div class="title">内部系统</div>
     <div class="user">
diff --git a/src/views/homePage/components/news/NewsDialog.vue b/src/views/homePage/components/news/NewsDialog.vue
index 7fa840d..24c9203 100644
--- a/src/views/homePage/components/news/NewsDialog.vue
+++ b/src/views/homePage/components/news/NewsDialog.vue
@@ -3,7 +3,9 @@
     <div class="news-title">
       <div class="left">我的消息</div>
       <div class="right">
-        <el-button type="primary" size="small" @click="toReadAll">标记全部已读</el-button>
+        <el-button type="primary" size="small" @click="toReadAll"
+          >标记全部已读</el-button
+        >
       </div>
     </div>
     <div class="infinite-list-wrapper" style="overflow: auto">
@@ -14,13 +16,15 @@
         infinite-scroll-immediate
       >
         <li class="list-item" v-for="v in messageList" :key="v.id">
-          <div class="item-title">{{v.title}}</div>
+          <div class="item-title">{{ v.title }}</div>
           <!-- <p>这个应用应该归属到青羊区，不在金牛区的管辖范围内。</p> -->
           <div class="item-info">
-            <div class="left">发送人：{{v.creatorUser}}</div>
+            <div class="left">发送人：{{ v.creatorUser }}</div>
           </div>
           <div class="item-info">
-            <div class="right">时间：{{ncc.dateFormat(v.lastModifyTime)}}</div>
+            <div class="right">
+              时间：{{ ncc.dateFormat(v.lastModifyTime) }}
+            </div>
           </div>
         </li>
       </ul>
@@ -31,7 +35,7 @@
 </template>
 
 <script>
-import {getMessageList} from "@/api/system/message";
+import { getMessageList } from "@/api/system/message";
 export default {
   name: "NewsDialog",
   data() {
@@ -40,8 +44,8 @@ export default {
       loading: false,
       messageList: [],
       searchList: {
-        pageIndex: 1, 
-        pageSize: 10
+        pageIndex: 1,
+        pageSize: 10,
       },
       total: 0,
     };
@@ -54,26 +58,32 @@ export default {
       return this.loading || this.noMore;
     },
   },
-  created() {
-    this.load();
-  },
+  created() {},
   mounted() {},
   methods: {
+    init() {
+      this.messageList = [];
+      this.searchList = {
+        pageIndex: 1,
+        pageSize: 10,
+      };
+      this.load();
+    },
     load() {
       this.loading = true;
-      getMessageList(this.searchList).then(({data}) => {
+      getMessageList(this.searchList).then(({ data }) => {
         this.messageList = this.messageList.concat(data.list);
         this.total = data.pagination.total;
         this.loading = false;
-        this.searchList.pageIndex += 1
-        this.$emit('changeMagNum', data.pagination.total);
+        this.searchList.pageIndex += 1;
+        this.$emit("changeMagNum", data.pagination.total);
       });
     },
     toReadAll() {
       MessageAllRead().then(() => {
         this.load();
-      })
-    }
+      });
+    },
   },
 };
 </script>
diff --git a/src/views/homePage/components/news/index.vue b/src/views/homePage/components/news/index.vue
index 5b18e14..cb63407 100644
--- a/src/views/homePage/components/news/index.vue
+++ b/src/views/homePage/components/news/index.vue
@@ -1,11 +1,7 @@
 <template>
   <div class="News">
-    <el-popover
-      placement="left"
-      width="300"
-      trigger="click"
-    >
-      <NewsDialog ref="MessageDialog" @changeMagNum="changeMagNum"/>
+    <el-popover placement="left" width="300" trigger="click">
+      <NewsDialog ref="MessageDialog" @changeMagNum="changeMagNum" />
       <div slot="reference" class="news-item">
         <div class="icon-item">
           <div class="red-spot" v-show="isHaveMsg"></div>
@@ -25,11 +21,14 @@ export default {
   components: { NewsDialog },
   data() {
     return {
-      isHaveMsg: false
+      isHaveMsg: false,
+      isTwinkle: false,
+      messageCount: 0,
+      userList: [],
     };
   },
   created() {
-    // this.initWebSocket()
+    this.initWebSocket();
   },
   computed: {},
   mounted() {},
@@ -47,6 +46,7 @@ export default {
       this.isHaveMsg = val ? true : false;
     },
     initWebSocket() {
+      console.log("1");
       this.socket = this.$store.getters.socket || null;
       if ("WebSocket" in window) {
         if (!this.socket) {
@@ -65,10 +65,12 @@ export default {
         };
         socket.onmessage = (event) => {
           let data = JSON.parse(event.data);
+          console.log(data, "event.data");
           if (data.method == "initMessage") {
             this.messageCount =
               data.unreadMessageCount + data.unreadNoticeCount;
             this.isTwinkle = !!data.unreadNums.length;
+            this.$refs.MessageDialog.init();
           }
           //用户在线
           if (data.method == "Online") {
diff --git a/src/views/overView/Overview.vue b/src/views/overView/Overview.vue
index 8f044a7..6ceadf3 100644
--- a/src/views/overView/Overview.vue
+++ b/src/views/overView/Overview.vue
@@ -83,7 +83,7 @@
         </div>
       </el-col>
       <el-col :span="8">
-        <div class="item-box tip">
+        <!-- <div class="item-box tip">
           <div class="item-title">工作提示</div>
           <div class="item-body">
             <template>
@@ -103,7 +103,7 @@
               </el-table>
             </template>
           </div>
-        </div>
+        </div> -->
         <div class="item-box msg">
           <div class="item-title">通知公告</div>
           <div class="item-body">
@@ -196,11 +196,11 @@ export default {
       // height: calc(50vh - 115px);
       margin-bottom: 0;
     }
-    &.tip {
-      height: calc(50vh - 60px);
-    }
+    // &.tip {
+    //   height: calc(50vh - 60px);
+    // }
     &.msg {
-      height: calc(50vh - 175px);
+      height: calc(100vh - 200px);
       margin-bottom: 0;
     }
     .item-title {
--
libgit2 0.21.4