diff --git a/src/views/dataBoard/IoTPerception/Videosurveillance/cpts/videoDialog.vue b/src/views/dataBoard/IoTPerception/Videosurveillance/cpts/videoDialog.vue
index fe2a69cb8..f4e825656 100644
--- a/src/views/dataBoard/IoTPerception/Videosurveillance/cpts/videoDialog.vue
+++ b/src/views/dataBoard/IoTPerception/Videosurveillance/cpts/videoDialog.vue
@@ -152,7 +152,7 @@ export default {
         async getVideoUrl(){
            let {data,code} =  await requestPost('/actual/base/videoMonitoring/getVideoUrl',{monitorCode:this.monitorCode})
             if(code === 0){
-                this.url = data.replace('http://111.34.21.222:12080/',`${window.SITE_CONFIG['liveURL']}`)
+                this.url = data.replace('https://111.34.21.222:12443/',`${window.SITE_CONFIG['liveURL']}`)
                 this.play()
             }
         },
diff --git a/src/views/modules/communityParty/communityNews/index.vue b/src/views/modules/communityParty/communityNews/index.vue
index 25ed48e42..d96fc1c78 100644
--- a/src/views/modules/communityParty/communityNews/index.vue
+++ b/src/views/modules/communityParty/communityNews/index.vue
@@ -53,8 +53,8 @@
         <el-table-column :show-overflow-tooltip="true" prop="agencyName" header-align="center" align="center"
           label="发布单位">
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
-        </el-table-column>
+<!--        <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
+        </el-table-column>-->
         <el-table-column :show-overflow-tooltip="true" prop="title" header-align="center" align="center" label="文章标题">
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="coverPic" header-align="center" align="center"
@@ -64,7 +64,7 @@
               :preview-src-list="[scope.row.coverPic]"></el-image>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="发布人">
+        <el-table-column :show-overflow-tooltip="true" prop="publishName" header-align="center" align="center" label="发布人">
           <!-- <template slot-scope="scope">
       <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
     </template> -->
diff --git a/src/views/modules/communityParty/employmentService/index.vue b/src/views/modules/communityParty/employmentService/index.vue
index c13db59ab..a9c685c4a 100644
--- a/src/views/modules/communityParty/employmentService/index.vue
+++ b/src/views/modules/communityParty/employmentService/index.vue
@@ -53,8 +53,8 @@
         <el-table-column :show-overflow-tooltip="true" prop="agencyName" header-align="center" align="center"
           label="发布单位">
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
-        </el-table-column>
+<!--        <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
+        </el-table-column>-->
         <el-table-column :show-overflow-tooltip="true" prop="title" header-align="center" align="center" label="文章标题">
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="coverPic" header-align="center" align="center"
@@ -64,7 +64,7 @@
               :preview-src-list="[scope.row.coverPic]"></el-image>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="发布人">
+        <el-table-column :show-overflow-tooltip="true" prop="publishName" header-align="center" align="center" label="发布人">
           <!-- <template slot-scope="scope">
       <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
     </template> -->
diff --git a/src/views/modules/communityParty/noticeAnnouncement/index.vue b/src/views/modules/communityParty/noticeAnnouncement/index.vue
index 1dbe900e4..0d4ba3bad 100644
--- a/src/views/modules/communityParty/noticeAnnouncement/index.vue
+++ b/src/views/modules/communityParty/noticeAnnouncement/index.vue
@@ -53,8 +53,8 @@
         <el-table-column :show-overflow-tooltip="true" prop="agencyName" header-align="center" align="center"
           label="发布单位">
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
-        </el-table-column>
+<!--        <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
+        </el-table-column>-->
         <el-table-column :show-overflow-tooltip="true" prop="title" header-align="center" align="center" label="文章标题">
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="coverPic" header-align="center" align="center"
@@ -64,7 +64,7 @@
               :preview-src-list="[scope.row.coverPic]"></el-image>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="发布人">
+        <el-table-column :show-overflow-tooltip="true" prop="publishName" header-align="center" align="center" label="发布人">
           <!-- <template slot-scope="scope">
       <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
     </template> -->
diff --git a/src/views/modules/communityParty/policeCivilianInteraction/index.vue b/src/views/modules/communityParty/policeCivilianInteraction/index.vue
index ab6fa0796..4530e9916 100644
--- a/src/views/modules/communityParty/policeCivilianInteraction/index.vue
+++ b/src/views/modules/communityParty/policeCivilianInteraction/index.vue
@@ -53,8 +53,8 @@
         <el-table-column :show-overflow-tooltip="true" prop="agencyName" header-align="center" align="center"
           label="发布单位">
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
-        </el-table-column>
+<!--        <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
+        </el-table-column>-->
         <el-table-column :show-overflow-tooltip="true" prop="title" header-align="center" align="center" label="文章标题">
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="coverPic" header-align="center" align="center"
@@ -64,7 +64,7 @@
               :preview-src-list="[scope.row.coverPic]"></el-image>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="发布人">
+        <el-table-column :show-overflow-tooltip="true" prop="publishName" header-align="center" align="center" label="发布人">
           <!-- <template slot-scope="scope">
       <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
     </template> -->
diff --git a/src/views/modules/communityParty/threeAffairsDisclosure/index.vue b/src/views/modules/communityParty/threeAffairsDisclosure/index.vue
index 09c169ee1..07a8713e5 100644
--- a/src/views/modules/communityParty/threeAffairsDisclosure/index.vue
+++ b/src/views/modules/communityParty/threeAffairsDisclosure/index.vue
@@ -53,8 +53,8 @@
         <el-table-column :show-overflow-tooltip="true" prop="agencyName" header-align="center" align="center"
           label="发布单位">
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
-        </el-table-column>
+<!--        <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="栏目分类">
+        </el-table-column>-->
         <el-table-column :show-overflow-tooltip="true" prop="title" header-align="center" align="center" label="文章标题">
         </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="coverPic" header-align="center" align="center"
@@ -64,7 +64,7 @@
               :preview-src-list="[scope.row.coverPic]"></el-image>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="tagName" header-align="center" align="center" label="发布人">
+        <el-table-column :show-overflow-tooltip="true" prop="publishName" header-align="center" align="center" label="发布人">
           <!-- <template slot-scope="scope">
       <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
     </template> -->
diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue
index 461c64778..fcf968399 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/event-detail.vue
@@ -271,7 +271,7 @@ export default {
     watch: {
         "info.gridId": function (val) {
             this.selGridId = val;
-            this.$emit("changeGridId", val);
+            this.$emit("handelCLickGridId", val);
             this.gridId = this.selGridId;
             if (!this.eventDetailData.gridId && this.selGridId) {
                 this.updateEvent();
@@ -296,6 +296,9 @@ export default {
         this.user = this.$store.state.user;
         if (this.eventId) {
             this.info = JSON.parse(JSON.stringify(this.eventDetailData));
+            if(this.info.gridId){
+                this.$emit("handelCLickGridId", this.info.gridId);
+            }
             this.agencyId = this.info.agencyId
         }
         this.loadGrid();
diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
index 5be3d723f..2eb143b53 100644
--- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue
@@ -510,7 +510,7 @@ export default {
             }
         },
         handelCLickGridId(val){
-            this.grid = val.value;
+            this.grid = val;
         },
         async handelDispose() {
             console.log(this.grid,"DSFKDSFJDKS");
diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue
index e8bb1c64e..a60f4cfad 100644
--- a/src/views/modules/shequzhili/eventOld/eventList.vue
+++ b/src/views/modules/shequzhili/eventOld/eventList.vue
@@ -125,7 +125,16 @@
             <div class="m-table">
                 <div class="div_btn">
                     <el-button size="small" type="primary " @click="handleAdd">新增</el-button>
-
+                    <el-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"
+                        @command="(command) => handleMarkDiffcult(command)">
+                        标记
+                        <el-dropdown-menu slot="dropdown">
+                            <el-dropdown-item command="1">标记为难点堵点</el-dropdown-item>
+                            <el-dropdown-item command="2">标记为矛盾纠纷</el-dropdown-item>
+                            <el-dropdown-item command="3">标记为自身问题</el-dropdown-item>
+                            <el-dropdown-item command="4">标记为超出服务范围</el-dropdown-item>
+                        </el-dropdown-menu>
+                    </el-dropdown>
                     <el-button @click="handleExport" class="diy-button--white" size="small">导出</el-button>
                     <el-button @click="handleSuperviseEvent" class="diy-button--white" size="small">批量催办</el-button>
                 </div>
diff --git a/src/views/modules/shequzhili/videomonitoring/index.vue b/src/views/modules/shequzhili/videomonitoring/index.vue
index 8948d26db..83eb1f5bb 100644
--- a/src/views/modules/shequzhili/videomonitoring/index.vue
+++ b/src/views/modules/shequzhili/videomonitoring/index.vue
@@ -22,16 +22,16 @@
     <div class="m-table">
       <div class="resi-row-btn">
         <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
-        <el-button style="" class="diy-button--add" size="small" @click="downloadTem">下载模板</el-button>
+<!--        <el-button style="" class="diy-button&#45;&#45;add" size="small" @click="downloadTem">下载模板</el-button>-->
 <!--        <el-button style="" class="diy-button--add" size="small" @click="exportData">导入</el-button>-->
-        <el-button class="diy-button--white" size="small">
-          <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr" :limit="1"
-                     :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false" :auto-upload="true"
-                     :on-progress="handleProgress" :on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"
-                     :http-request="uploadHttpRequest">
-            导入
-          </el-upload>
-        </el-button>
+<!--        <el-button class="diy-button&#45;&#45;white" size="small">-->
+<!--          <el-upload :headers="$getElUploadHeaders()" ref="upload" class="upload-btn" action="uploadUlr" :limit="1"-->
+<!--                     :accept="'.xls,.xlsx'" :with-credentials="true" :show-file-list="false" :auto-upload="true"-->
+<!--                     :on-progress="handleProgress" :on-success="handleExcelSuccess" :before-upload="beforeExcelUpload"-->
+<!--                     :http-request="uploadHttpRequest">-->
+<!--            导入-->
+<!--          </el-upload>-->
+<!--        </el-button>-->
 
       </div>
       <el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">