From 3b43d20e6da572e5be10d07390468538a2259052 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Fri, 22 Nov 2024 09:26:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shequzhili/videomonitoring/index.vue       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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%">

From 41e4186cac6996b227cccc4ab7241fc778a86178 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Fri, 22 Nov 2024 16:42:22 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/communityNews/index.vue    | 6 +++---
 .../modules/communityParty/employmentService/index.vue      | 6 +++---
 .../modules/communityParty/noticeAnnouncement/index.vue     | 6 +++---
 .../communityParty/policeCivilianInteraction/index.vue      | 6 +++---
 .../modules/communityParty/threeAffairsDisclosure/index.vue | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

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> -->

From 17f4ca98261f45096e6fe05824288e4522500e9f Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 22 Nov 2024 14:30:53 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=A0=87=E8=AE=B0=E5=8A=9F=E8=83=BD=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/eventOld/eventList.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/shequzhili/eventOld/eventList.vue b/src/views/modules/shequzhili/eventOld/eventList.vue
index 531a6f80e..19c54f568 100644
--- a/src/views/modules/shequzhili/eventOld/eventList.vue
+++ b/src/views/modules/shequzhili/eventOld/eventList.vue
@@ -119,7 +119,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-dropdown size="small" split-button type="primary" style="margin: 0 10px; height: 30px"

From 250ede0d9f0dbb5a90176c7e5eb033ec41c16beb Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Tue, 26 Nov 2024 16:39:50 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/materialcode/event.vue       | 5 +++--
 .../modules/shequzhili/materialcode/icmaterialcode.vue    | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/shequzhili/materialcode/event.vue b/src/views/modules/shequzhili/materialcode/event.vue
index fa1550443..e97e46987 100644
--- a/src/views/modules/shequzhili/materialcode/event.vue
+++ b/src/views/modules/shequzhili/materialcode/event.vue
@@ -29,14 +29,15 @@
                       <div class="m-info-prop" style="flex: 0 0 50%;">
                         <span class="u-info-title-2">照片: </span>
                         <span style="margin-right: 10px;">&nbsp;</span>
-                        <span>{{ formData.picture || "--" }}</span>
+                        <span><img :src="formData.picture" style="width: 50px;height: 50px;"/></span>
                       </div>
                   </div>
                   <div style="display: flex;">
                       <div class="m-info-prop" style="flex: 0 0 50%;">
                         <span class="u-info-title-2">二维码: </span>
                         <span style="margin-right: 10px;">&nbsp;</span>
-                        <span>{{ formData.code || "--" }}</span>
+<!--                        <span>{{ formData.code || "&#45;&#45;" }}</span>-->
+                        <span><img :src="formData.code" style="width: 50px;height: 50px;"/></span>
                       </div>
                   </div>
 
diff --git a/src/views/modules/shequzhili/materialcode/icmaterialcode.vue b/src/views/modules/shequzhili/materialcode/icmaterialcode.vue
index 6de32d938..48ae98ca7 100644
--- a/src/views/modules/shequzhili/materialcode/icmaterialcode.vue
+++ b/src/views/modules/shequzhili/materialcode/icmaterialcode.vue
@@ -46,10 +46,10 @@
 
         <el-table-column prop="name" label="名称" header-align="center" align="center"></el-table-column>
         <el-table-column prop="introduce" label="介绍" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="picture" label="图片" header-align="center" align="center">
+        <el-table-column prop="picture" label="图片" header-align="center" align="center" >
 
-          <template slot-scope="scope">
-              <img :src="scope.row.picture"/>
+          <template slot-scope="scope" >
+              <img :src="scope.row.picture" style="width: 50px;height: 50px;"/>
           </template>
 
         </el-table-column>
@@ -66,7 +66,7 @@
             <el-button type="text" style="color:#1C6AFD;" size="small"
               @click="handleDelete(scope.row)">删除</el-button>
             <el-button type="text" style="color:#1C6AFD;" size="small"
-                       @click="download(scope.row)">下载</el-button>
+                       @click="download(scope.row)">二维码</el-button>
           </template>
         </el-table-column>
       </el-table>