From 569850d4758ef91abb365d87e805e2b0c21800dc 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 13:55:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/netZoology/netAppraiser/index.vue   | 11 +++
 src/views/netZoology/netArticle/index.vue     | 67 +++++++++++--------
 src/views/netZoology/netMqPrincipal/index.vue | 11 +++
 src/views/netZoology/netSafety/index.vue      | 12 ++++
 .../netZoology/netSafetyZcUnit/index.vue      | 29 +++++++-
 src/views/netZoology/netVolunteer/index.vue   | 11 +++
 6 files changed, 113 insertions(+), 28 deletions(-)

diff --git a/src/views/netZoology/netAppraiser/index.vue b/src/views/netZoology/netAppraiser/index.vue
index a65a9af..bca0cea 100644
--- a/src/views/netZoology/netAppraiser/index.vue
+++ b/src/views/netZoology/netAppraiser/index.vue
@@ -452,6 +452,15 @@ export default {
       this.reset();
       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 = "查看网评员详情";
@@ -468,6 +477,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getCommentator(id).then((response) => {
+        response.data.areaId = JSON.parse(response.data.areaId);
         this.form = response.data;
         this.open = true;
         this.title = "修改网评员";
@@ -477,6 +487,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.form.areaId = JSON.stringify(this.form.areaId);
           if (this.form.id != null) {
             updateCommentator(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
diff --git a/src/views/netZoology/netArticle/index.vue b/src/views/netZoology/netArticle/index.vue
index a701a79..a4c9439 100644
--- a/src/views/netZoology/netArticle/index.vue
+++ b/src/views/netZoology/netArticle/index.vue
@@ -144,13 +144,13 @@
             查看
           </el-button>
           <!-- v-show="scope.row.status == 2" -->
-          <el-button type="info" size="mini" @click="handPj(scope.row)"
+          <!-- <el-button type="info" size="mini" @click="handPj(scope.row)"
             >评价</el-button
-          >
+          > -->
+          <!-- v-show="scope.row.status == 2" -->
           <el-button
             type="success"
             size="mini"
-            v-show="scope.row.status == 2"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['zongzhi:article:edit']"
             >修改</el-button
@@ -305,7 +305,7 @@
           <dict-tag :options="dict.type.tc_pj_status" :value="form.status" />
         </el-descriptions-item>
       </el-descriptions>
-      <div
+      <!-- <div
         style="margin: 10px; font-size: 16px; font-weight: bold; color: #333"
       >
         评价列表
@@ -319,17 +319,17 @@
           prop="pjContent"
           :show-overflow-tooltip="true"
         />
-      </el-table>
-      <pagination
+      </el-table> -->
+      <!-- <pagination
         v-show="totalPj > 0"
         :total="totalPj"
         :page.sync="PjParams.pageNum"
         :limit.sync="PjParams.pageSize"
         @pagination="getListPj"
-      />
+      /> -->
     </el-dialog>
 
-    <el-dialog
+    <!-- <el-dialog
       :visible.sync="pjShow"
       width="500px"
       append-to-body
@@ -356,7 +356,7 @@
         <el-button type="primary" @click="submitFormPj">确 定</el-button>
         <el-button @click="cancelPj">取 消</el-button>
       </div>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 
@@ -377,7 +377,7 @@ import {
 } from "@/api/zongzhi/netZoology/netP/index.js";
 export default {
   computed: {
-    ...mapGetters(["townList", "name", "userId"]),
+    ...mapGetters(["townList", "name", "userId", "treeProps"]),
   },
   name: "Article",
   //注释字典
@@ -560,27 +560,38 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getArticle(id).then((response) => {
-        this.form = response.data;
-        if (row.status == 1) {
-          //评价过查询详情
-          this.PjParams.articleId = id;
-          this.getListPj();
-          this.infoOpen = true;
-          this.infoTitle = "查看网络文章详情";
+        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 {
-          this.infoOpen = true;
-          this.infoTitle = "查看网络文章详情";
+          response.data.areaId = "";
         }
+        this.form = response.data;
+        this.infoOpen = true;
+        this.infoTitle = "查看网络文章详情";
+        // if (row.status == 1) {
+        //   //评价过查询详情
+        //   this.PjParams.articleId = id;
+        //   this.getListPj();
+        //   this.infoOpen = true;
+        //   this.infoTitle = "查看网络文章详情";
+        // } else {
+        //   this.infoOpen = true;
+        //   this.infoTitle = "查看网络文章详情";
+        // }
       });
     },
-    getListPj() {
-      this.loadingPj = true;
-      listEvaluate(this.PjParams).then((response) => {
-        this.pjData = response.rows;
-        this.totalPj = response.total;
-        this.loadingPj = false;
-      });
-    },
+    // getListPj() {
+    //   this.loadingPj = true;
+    //   listEvaluate(this.PjParams).then((response) => {
+    //     this.pjData = response.rows;
+    //     this.totalPj = response.total;
+    //     this.loadingPj = false;
+    //   });
+    // },
 
     /** 新增按钮操作 */
     handleAdd() {
@@ -593,6 +604,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getArticle(id).then((response) => {
+        response.data.areaId = JSON.parse(response.data.areaId);
         this.form = response.data;
         this.open = true;
         this.title = "修改网络文章";
@@ -602,6 +614,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.form.areaId = JSON.stringify(this.form.areaId);
           this.form.status = 2; //未评价
           if (this.form.id != null) {
             updateArticle(this.form).then((response) => {
diff --git a/src/views/netZoology/netMqPrincipal/index.vue b/src/views/netZoology/netMqPrincipal/index.vue
index 0e4137b..b25ace9 100644
--- a/src/views/netZoology/netMqPrincipal/index.vue
+++ b/src/views/netZoology/netMqPrincipal/index.vue
@@ -384,6 +384,15 @@ export default {
       this.reset();
       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 = "查看网络民情责任人详情";
@@ -400,6 +409,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getPrincipal(id).then((response) => {
+        response.data.areaId = JSON.parse(response.data.areaId);
         this.form = response.data;
         this.open = true;
         this.title = "修改网络民情责任人";
@@ -409,6 +419,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.form.areaId = JSON.stringify(this.form.areaId);
           if (this.form.id != null) {
             updatePrincipal(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
diff --git a/src/views/netZoology/netSafety/index.vue b/src/views/netZoology/netSafety/index.vue
index de8a492..3931828 100644
--- a/src/views/netZoology/netSafety/index.vue
+++ b/src/views/netZoology/netSafety/index.vue
@@ -437,6 +437,15 @@ export default {
       this.reset();
       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 = "查看网络安全官详情";
@@ -453,6 +462,8 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getSafetyadmin(id).then((response) => {
+        response.data.areaId = JSON.parse(response.data.areaId);
+
         this.form = response.data;
         this.open = true;
         this.title = "修改网络安全官";
@@ -462,6 +473,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.form.areaId = JSON.stringify(this.form.areaId);
           if (this.form.id != null) {
             updateSafetyadmin(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
diff --git a/src/views/netZoology/netSafetyZcUnit/index.vue b/src/views/netZoology/netSafetyZcUnit/index.vue
index 69c6f1c..c566e32 100644
--- a/src/views/netZoology/netSafetyZcUnit/index.vue
+++ b/src/views/netZoology/netSafetyZcUnit/index.vue
@@ -80,7 +80,11 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="区域" align="center" prop="areaId" />
+      <el-table-column label="区域" align="center" prop="areaId">
+        <template slot-scope="scope">
+          {{ scope.row.areaId | filterTown }}
+        </template>
+      </el-table-column>
       <el-table-column label="单位名称" align="center" prop="name" />
       <el-table-column label="联系人" align="center" prop="linkMan" />
       <el-table-column label="联系电话" align="center" prop="phoneNum" />
@@ -280,6 +284,18 @@ export default {
       this.getList();
     });
   },
+  filters: {
+    filterTown(target) {
+      if (target) {
+        target = JSON.parse(target);
+        if (target.length > 0 && Array.isArray(target)) {
+          return target.join("、");
+        } else {
+          return "";
+        }
+      }
+    },
+  },
   methods: {
     /** 查询网络安全支持单位列表 */
     getList() {
@@ -345,6 +361,15 @@ export default {
       this.reset();
       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 = "查看网络安全支持单位详情";
@@ -361,6 +386,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getNetSafetyZcUnit(id).then((response) => {
+        response.data.areaId = JSON.parse(response.data.areaId);
         this.form = response.data;
         this.open = true;
         this.title = "修改网络安全支持单位";
@@ -370,6 +396,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.form.areaId = JSON.stringify(this.form.areaId);
           if (this.form.id != null) {
             updateNetSafetyZcUnit(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
diff --git a/src/views/netZoology/netVolunteer/index.vue b/src/views/netZoology/netVolunteer/index.vue
index 13e34e3..a68ee64 100644
--- a/src/views/netZoology/netVolunteer/index.vue
+++ b/src/views/netZoology/netVolunteer/index.vue
@@ -413,6 +413,15 @@ export default {
       this.reset();
       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 = "查看网络文明自愿者详情";
@@ -429,6 +438,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getVolunteer(id).then((response) => {
+        response.data.areaId = JSON.parse(response.data.areaId);
         this.form = response.data;
         this.open = true;
         this.title = "修改网络文明自愿者";
@@ -438,6 +448,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.form.areaId = JSON.stringify(this.form.areaId);
           if (this.form.id != null) {
             updateVolunteer(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");