From 000add0573ecfac6c68ef648e35c974b51add185 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Mon, 16 Oct 2023 10:14:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9B=BF=E6=8D=A2=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                    | 4 ++++
 src/views/tcZz/netManage/bzhan/index.vue        | 2 +-
 src/views/tcZz/netManage/jbmap/index.vue        | 4 ++--
 src/views/tcZz/netManage/qlzxxddt/index.vue     | 2 +-
 src/views/tcZz/netManage/ttsum/index.vue        | 2 +-
 src/views/tcZz/netManage/zdgzxm/index.vue       | 4 ++--
 src/views/tcZz/netManage/zdqyml/index.vue       | 2 +-
 src/views/tcZz/netWorkYq/yqbg/index.vue         | 2 +-
 src/views/tcZz/netWorkYq/yqxxltj/index.vue      | 4 ++--
 src/views/tcZz/netWorkYq/yqyj/index.vue         | 2 +-
 src/views/tcZz/networkEcology/wlwmzyz/index.vue | 6 ++----
 11 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 74dc0cb..200b96f 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -189,3 +189,7 @@ aside {
     margin-bottom: 10px;
   }
 }
+p {
+  margin: 0;
+  padding: 0;
+}
\ No newline at end of file
diff --git a/src/views/tcZz/netManage/bzhan/index.vue b/src/views/tcZz/netManage/bzhan/index.vue
index d2ad8cb..0a22803 100644
--- a/src/views/tcZz/netManage/bzhan/index.vue
+++ b/src/views/tcZz/netManage/bzhan/index.vue
@@ -278,7 +278,7 @@
 
                       <el-descriptions-item label="网址">{{ form.url }}</el-descriptions-item>
 
-                      <el-descriptions-item label="类型">{{ form.type }}</el-descriptions-item>
+                      <el-descriptions-item label="类型">{{ selectDictLabel(dict.type.tc_bztype,form.type) }}</el-descriptions-item>
 
                       <el-descriptions-item label="备注">{{ form.remark }}</el-descriptions-item>
 
diff --git a/src/views/tcZz/netManage/jbmap/index.vue b/src/views/tcZz/netManage/jbmap/index.vue
index a75f60a..048f434 100644
--- a/src/views/tcZz/netManage/jbmap/index.vue
+++ b/src/views/tcZz/netManage/jbmap/index.vue
@@ -350,9 +350,9 @@
 
                       <el-descriptions-item label="地址">{{ form.address }}</el-descriptions-item>
 
-                      <el-descriptions-item label="举报内容">{{ form.content }}</el-descriptions-item>
+                      <el-descriptions-item label="举报内容"><div v-html="form.content"></div></el-descriptions-item>
 
-                      <el-descriptions-item label="是否处置">{{ form.state }}</el-descriptions-item>
+                      <el-descriptions-item label="是否处置">{{ selectDictLabel(dict.type.tc_czstate,form.state) }}</el-descriptions-item>
 
                       <el-descriptions-item label="经度">{{ form.longitude }}</el-descriptions-item>
 
diff --git a/src/views/tcZz/netManage/qlzxxddt/index.vue b/src/views/tcZz/netManage/qlzxxddt/index.vue
index 4547870..081cadc 100644
--- a/src/views/tcZz/netManage/qlzxxddt/index.vue
+++ b/src/views/tcZz/netManage/qlzxxddt/index.vue
@@ -246,7 +246,7 @@
 
                       <el-descriptions-item label="标题">{{ form.title }}</el-descriptions-item>
 
-                      <el-descriptions-item label="内容">{{ form.content }}</el-descriptions-item>
+                      <el-descriptions-item label="内容"><div v-html='form.content'></div></el-descriptions-item>
 
                       <el-descriptions-item label="图片路径(完整路径)">{{ form.imageUrl }}</el-descriptions-item>
 
diff --git a/src/views/tcZz/netManage/ttsum/index.vue b/src/views/tcZz/netManage/ttsum/index.vue
index b1252b0..dcc3d32 100644
--- a/src/views/tcZz/netManage/ttsum/index.vue
+++ b/src/views/tcZz/netManage/ttsum/index.vue
@@ -278,7 +278,7 @@
 
                       <el-descriptions-item label="简介">{{ form.intro }}</el-descriptions-item>
 
-                      <el-descriptions-item label="类型">{{ form.type }}</el-descriptions-item>
+                      <el-descriptions-item label="类型">{{ selectDictLabel(dict.type.tc_tttype,form.type) }}</el-descriptions-item>
 
                       <el-descriptions-item label="备注">{{ form.remark }}</el-descriptions-item>
 
diff --git a/src/views/tcZz/netManage/zdgzxm/index.vue b/src/views/tcZz/netManage/zdgzxm/index.vue
index 7483823..1c834f3 100644
--- a/src/views/tcZz/netManage/zdgzxm/index.vue
+++ b/src/views/tcZz/netManage/zdgzxm/index.vue
@@ -283,9 +283,9 @@
 
                       <el-descriptions-item label="项目名称">{{ form.itemName }}</el-descriptions-item>
 
-                      <el-descriptions-item label="项目内容">{{ form.itemContent }}</el-descriptions-item>
+                      <el-descriptions-item label="项目内容"><div v-html="form.itemContent"></div></el-descriptions-item>
 
-                      <el-descriptions-item label="项目类型">{{ form.itemType }}</el-descriptions-item>
+                      <el-descriptions-item label="项目类型"><div v-html="form.itemType"></div></el-descriptions-item>
 
                       <el-descriptions-item label="项目联系人">{{ form.itemLinkMan }}</el-descriptions-item>
 
diff --git a/src/views/tcZz/netManage/zdqyml/index.vue b/src/views/tcZz/netManage/zdqyml/index.vue
index 836ea95..c20c17c 100644
--- a/src/views/tcZz/netManage/zdqyml/index.vue
+++ b/src/views/tcZz/netManage/zdqyml/index.vue
@@ -202,7 +202,7 @@
     </div>
     <el-table v-loading="loading" :data="zdqymlList"  @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-              <el-table-column label="${comment}" align="center" prop="id" />
+              <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
               <el-table-column label="区域" align="center" prop="areaId">
                 <template slot-scope="scope">
                   <dict-tag :options="dict.type.tc_area" :value="scope.row.areaId"/>
diff --git a/src/views/tcZz/netWorkYq/yqbg/index.vue b/src/views/tcZz/netWorkYq/yqbg/index.vue
index 37662ce..13d175f 100644
--- a/src/views/tcZz/netWorkYq/yqbg/index.vue
+++ b/src/views/tcZz/netWorkYq/yqbg/index.vue
@@ -251,7 +251,7 @@
 
                       <el-descriptions-item label="启用/禁用">{{ selectDictLabel(dict.type.tc_start,form.isStatus) }}</el-descriptions-item>
 
-                      <el-descriptions-item label="类型">{{ form.type }}</el-descriptions-item>
+                      <el-descriptions-item label="类型">{{ selectDictLabel(dict.type.bg_type,form.type) }}</el-descriptions-item>
 
                       <el-descriptions-item label="标题名称">{{ form.title }}</el-descriptions-item>
 
diff --git a/src/views/tcZz/netWorkYq/yqxxltj/index.vue b/src/views/tcZz/netWorkYq/yqxxltj/index.vue
index 3da0b07..1359cd1 100644
--- a/src/views/tcZz/netWorkYq/yqxxltj/index.vue
+++ b/src/views/tcZz/netWorkYq/yqxxltj/index.vue
@@ -303,7 +303,7 @@
 
                       <el-descriptions-item label="启用/禁用">{{ selectDictLabel(dict.type.tc_start,form.isStatus) }}</el-descriptions-item>
 
-                      <el-descriptions-item label="类型">{{ form.type }}</el-descriptions-item>
+                      <el-descriptions-item label="类型">{{ selectDictLabel(dict.type.yq_type,form.type) }}</el-descriptions-item>
 
                       <el-descriptions-item label="标题">{{ form.title }}</el-descriptions-item>
 
@@ -311,7 +311,7 @@
 
                       <el-descriptions-item label="时间">{{ form.dateTime }}</el-descriptions-item>
 
-                      <el-descriptions-item label="内容">{{ form.content }}</el-descriptions-item>
+                      <el-descriptions-item label="内容"><div v-html='form.content'></div></el-descriptions-item>
 
                       <el-descriptions-item label="备注">{{ form.remark }}</el-descriptions-item>
 
diff --git a/src/views/tcZz/netWorkYq/yqyj/index.vue b/src/views/tcZz/netWorkYq/yqyj/index.vue
index 4577b53..7be638b 100644
--- a/src/views/tcZz/netWorkYq/yqyj/index.vue
+++ b/src/views/tcZz/netWorkYq/yqyj/index.vue
@@ -284,7 +284,7 @@
 
                       <el-descriptions-item label="时间">{{ form.dateTime }}</el-descriptions-item>
 
-                      <el-descriptions-item label="内容">{{ form.content }}</el-descriptions-item>
+                      <el-descriptions-item label="内容"><div v-html='form.content'></div></el-descriptions-item>
 
                       <el-descriptions-item label="备注">{{ form.remark }}</el-descriptions-item>
 
diff --git a/src/views/tcZz/networkEcology/wlwmzyz/index.vue b/src/views/tcZz/networkEcology/wlwmzyz/index.vue
index d996b3b..63f5a99 100644
--- a/src/views/tcZz/networkEcology/wlwmzyz/index.vue
+++ b/src/views/tcZz/networkEcology/wlwmzyz/index.vue
@@ -116,7 +116,7 @@
      
       <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="年龄" align="center" prop="age" />
-      <el-table-column label="活动内容" align="center" prop="activityContent" />
+      <!-- <el-table-column label="活动内容" align="center" prop="activityContent" /> -->
       <el-table-column label="志愿者类型" align="center" prop="type">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.tc_wlwmzyzlx" :value="scope.row.type" />
@@ -280,9 +280,7 @@
 
         <el-descriptions-item label="年龄">{{ form.age }}</el-descriptions-item>
 
-        <el-descriptions-item label="活动内容">{{
-          form.activityContent
-        }}</el-descriptions-item>
+        <el-descriptions-item label="活动内容"><div v-html="form.activityContent"></div></el-descriptions-item>
 
         <el-descriptions-item label="单位">{{
           form.unit