From 9d6c86a9ddfbecd710b4358a72c82bb3d21e3f3a Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 17 Oct 2023 17:05:50 +0800
Subject: [PATCH] 17:05

---
 .env.development                              |  8 ----
 src/views/tcZz/netManage/gzdt/index.vue       | 39 ++++++++++++++-----
 src/views/tcZz/netManage/jbmap/index.vue      |  5 ++-
 src/views/tcZz/netManage/jbsjndfltj/index.vue | 30 +++++++++++---
 src/views/tcZz/netManage/ytlc/index.vue       | 39 ++++++++++++++-----
 src/views/tcZz/netManage/zdgzxm/index.vue     | 10 ++++-
 src/views/tcZz/netWorkYq/yqbg/index.vue       | 39 ++++++++++++++-----
 src/views/tcZz/netWorkYq/yqxxltj/index.vue    |  5 ++-
 src/views/tcZz/netWorkYq/yqyj/index.vue       |  5 ++-
 9 files changed, 129 insertions(+), 51 deletions(-)

diff --git a/.env.development b/.env.development
index 69c5e64..017f1d3 100644
--- a/.env.development
+++ b/.env.development
@@ -1,11 +1,3 @@
-###
- # @Descripttion: 
- # @version: 
- # @Author: JC9527
- # @Date: 2023-10-12 11:15:34
- # @LastEditors: JC9527
- # @LastEditTime: 2023-10-13 10:50:13
-### 
 # 页面标题
 VUE_APP_TITLE = 若依管理系统
 
diff --git a/src/views/tcZz/netManage/gzdt/index.vue b/src/views/tcZz/netManage/gzdt/index.vue
index 5232d2a..3b43e89 100644
--- a/src/views/tcZz/netManage/gzdt/index.vue
+++ b/src/views/tcZz/netManage/gzdt/index.vue
@@ -238,7 +238,7 @@
                           <el-input v-model="form.fileName" placeholder="请输入文件名称" />
                         </el-form-item> -->
                         <el-form-item label="文件路径(完整路径)">
-                          <fileUpload v-model="form.fileUrl"/>
+                          <fileUpload v-model="fileNameS"/>
                         </el-form-item>
                         <el-form-item label="备注" prop="remark">
                           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -352,7 +352,8 @@
         form: {},
         // 表单校验
         rules: {
-        }
+        },
+        fileNameS:[]
       };
     },
     created() {
@@ -445,15 +446,27 @@
       /** 新增按钮操作 */
       handleAdd() {
         this.reset();
+        this.fileNameS = [];
         this.open = true;
         this.title = "添加工作动态";
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
         this.reset();
+        this.fileNameS = []
         const id = row.id || this.ids
         getGzdt(id).then(response => {
           this.form = response.data;
+          if (response.data.fileName && response.data.fileUrl) {
+            let arr1 = response.data.fileName.split(",");
+            let arr2 = response.data.fileUrl.split(",");
+            arr1.forEach((value, index) => {
+              this.fileNameS.push({
+                name: value,
+                url: arr2[index],
+              });
+            });
+          }
           this.open = true;
           this.title = "修改工作动态";
         });
@@ -471,16 +484,22 @@
       },
       /** 提交按钮 */
       submitForm() {
+        let arr1 = [];
+        let arr2 = [];
+        console.log(this.fileNameS)
+        if (this.fileNameS.length > 0) {
+          this.fileNameS.forEach((value) => {
+            arr1.push(value.name);
+            arr2.push(value.url);
+          });
+          this.form.fileName = arr1.join(",");
+          this.form.fileUrl = arr2.join(",");
+        } else {
+          this.form.fileName = "";
+          this.form.fileUrl = "";
+        }
         this.$refs["form"].validate(valid => {
           if (valid) {
-            let arr = [];
-            let arr2 = []
-            this.form.fileUrl.map((item)=>{
-              arr.push(item.name);
-              arr2.push(item.url);
-            })
-            this.form.fileName = arr.join(',');
-            this.form.fileUrl = arr2.join(',');
             if (this.form.id != null) {
               updateGzdt(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
diff --git a/src/views/tcZz/netManage/jbmap/index.vue b/src/views/tcZz/netManage/jbmap/index.vue
index aaf86ea..f18d863 100644
--- a/src/views/tcZz/netManage/jbmap/index.vue
+++ b/src/views/tcZz/netManage/jbmap/index.vue
@@ -298,7 +298,8 @@
                           <el-input v-model="form.address" placeholder="请输入地址" />
                         </el-form-item>
                         <el-form-item label="举报内容">
-                          <editor v-model="form.content" :min-height="192"/>
+                          <!-- <editor v-model="form.content" :min-height="192"/> -->
+                          <el-input v-model="form.content" resize="none" :rows="5" type="textarea" placeholder="请输入内容" />
                         </el-form-item>
                         <el-form-item label="是否处置" prop="state">
                           <el-select v-model="form.state" placeholder="请选择是否处置">
@@ -350,7 +351,7 @@
 
                       <el-descriptions-item label="地址">{{ form.address }}</el-descriptions-item>
 
-                      <el-descriptions-item label="举报内容"><div v-html="form.content"></div></el-descriptions-item>
+                      <el-descriptions-item label="举报内容">{{ form.content }}</el-descriptions-item>
 
                       <el-descriptions-item label="是否处置">{{ selectDictLabel(dict.type.tc_czstate,form.state) }}</el-descriptions-item>
 
diff --git a/src/views/tcZz/netManage/jbsjndfltj/index.vue b/src/views/tcZz/netManage/jbsjndfltj/index.vue
index b1435fa..33187eb 100644
--- a/src/views/tcZz/netManage/jbsjndfltj/index.vue
+++ b/src/views/tcZz/netManage/jbsjndfltj/index.vue
@@ -12,13 +12,21 @@
                     />
                   </el-form-item> -->
                   <el-form-item label="类型" prop="type">
-                    <el-input
+                    <!-- <el-input
                         v-model="queryParams.type"
                         placeholder="请输入类型"
                         clearable
                         size="small"
                         @keyup.enter.native="handleQuery"
-                    />
+                    /> -->
+                    <el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small">
+                      <el-option
+                          v-for="dict in dict.type.tc_jbsjtype"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                      />
+                    </el-select>
                   </el-form-item>
                   <el-form-item label="数量" prop="count">
                     <el-input
@@ -120,7 +128,11 @@
     <el-table v-loading="loading" :data="jbsjndfltjList"  @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
               <!-- <el-table-column label="序号" align="center" prop="id" /> -->
-              <el-table-column label="类型" align="center" prop="type" />
+              <el-table-column label="类型" align="center" prop="type">
+                <template slot-scope="scope">
+                  <dict-tag :options="dict.type.tc_jbsjtype" :value="scope.row.type"/>
+                </template>
+              </el-table-column>
               <el-table-column label="数量" align="center" prop="count" />
               <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
       <el-table-column label="操作" align="center"  class-name="small-padding fixed-width" width="200"  fixed="right">
@@ -161,7 +173,14 @@
      <div slot="title" class="dialog-title">{{ title }}</div>
       <el-form ref="form" :model="form" :rules="rules" label-width="auto" class="dialog-from">
                         <el-form-item label="类型" prop="type">
-                          <el-input v-model="form.type" placeholder="请输入类型" />
+                          <el-select v-model="form.type" placeholder="请选择类型">
+                            <el-option
+                                v-for="dict in dict.type.tc_jbsjtype"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="parseInt(dict.value)"
+                            ></el-option>
+                          </el-select>
                         </el-form-item>
                         <el-form-item label="数量" prop="count">
                           <el-input v-model="form.count" placeholder="请输入数量" />
@@ -188,7 +207,7 @@
      <div slot="title" class="dialog-title">{{ infoTitle }}</div>
 
         <el-descriptions title="举报事件年度分类统计"  :column="2" border labelClassName="desLable">
-                      <el-descriptions-item label="类型">{{ form.type }}</el-descriptions-item>
+                      <el-descriptions-item label="类型">{{ selectDictLabel(dict.type.tc_jbsjtype,form.type) }}</el-descriptions-item>
 
                       <el-descriptions-item label="数量">{{ form.count }}</el-descriptions-item>
 
@@ -205,6 +224,7 @@
   export default {
     name: "Jbsjndfltj",
     //注释字典
+    dicts: ['tc_jbsjtype'],
     data() {
       return {
         tableHeigth: 0,
diff --git a/src/views/tcZz/netManage/ytlc/index.vue b/src/views/tcZz/netManage/ytlc/index.vue
index 0275306..ab7610d 100644
--- a/src/views/tcZz/netManage/ytlc/index.vue
+++ b/src/views/tcZz/netManage/ytlc/index.vue
@@ -168,7 +168,7 @@
                           <el-input v-model="form.fileName" placeholder="请输入文件名称" />
                         </el-form-item> -->
                         <el-form-item label="文件路径(完整路径)">
-                          <fileUpload v-model="form.fileUrl"/>
+                          <fileUpload v-model="fileNameS"/>
                         </el-form-item>
                         <el-form-item label="备注" prop="remark">
                           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -269,7 +269,8 @@
         form: {},
         // 表单校验
         rules: {
-        }
+        },
+        fileNameS:[]
       };
     },
     created() {
@@ -356,31 +357,49 @@
       /** 新增按钮操作 */
       handleAdd() {
         this.reset();
+        this.fileNameS = [];
         this.open = true;
         this.title = "添加约谈流程";
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
         this.reset();
+        this.fileNameS = []
         const id = row.id || this.ids
         getYtlc(id).then(response => {
           this.form = response.data;
+          if (response.data.fileName && response.data.fileUrl) {
+            let arr1 = response.data.fileName.split(",");
+            let arr2 = response.data.fileUrl.split(",");
+            arr1.forEach((value, index) => {
+              this.fileNameS.push({
+                name: value,
+                url: arr2[index],
+              });
+            });
+          }
           this.open = true;
           this.title = "修改约谈流程";
         });
       },
       /** 提交按钮 */
       submitForm() {
+        let arr1 = [];
+        let arr2 = [];
+        console.log(this.fileNameS)
+        if (this.fileNameS.length > 0) {
+          this.fileNameS.forEach((value) => {
+            arr1.push(value.name);
+            arr2.push(value.url);
+          });
+          this.form.fileName = arr1.join(",");
+          this.form.fileUrl = arr2.join(",");
+        } else {
+          this.form.fileName = "";
+          this.form.fileUrl = "";
+        }
         this.$refs["form"].validate(valid => {
           if (valid) {
-            let arr = [];
-            let arr2 = []
-            this.form.fileUrl.map((item)=>{
-              arr.push(item.name);
-              arr2.push(item.url);
-            })
-            this.form.fileName = arr.join(',');
-            this.form.fileUrl = arr2.join(',');
             if (this.form.id != null) {
               console.log(this.form)
               updateYtlc(this.form).then(response => {
diff --git a/src/views/tcZz/netManage/zdgzxm/index.vue b/src/views/tcZz/netManage/zdgzxm/index.vue
index 03a16e1..c77fc4c 100644
--- a/src/views/tcZz/netManage/zdgzxm/index.vue
+++ b/src/views/tcZz/netManage/zdgzxm/index.vue
@@ -245,7 +245,8 @@
                           <el-input v-model="form.itemName" placeholder="请输入项目名称" />
                         </el-form-item>
                         <el-form-item label="项目内容">
-                          <editor v-model="form.itemContent" :min-height="192"/>
+                          <!-- <editor v-model="form.itemContent" :min-height="192"/> -->
+                          <el-input v-model="form.itemContent" resize="none" :rows="5" type="textarea" placeholder="请输入内容" />
                         </el-form-item>
                         <el-form-item label="项目类型" prop="itemType">
                           <el-input v-model="form.itemType" placeholder="请输入项目类型" />
@@ -283,7 +284,7 @@
 
                       <el-descriptions-item label="项目名称">{{ form.itemName }}</el-descriptions-item>
 
-                      <el-descriptions-item label="项目内容"><div v-html="form.itemContent"></div></el-descriptions-item>
+                      <el-descriptions-item label="项目内容">{{ form.itemContent }}</el-descriptions-item>
 
                       <el-descriptions-item label="项目类型"><div v-html="form.itemType"></div></el-descriptions-item>
 
@@ -540,3 +541,8 @@
   }
 
 </script>
+<style lang="scss" scope>
+::v-deep .el-textarea {
+
+}
+</style>
diff --git a/src/views/tcZz/netWorkYq/yqbg/index.vue b/src/views/tcZz/netWorkYq/yqbg/index.vue
index c8a3317..f272940 100644
--- a/src/views/tcZz/netWorkYq/yqbg/index.vue
+++ b/src/views/tcZz/netWorkYq/yqbg/index.vue
@@ -223,7 +223,7 @@
                           <el-input v-model="form.fileName" placeholder="请输入文件名称" />
                         </el-form-item> -->
                         <el-form-item label="文件路径(完整路径)">
-                          <fileUpload v-model="form.fileUrl"/>
+                          <fileUpload v-model="fileNameS"/>
                         </el-form-item>
                         <el-form-item label="备注" prop="remark">
                           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -337,7 +337,8 @@
         form: {},
         // 表单校验
         rules: {
-        }
+        },
+        fileNameS:[]
       };
     },
     created() {
@@ -430,15 +431,27 @@
       /** 新增按钮操作 */
       handleAdd() {
         this.reset();
+        this.fileNameS = [];
         this.open = true;
         this.title = "添加舆情报告";
       },
       /** 修改按钮操作 */
       handleUpdate(row) {
         this.reset();
+        this.fileNameS = []
         const id = row.id || this.ids
         getYqbg(id).then(response => {
           this.form = response.data;
+          if (response.data.fileName && response.data.fileUrl) {
+            let arr1 = response.data.fileName.split(",");
+            let arr2 = response.data.fileUrl.split(",");
+            arr1.forEach((value, index) => {
+              this.fileNameS.push({
+                name: value,
+                url: arr2[index],
+              });
+            });
+          }
           this.open = true;
           this.title = "修改舆情报告";
         });
@@ -456,16 +469,22 @@
       },
       /** 提交按钮 */
       submitForm() {
+        let arr1 = [];
+        let arr2 = [];
+        console.log(this.fileNameS)
+        if (this.fileNameS.length > 0) {
+          this.fileNameS.forEach((value) => {
+            arr1.push(value.name);
+            arr2.push(value.url);
+          });
+          this.form.fileName = arr1.join(",");
+          this.form.fileUrl = arr2.join(",");
+        } else {
+          this.form.fileName = "";
+          this.form.fileUrl = "";
+        }
         this.$refs["form"].validate(valid => {
           if (valid) {
-            let arr = [];
-            let arr2 = []
-            this.form.fileUrl.map((item)=>{
-              arr.push(item.name);
-              arr2.push(item.url);
-            })
-            this.form.fileName = arr.join(',');
-            this.form.fileUrl = arr2.join(',');
             if (this.form.id != null) {
               updateYqbg(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
diff --git a/src/views/tcZz/netWorkYq/yqxxltj/index.vue b/src/views/tcZz/netWorkYq/yqxxltj/index.vue
index 4500e5b..5d68523 100644
--- a/src/views/tcZz/netWorkYq/yqxxltj/index.vue
+++ b/src/views/tcZz/netWorkYq/yqxxltj/index.vue
@@ -275,7 +275,8 @@
                           </el-date-picker>
                         </el-form-item>
                         <el-form-item label="内容">
-                          <editor v-model="form.content" :min-height="192"/>
+                          <!-- <editor v-model="form.content" :min-height="192"/> -->
+                          <el-input v-model="form.content" resize="none" :rows="5" type="textarea" placeholder="请输入内容" />
                         </el-form-item>
                         <el-form-item label="备注" prop="remark">
                           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -311,7 +312,7 @@
 
                       <el-descriptions-item label="时间">{{ form.dateTime }}</el-descriptions-item>
 
-                      <el-descriptions-item label="内容"><div v-html='form.content'></div></el-descriptions-item>
+                      <el-descriptions-item label="内容">{{ form.content }}</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 1c3d73e..1a0f6d8 100644
--- a/src/views/tcZz/netWorkYq/yqyj/index.vue
+++ b/src/views/tcZz/netWorkYq/yqyj/index.vue
@@ -250,7 +250,8 @@
                           </el-date-picker>
                         </el-form-item>
                         <el-form-item label="内容">
-                          <editor v-model="form.content" :min-height="192"/>
+                          <!-- <editor v-model="form.content" :min-height="192"/> -->
+                          <el-input v-model="form.content" resize="none" :rows="5" type="textarea" placeholder="请输入内容" />
                         </el-form-item>
                         <el-form-item label="备注" prop="remark">
                           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -284,7 +285,7 @@
 
                       <el-descriptions-item label="时间">{{ form.dateTime }}</el-descriptions-item>
 
-                      <el-descriptions-item label="内容"><div v-html='form.content'></div></el-descriptions-item>
+                      <el-descriptions-item label="内容">{{ form.content }}</el-descriptions-item>
 
                       <el-descriptions-item label="备注">{{ form.remark }}</el-descriptions-item>