From f6f4fc8e3f3fd427cb515a2b5760a064025492aa Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Mon, 9 Oct 2023 10:09:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=8C=E6=94=BF=E5=8C=BA?=
 =?UTF-8?q?=E5=88=92=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/dialog/index.vue     | 12 +++++++----
 src/views/components/tempDialog/index.vue | 25 +++++++++++++----------
 src/views/yingji/planManage.vue           |  4 ++--
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue
index 7078bfd..c166194 100644
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -161,7 +161,7 @@
                   header-align="center"
                 >
                   <template slot-scope="scope">
-                    <span>{{ componendDistrict("0" + scope.row.subdistrict) }}</span>
+                    <span>{{ componendDistrict("0" + scope.row.subdistrict) || '/' }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -280,7 +280,8 @@
               <el-form-item label="计划标题:" prop="planName">
                 <el-input
                   v-model="form2.planName"
-                  :maxlength="50"
+                  :maxlength="64"
+                  show-word-limit
                   placeholder="请输入计划标题"
                 ></el-input>
               </el-form-item>
@@ -289,7 +290,8 @@
                   v-model="form2.planContent"
                   type="textarea"
                   resize="none"
-                  :maxlength="200"
+                  :maxlength="2000"
+                  show-word-limit
                   placeholder="请输入计划内容"
                 ></el-input>
               </el-form-item>
@@ -298,7 +300,8 @@
                   v-model="form2.remark"
                   type="textarea"
                   resize="none"
-                  :maxlength="200"
+                  :maxlength="2000"
+                  show-word-limit
                   placeholder="请输入备注"
                 ></el-input>
               </el-form-item>
@@ -447,6 +450,7 @@ export default {
           })
         }
       })
+      console.log(name)
       return name
     },
     // 匹配重大危险源等级
diff --git a/src/views/components/tempDialog/index.vue b/src/views/components/tempDialog/index.vue
index 6673539..0b7ada4 100644
--- a/src/views/components/tempDialog/index.vue
+++ b/src/views/components/tempDialog/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-28 11:25:48
  * @LastEditors: JC9527
- * @LastEditTime: 2023-10-02 17:03:37
+ * @LastEditTime: 2023-10-09 10:01:06
 -->
 <template>
   <el-dialog
@@ -48,14 +48,15 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="计划标题:">
-            <el-input v-model="form.planName" :readonly="readonly" :maxlength="50"></el-input>
+            <el-input v-model="form.planName" :readonly="readonly" show-word-limit :maxlength="64"></el-input>
           </el-form-item>
           <el-form-item label="计划内容:" class="form-textarea">
             <el-input 
               v-model="form.planContent"
               type="textarea"
               resize="none"
-              :maxlength="200"
+              :maxlength="2000"
+              show-word-limit
               :readonly="readonly"
               placeholder="请输入计划内容"
             ></el-input>
@@ -65,7 +66,8 @@
               v-model="form.remark"
               type="textarea"
               resize="none"
-              :maxlength="200"
+              :maxlength="2000"
+              show-word-limit
               :readonly="readonly"
               placeholder="请输入备注"
             ></el-input>
@@ -90,7 +92,6 @@
   </el-dialog>
 </template>
 <script>
-import { mapState } from "vuex";
 import { Loading } from "element-ui";
 export default {
   data() {
@@ -144,18 +145,15 @@ export default {
           value:'',
           span:2,
         },
-      ]
+      ],
+      district:[]
     }
   },
-  computed: {
-    ...mapState({
-      district: (state) => state.user.district,
-    }),
-  },
   methods:{
     open(item,id) {
       this.idTwo = id
       this.id = item.id
+      this.getDistrict()
       this.getMyData(item.id,id)
       if(id == 2) {
         this.readonly = true;
@@ -174,6 +172,7 @@ export default {
         // let listData = data.data
         this.mydistrict = district
         let myDistrict = this.componendDistrict(district)
+        console.log(myDistrict)
         let mycreateTime = createTime.split(' ')[0]
         if(idTwo == 2) {
           let obj = { entprName,myDistrict,mycreateTime,plannedYear,planName,planContent,remark }
@@ -261,6 +260,10 @@ export default {
         })
       }
     },
+    async getDistrict(){
+      let data = await this.$api.yingji.tree();
+      this.district = data.data;
+    },
     // 匹配行政区划
     componendDistrict(district){
       let name 
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index fa7674d..970203a 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-04 10:20:06
  * @LastEditors: JC9527
- * @LastEditTime: 2023-10-07 10:59:55
+ * @LastEditTime: 2023-10-09 09:48:01
 -->
 <template>
     <div class="plan-management">
@@ -79,7 +79,7 @@
               header-align="center"
             > 
               <template slot-scope="scope">
-                <span>{{ componendDistrict(scope.row.district) }}</span>
+                <span>{{ componendDistrict(scope.row.district) || '/' }}</span>
               </template>
             </el-table-column>
             <el-table-column