From 8faf2a52ff1388b515f5559c1f9c8bad39c747a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Tue, 26 Sep 2023 11:34:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/netSecurity/SafetyYh/index.vue | 27 +++++++++++++-----------
 src/views/netWorkYq/index.vue            | 12 ++++++++++-
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/views/netSecurity/SafetyYh/index.vue b/src/views/netSecurity/SafetyYh/index.vue
index bde2733..5a048fd 100644
--- a/src/views/netSecurity/SafetyYh/index.vue
+++ b/src/views/netSecurity/SafetyYh/index.vue
@@ -9,7 +9,8 @@
         label-width="auto"
       >
         <el-form-item label="隐患类型" prop="type">
-          <el-select
+          <el-input v-model="queryParams.type" placeholder="请选择隐患类型" />
+          <!-- <el-select
             v-model="queryParams.type"
             placeholder="请选择隐患类型"
             clearable
@@ -21,7 +22,7 @@
               :label="dict.label"
               :value="dict.value"
             />
-          </el-select>
+          </el-select> -->
         </el-form-item>
         <el-form-item label="隐患名称" prop="riskName">
           <el-input
@@ -87,9 +88,9 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="隐患类型" align="center" prop="type">
-        <template slot-scope="scope">
+        <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.tc_yh_type" :value="scope.row.type" />
-        </template>
+        </template> -->
       </el-table-column>
       <el-table-column label="隐患名称" align="center" prop="riskName" />
       <el-table-column label="等级" align="center" prop="level">
@@ -192,14 +193,15 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="隐患类型" prop="type">
-              <el-select v-model="form.type" placeholder="请选择隐患类型">
+              <el-input v-model="form.type" placeholder="请选择隐患类型" />
+              <!-- <el-select v-model="form.type" placeholder="请选择隐患类型">
                 <el-option
                   v-for="dict in dict.type.tc_yh_type"
                   :key="dict.value"
                   :label="dict.label"
                   :value="parseInt(dict.value)"
                 ></el-option>
-              </el-select>
+              </el-select> -->
             </el-form-item>
           </el-col>
         </el-row>
@@ -267,17 +269,17 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <!-- <el-form-item label="隐患开始时间" prop="startTime">
+            <el-form-item label="通报时间" prop="startTime">
               <el-date-picker
                 clearable
                 size="small"
                 v-model="form.startTime"
                 type="date"
                 value-format="yyyy-MM-dd"
-                placeholder="选择隐患开始时间"
+                placeholder="选择通报时间"
               >
               </el-date-picker>
-            </el-form-item> -->
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -328,7 +330,8 @@
         }}</el-descriptions-item>
 
         <el-descriptions-item label="隐患类型">
-          <dict-tag :options="dict.type.tc_yh_type" :value="form.type" />
+          <!-- <dict-tag :options="dict.type.tc_yh_type" :value="form.type" /> -->
+          {{ form.type }}
         </el-descriptions-item>
 
         <el-descriptions-item label="单位名称">{{
@@ -370,11 +373,11 @@
           form.depName
         }}</el-descriptions-item>
 
-        <!-- <el-descriptions-item label="隐患开始时间">{{
+        <el-descriptions-item label="通报时间">{{
           form.startTime
         }}</el-descriptions-item>
 
-        <el-descriptions-item label="隐患结束时间">{{
+        <!-- <el-descriptions-item label="隐患结束时间">{{
           form.endTime
         }}</el-descriptions-item> -->
       </el-descriptions>
diff --git a/src/views/netWorkYq/index.vue b/src/views/netWorkYq/index.vue
index f6bba02..a0eb098 100644
--- a/src/views/netWorkYq/index.vue
+++ b/src/views/netWorkYq/index.vue
@@ -101,7 +101,17 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="舆情名称" align="center" prop="sentimentName" />
+      <el-table-column label="区域" align="center" prop="areaId">
+        <template slot-scope="scope">
+          {{ $filterTown(JSON.parse(scope.row.areaId)) }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="舆情名称"
+        align="center"
+        prop="sentimentName"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="部门名称" align="center" prop="depName" />
       <el-table-column
         label="发布时间"