From 25a64c50d8678ebc1719a69f93c4e5773c143939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Mon, 28 Aug 2023 15:15:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/myselfFu.js                         | 27 ++++++++++++++-----
 src/views/netManage/enterpriseMl/index.vue    | 10 +------
 src/views/netManage/netPlatform/index.vue     | 10 +------
 src/views/netManage/netReport/index.vue       | 10 +------
 src/views/netManage/qlzx/index.vue            | 12 ++-------
 src/views/netManage/qlzxTj/index.vue          | 12 ++-------
 src/views/netManage/supervise/index.vue       | 12 ++-------
 src/views/netManage/workDynamic/index.vue     | 10 +------
 src/views/netManage/workItem/index.vue        | 10 +------
 src/views/netSecurity/DataSource/index.vue    | 10 +------
 src/views/netSecurity/SafetyYh/index.vue      | 10 +------
 src/views/netSecurity/SecurityCheck/index.vue | 10 +------
 .../netSecurity/supervise/DbSteam/index.vue   | 10 +------
 .../netSecurity/supervise/DbUnit/index.vue    | 10 +------
 .../supervise/GovernmentWeb/index.vue         | 12 ++-------
 .../netSecurity/supervise/IdcUnit/index.vue   | 12 ++-------
 src/views/netSecurity/tb/index.vue            | 12 ++-------
 src/views/netWorkYq/index.vue                 | 10 +------
 src/views/netWorkYq/yqfl/index.vue            | 12 ++-------
 src/views/netWorkYq/yqzst/index.vue           | 12 ++-------
 src/views/netZoology/bjsjzb/index.vue         | 12 ++-------
 src/views/netZoology/netAppraiser/index.vue   | 10 +------
 src/views/netZoology/netArticle/index.vue     | 10 +------
 src/views/netZoology/netMqPrincipal/index.vue | 10 +------
 src/views/netZoology/netP/index.vue           |  2 +-
 src/views/netZoology/netSafety/index.vue      | 10 +------
 .../netZoology/netSafetyZcUnit/index.vue      | 12 ++-------
 src/views/netZoology/netVolunteer/index.vue   | 10 +------
 src/views/netZoology/wpywcl/index.vue         | 12 ++-------
 29 files changed, 59 insertions(+), 262 deletions(-)

diff --git a/src/utils/myselfFu.js b/src/utils/myselfFu.js
index c8f9e03..5be2fbc 100644
--- a/src/utils/myselfFu.js
+++ b/src/utils/myselfFu.js
@@ -1,12 +1,25 @@
 import store from "@/store";
 
 // 翻译区域
-export function filterTown(id) {
-  if (id == undefined) return;
-  let name = store.getters.townList.filter((item) => item.value == id);
-  if (name.length > 0) {
-    return name[0].label;
-  } else {
-    return id;
+export function filterTown(ids) {
+  if (ids && Array.isArray(ids)) {
+    let data = store.getters.townList;
+    const targetIds = ids;
+    const results = [];
+    filterNames(data, targetIds, results);
+    return results.join(" / ");
   }
 }
+
+function filterNames(data, targetIds, results) {
+  // console.log(data, "1", targetIds, "2", results, "3");
+  data.forEach((node, index) => {
+    if (targetIds.includes(node.id)) {
+      results.push(node.label);
+    }
+    const children = node.children;
+    if (Array.isArray(children) && children.length > 0) {
+      filterNames(children, targetIds, results);
+    }
+  });
+}
diff --git a/src/views/netManage/enterpriseMl/index.vue b/src/views/netManage/enterpriseMl/index.vue
index cfc5275..dd9d529 100644
--- a/src/views/netManage/enterpriseMl/index.vue
+++ b/src/views/netManage/enterpriseMl/index.vue
@@ -288,7 +288,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="企业名称">{{
@@ -482,14 +482,6 @@ export default {
       const id = row.id || this.ids;
       getEnterprise(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看重点企业名录详情";
diff --git a/src/views/netManage/netPlatform/index.vue b/src/views/netManage/netPlatform/index.vue
index eb0ba11..7faa92c 100644
--- a/src/views/netManage/netPlatform/index.vue
+++ b/src/views/netManage/netPlatform/index.vue
@@ -252,7 +252,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="平台类别">
@@ -444,14 +444,6 @@ export default {
       const id = row.id || this.ids;
       getPingtai(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看网络平台详情";
diff --git a/src/views/netManage/netReport/index.vue b/src/views/netManage/netReport/index.vue
index bc93ee4..daf0eb2 100644
--- a/src/views/netManage/netReport/index.vue
+++ b/src/views/netManage/netReport/index.vue
@@ -321,7 +321,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="举报人">{{
@@ -524,14 +524,6 @@ export default {
       const id = row.id || this.ids;
       getReport(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看网络举报详情";
diff --git a/src/views/netManage/qlzx/index.vue b/src/views/netManage/qlzx/index.vue
index f9ccf48..2cea4c1 100644
--- a/src/views/netManage/qlzx/index.vue
+++ b/src/views/netManage/qlzx/index.vue
@@ -99,7 +99,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="区域" align="center" prop="areaId">
         <template slot-scope="scope">
-          {{ scope.row.areaId | filterTown }}
+          {{ $filterTown(JSON.parse(scope.row.areaId)) }}
         </template>
       </el-table-column>
       <el-table-column label="专项标题" align="center" prop="zhuanxiangTitle" />
@@ -268,7 +268,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="专项标题">{{
@@ -464,14 +464,6 @@ export default {
       const id = row.id || this.ids;
       getZhuanxiang(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         if (response.data.zhuanxiangImg) {
           this.imageList = response.data.zhuanxiangImg.split(",");
         } else {
diff --git a/src/views/netManage/qlzxTj/index.vue b/src/views/netManage/qlzxTj/index.vue
index 1398b7e..97e856d 100644
--- a/src/views/netManage/qlzxTj/index.vue
+++ b/src/views/netManage/qlzxTj/index.vue
@@ -79,7 +79,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="区域" align="center" prop="areaId">
         <template slot-scope="scope">
-          {{ scope.row.areaId | filterTown }}
+          {{ $filterTown(JSON.parse(scope.row.areaId)) }}
         </template>
       </el-table-column>
       <el-table-column label="类型" align="center" prop="type">
@@ -205,7 +205,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="类型">
@@ -355,14 +355,6 @@ export default {
       const id = row.id || this.ids;
       getQlzxxdsj(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看清郎专项行动数据统计详情";
diff --git a/src/views/netManage/supervise/index.vue b/src/views/netManage/supervise/index.vue
index f1f71f3..e192e5b 100644
--- a/src/views/netManage/supervise/index.vue
+++ b/src/views/netManage/supervise/index.vue
@@ -79,7 +79,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="区域" align="center" prop="areaId">
         <template slot-scope="scope">
-          {{ scope.row.areaId | filterTown }}
+          {{ $filterTown(JSON.parse(scope.row.areaId)) }}
         </template>
       </el-table-column>
       <el-table-column label="企业类型" align="center" prop="enterpriseType">
@@ -241,7 +241,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="企业类型">
@@ -420,14 +420,6 @@ export default {
       const id = row.id || this.ids;
       getDomain(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看重点领域监管详情";
diff --git a/src/views/netManage/workDynamic/index.vue b/src/views/netManage/workDynamic/index.vue
index fe91629..7b58f02 100644
--- a/src/views/netManage/workDynamic/index.vue
+++ b/src/views/netManage/workDynamic/index.vue
@@ -233,7 +233,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="类型">{{
@@ -411,14 +411,6 @@ export default {
       const id = row.id || this.ids;
       getDongtai(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.filterFile(
           2,
           response.data.materialsFileName,
diff --git a/src/views/netManage/workItem/index.vue b/src/views/netManage/workItem/index.vue
index 8b2fa80..5b51e42 100644
--- a/src/views/netManage/workItem/index.vue
+++ b/src/views/netManage/workItem/index.vue
@@ -287,7 +287,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="推进单位">{{
@@ -474,14 +474,6 @@ export default {
       const id = row.id || this.ids;
       getWork(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看重点工作项目详情";
diff --git a/src/views/netSecurity/DataSource/index.vue b/src/views/netSecurity/DataSource/index.vue
index 88247d1..91b5375 100644
--- a/src/views/netSecurity/DataSource/index.vue
+++ b/src/views/netSecurity/DataSource/index.vue
@@ -350,7 +350,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="来源类型">
@@ -560,14 +560,6 @@ export default {
       const id = row.id || this.ids;
       getSource(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看数据来源详情";
diff --git a/src/views/netSecurity/SafetyYh/index.vue b/src/views/netSecurity/SafetyYh/index.vue
index 7e4bf8d..667b53b 100644
--- a/src/views/netSecurity/SafetyYh/index.vue
+++ b/src/views/netSecurity/SafetyYh/index.vue
@@ -316,7 +316,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="隐患类型">
@@ -531,14 +531,6 @@ export default {
       const id = row.id || this.ids;
       getDanger(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.filterFile(2, response.data.fileName, response.data.fileUrl);
         this.form = response.data;
         this.infoOpen = true;
diff --git a/src/views/netSecurity/SecurityCheck/index.vue b/src/views/netSecurity/SecurityCheck/index.vue
index f5f6476..4306c7c 100644
--- a/src/views/netSecurity/SecurityCheck/index.vue
+++ b/src/views/netSecurity/SecurityCheck/index.vue
@@ -334,7 +334,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="攻击发起时间">{{
@@ -546,14 +546,6 @@ export default {
       const id = row.id || this.ids;
       getDetection(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看安全检测详情";
diff --git a/src/views/netSecurity/supervise/DbSteam/index.vue b/src/views/netSecurity/supervise/DbSteam/index.vue
index 26769e9..60131c9 100644
--- a/src/views/netSecurity/supervise/DbSteam/index.vue
+++ b/src/views/netSecurity/supervise/DbSteam/index.vue
@@ -385,7 +385,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="系统名称">{{
@@ -626,14 +626,6 @@ export default {
       const id = row.id || this.ids;
       getSystem(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看等保系统详情";
diff --git a/src/views/netSecurity/supervise/DbUnit/index.vue b/src/views/netSecurity/supervise/DbUnit/index.vue
index 87fbda0..21a3dfb 100644
--- a/src/views/netSecurity/supervise/DbUnit/index.vue
+++ b/src/views/netSecurity/supervise/DbUnit/index.vue
@@ -337,7 +337,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="单位名称">{{
@@ -559,14 +559,6 @@ export default {
       const id = row.id || this.ids;
       getUnit(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看等保单位详情";
diff --git a/src/views/netSecurity/supervise/GovernmentWeb/index.vue b/src/views/netSecurity/supervise/GovernmentWeb/index.vue
index 9488636..f1857b1 100644
--- a/src/views/netSecurity/supervise/GovernmentWeb/index.vue
+++ b/src/views/netSecurity/supervise/GovernmentWeb/index.vue
@@ -88,7 +88,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="区域" align="center" prop="areaId">
         <template slot-scope="scope">
-          {{ scope.row.areaId | filterTown }}
+          {{ $filterTown(JSON.parse(scope.row.areaId)) }}
         </template>
       </el-table-column>
       <el-table-column label="网址" align="center" prop="url" />
@@ -220,7 +220,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="网址">{{ form.url }}</el-descriptions-item>
@@ -387,14 +387,6 @@ export default {
       const id = row.id || this.ids;
       getWeb(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看政府网站详情";
diff --git a/src/views/netSecurity/supervise/IdcUnit/index.vue b/src/views/netSecurity/supervise/IdcUnit/index.vue
index b8c46b1..9351851 100644
--- a/src/views/netSecurity/supervise/IdcUnit/index.vue
+++ b/src/views/netSecurity/supervise/IdcUnit/index.vue
@@ -82,7 +82,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="区域" align="center" prop="areaId">
         <template slot-scope="scope">
-          {{ scope.row.areaId | filterTown }}
+          {{ $filterTown(JSON.parse(scope.row.areaId)) }}
         </template>
       </el-table-column>
       <el-table-column label="名称" align="center" prop="unitName" />
@@ -191,7 +191,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="名称">{{
@@ -352,14 +352,6 @@ export default {
       const id = row.id || this.ids;
       getIDCunit(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看IDC单位详情";
diff --git a/src/views/netSecurity/tb/index.vue b/src/views/netSecurity/tb/index.vue
index 8fae868..858746e 100644
--- a/src/views/netSecurity/tb/index.vue
+++ b/src/views/netSecurity/tb/index.vue
@@ -108,7 +108,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="区域" align="center" prop="areaId">
         <template slot-scope="scope">
-          {{ scope.row.areaId | filterTown }}
+          {{ $filterTown(JSON.parse(scope.row.areaId)) }}
         </template>
       </el-table-column>
       <el-table-column label="部门名称" align="center" prop="depName" />
@@ -285,7 +285,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="通报类型">
@@ -475,14 +475,6 @@ export default {
       const id = row.id || this.ids;
       getTb(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.filterFile(2, response.data.fileName, response.data.fileUrl);
         this.form = response.data;
         this.infoOpen = true;
diff --git a/src/views/netWorkYq/index.vue b/src/views/netWorkYq/index.vue
index a76506b..8b87169 100644
--- a/src/views/netWorkYq/index.vue
+++ b/src/views/netWorkYq/index.vue
@@ -400,7 +400,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="舆情名称">{{
@@ -626,14 +626,6 @@ export default {
       const id = row.id || this.ids;
       getSentiment(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.filterFile(2, response.data.fileName, response.data.fileUrl);
 
         this.form = response.data;
diff --git a/src/views/netWorkYq/yqfl/index.vue b/src/views/netWorkYq/yqfl/index.vue
index de4cf80..f4fa8a4 100644
--- a/src/views/netWorkYq/yqfl/index.vue
+++ b/src/views/netWorkYq/yqfl/index.vue
@@ -94,7 +94,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="区域" align="center" prop="areaId">
         <template slot-scope="scope">
-          {{ scope.row.areaId | filterTown }}
+          {{ $filterTown(JSON.parse(scope.row.areaId)) }}
         </template>
       </el-table-column>
       <el-table-column label="媒体类型" align="center" prop="mediaType">
@@ -229,7 +229,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="媒体类型">
@@ -387,14 +387,6 @@ export default {
       const id = row.id || this.ids;
       getFl(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看舆情分类详情";
diff --git a/src/views/netWorkYq/yqzst/index.vue b/src/views/netWorkYq/yqzst/index.vue
index f1cd5de..672a99c 100644
--- a/src/views/netWorkYq/yqzst/index.vue
+++ b/src/views/netWorkYq/yqzst/index.vue
@@ -79,7 +79,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="区域" align="center" prop="areaId">
         <template slot-scope="scope">
-          {{ scope.row.areaId | filterTown }}
+          {{ $filterTown(JSON.parse(scope.row.areaId)) }}
         </template>
       </el-table-column>
       <el-table-column label="类型" align="center" prop="type">
@@ -205,7 +205,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="类型">
@@ -355,14 +355,6 @@ export default {
       const id = row.id || this.ids;
       getZs(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看舆情走势图详情";
diff --git a/src/views/netZoology/bjsjzb/index.vue b/src/views/netZoology/bjsjzb/index.vue
index f2cf980..dae4026 100644
--- a/src/views/netZoology/bjsjzb/index.vue
+++ b/src/views/netZoology/bjsjzb/index.vue
@@ -73,7 +73,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="区域" align="center" prop="areaId">
         <template slot-scope="scope">
-          {{ scope.row.areaId | filterTown }}
+          {{ $filterTown(JSON.parse(scope.row.areaId)) }}
         </template>
       </el-table-column>
       <el-table-column label="占比名称" align="center" prop="name" />
@@ -172,7 +172,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="占比名称">{{
@@ -315,14 +315,6 @@ export default {
       const id = row.id || this.ids;
       getBjsj(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看本级上级网评指令比列 (月)详情";
diff --git a/src/views/netZoology/netAppraiser/index.vue b/src/views/netZoology/netAppraiser/index.vue
index bca0cea..2ea7289 100644
--- a/src/views/netZoology/netAppraiser/index.vue
+++ b/src/views/netZoology/netAppraiser/index.vue
@@ -265,7 +265,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="姓名">{{
@@ -453,14 +453,6 @@ export default {
       const id = row.id || this.ids;
       getCommentator(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看网评员详情";
diff --git a/src/views/netZoology/netArticle/index.vue b/src/views/netZoology/netArticle/index.vue
index a4c9439..f7b1fb8 100644
--- a/src/views/netZoology/netArticle/index.vue
+++ b/src/views/netZoology/netArticle/index.vue
@@ -279,7 +279,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="文章类型">
@@ -561,14 +561,6 @@ export default {
       const id = row.id || this.ids;
       getArticle(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看网络文章详情";
diff --git a/src/views/netZoology/netMqPrincipal/index.vue b/src/views/netZoology/netMqPrincipal/index.vue
index b25ace9..8dc1ec5 100644
--- a/src/views/netZoology/netMqPrincipal/index.vue
+++ b/src/views/netZoology/netMqPrincipal/index.vue
@@ -214,7 +214,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="单位名称">{{
@@ -385,14 +385,6 @@ export default {
       const id = row.id || this.ids;
       getPrincipal(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看网络民情责任人详情";
diff --git a/src/views/netZoology/netP/index.vue b/src/views/netZoology/netP/index.vue
index 0b42fa4..b129b04 100644
--- a/src/views/netZoology/netP/index.vue
+++ b/src/views/netZoology/netP/index.vue
@@ -265,7 +265,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="文章类型">
diff --git a/src/views/netZoology/netSafety/index.vue b/src/views/netZoology/netSafety/index.vue
index 3931828..61a2cbb 100644
--- a/src/views/netZoology/netSafety/index.vue
+++ b/src/views/netZoology/netSafety/index.vue
@@ -251,7 +251,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="单位">{{
@@ -438,14 +438,6 @@ export default {
       const id = row.id || this.ids;
       getSafetyadmin(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看网络安全官详情";
diff --git a/src/views/netZoology/netSafetyZcUnit/index.vue b/src/views/netZoology/netSafetyZcUnit/index.vue
index c566e32..30c35ce 100644
--- a/src/views/netZoology/netSafetyZcUnit/index.vue
+++ b/src/views/netZoology/netSafetyZcUnit/index.vue
@@ -82,7 +82,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="区域" align="center" prop="areaId">
         <template slot-scope="scope">
-          {{ scope.row.areaId | filterTown }}
+          {{ $filterTown(JSON.parse(scope.row.areaId)) }}
         </template>
       </el-table-column>
       <el-table-column label="单位名称" align="center" prop="name" />
@@ -197,7 +197,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="单位名称">{{
@@ -362,14 +362,6 @@ export default {
       const id = row.id || this.ids;
       getNetSafetyZcUnit(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看网络安全支持单位详情";
diff --git a/src/views/netZoology/netVolunteer/index.vue b/src/views/netZoology/netVolunteer/index.vue
index a68ee64..4f23658 100644
--- a/src/views/netZoology/netVolunteer/index.vue
+++ b/src/views/netZoology/netVolunteer/index.vue
@@ -240,7 +240,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="类别">
@@ -414,14 +414,6 @@ export default {
       const id = row.id || this.ids;
       getVolunteer(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看网络文明自愿者详情";
diff --git a/src/views/netZoology/wpywcl/index.vue b/src/views/netZoology/wpywcl/index.vue
index debba28..ac46a42 100644
--- a/src/views/netZoology/wpywcl/index.vue
+++ b/src/views/netZoology/wpywcl/index.vue
@@ -82,7 +82,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="区域" align="center" prop="areaId">
         <template slot-scope="scope">
-          {{ scope.row.areaId | filterTown }}
+          {{ $filterTown(JSON.parse(scope.row.areaId)) }}
         </template>
       </el-table-column>
       <el-table-column label="完成率" align="center" prop="finish" />
@@ -177,7 +177,7 @@
         labelClassName="desLable"
       >
         <el-descriptions-item label="区域">{{
-          form.areaId
+          $filterTown(form.areaId)
         }}</el-descriptions-item>
 
         <el-descriptions-item label="完成率">{{
@@ -316,14 +316,6 @@ export default {
       const id = row.id || this.ids;
       getWpyrwwcl(id).then((response) => {
         response.data.areaId = JSON.parse(response.data.areaId);
-        if (
-          response.data.areaId.length > 0 &&
-          Array.isArray(response.data.areaId)
-        ) {
-          response.data.areaId = response.data.areaId.join("、");
-        } else {
-          response.data.areaId = "";
-        }
         this.form = response.data;
         this.infoOpen = true;
         this.infoTitle = "查看网评员任务完成率心详情";