From 46ffffc53f6c9df8d9e70763e175cc6e6a809447 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 10 Oct 2023 15:16:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                      |  3 ++-
 src/views/components/dialog/index.vue | 22 +++++++++++-----------
 src/views/yingji/enterprise.vue       |  2 +-
 src/views/yingji/planManage.vue       | 22 ++++++++++++++++++++--
 4 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/.env.development b/.env.development
index 4e6fc0e..afae063 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
  # @Author: 张涛
  # @Date: 2023-07-18 13:04:50
  # @LastEditors: JC9527
- # @LastEditTime: 2023-10-07 16:09:34
+ # @LastEditTime: 2023-10-10 10:45:35
  # @FilePath: \Mudu2PC\.env.development
 ### 
 # 页面标题
@@ -13,6 +13,7 @@ ENV = 'development'
 
 # 苏州应急执法计划管理系统/开发环境
 # VUE_APP_BASE_API = 'http://39.101.188.84:9033'
+# VUE_APP_BASE_API = 'http://192.168.0.105:9033'
 VUE_APP_BASE_API = 'http://180.108.205.123:13002'
 # VUE_APP_BASE_API = '/api'
 
diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue
index 3b165a7..a790ef4 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(scope.row.subdistrict) || '/' }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -483,20 +483,20 @@ export default {
         // console.log('123')
         if(Array.isArray(this.form.subdistrict)){
           if(this.form.subdistrict.length == 2) {
-            this.subdistrict = this.form.subdistrict[1].slice(1, 11);
+            this.subdistrict = this.form.subdistrict[1].slice(0, 10);
             obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
           } else if(this.form.subdistrict.length == 1) {
-            this.subdistrict = this.form.subdistrict[0].slice(1, 8);
+            this.subdistrict = this.form.subdistrict[0].slice(0, 7);
             obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
           } else {
             obj = {...this.pages,...this.form}
           }
         } else {
           if(this.county){
-            let subdistrict = this.form.subdistrict.slice(1, 8);
+            let subdistrict = this.form.subdistrict.slice(0, 7);
             obj = { ...this.pages, ...this.form,subdistrict };
           } else {
-            let subdistrict = this.form.subdistrict.slice(1, 8);
+            let subdistrict = this.form.subdistrict.slice(0, 7);
             obj = { ...this.pages, ...this.form,subdistrict };
           }
         }
@@ -506,7 +506,7 @@ export default {
         //   this.subdistrict = this.form.subdistrict.slice(1, 8);
         //   obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
         // } else if(this.dept.ancestors.split(',').length == 3){
-          this.subdistrict = this.form.subdistrict.slice(1, 11);
+          this.subdistrict = this.form.subdistrict.slice(0, 10);
           obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
         // }
       }
@@ -540,9 +540,9 @@ export default {
       this.$refs.mypagination.defaultPages();
       // let obj = {...this.pages,...this.form}
       if(this.dept.ancestors.split(',').length == 2){
-        this.subdistrict = this.workingArea.slice(1, 8);
+        this.subdistrict = this.workingArea.slice(0, 7);
       } else if(this.dept.ancestors.split(',').length == 3){
-        this.subdistrict = this.form.subdistrict.slice(1, 11);
+        this.subdistrict = this.form.subdistrict.slice(0, 10);
       }
       this.getTable({...this.pages,...this.form,subdistrict:this.subdistrict});
     },
@@ -680,13 +680,13 @@ export default {
       if(this.dept.ancestors.split(',').length == 2){
         if(Array.isArray(this.form.subdistrict)) {
           if(this.form.subdistrict.length == 2) {
-            this.subdistrict = this.form.subdistrict[1].slice(1, 11);
+            this.subdistrict = this.form.subdistrict[1].slice(0, 10);
           }
         } else {
-          this.subdistrict = this.form.subdistrict.slice(1, 8);
+          this.subdistrict = this.form.subdistrict.slice(0, 7);
         }
       } else if(this.dept.ancestors.split(',').length == 3){
-        this.subdistrict = this.form.subdistrict.slice(1, 11);
+        this.subdistrict = this.form.subdistrict.slice(0, 10);
       }
       // console.log(this.subdistrict,'this.subdistrict')
       // console.log(this.form,'this.form')
diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue
index c301e28..346f9ef 100644
--- a/src/views/yingji/enterprise.vue
+++ b/src/views/yingji/enterprise.vue
@@ -117,7 +117,7 @@
           header-align="center"
         >
           <template slot-scope="scope">
-            <span>{{ componendDistrict("0" + scope.row.subdistrict) || '/' }}</span>
+            <span>{{ componendDistrict(scope.row.subdistrict) || '/' }}</span>
           </template>
         </el-table-column>
         <el-table-column
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index e511763..c574338 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-09 14:10:39
+ * @LastEditTime: 2023-10-10 10:08:28
 -->
 <template>
     <div class="plan-management">
@@ -326,8 +326,26 @@
       // 页码，当前页切换事件
       pagesChange(pages){
         // console.log('123123页码发生变化')
-        this.getList(pages)
         this.pages = pages
+        let district
+        if(this.dept.ancestors.split(',').length == 2){
+          if(Array.isArray(this.form.district)) {
+            if(this.form.district.length == 2) {
+              district = this.form.district[1].slice(0, 11);
+            }
+          } else {
+            district = this.form.district.slice(0, 8);
+          }
+        } else if(this.dept.ancestors.split(',').length == 3){
+          district = this.form.district[1].slice(0, 11);
+        } else {
+          if(this.form.district.length == 2) {
+            district = this.form.district[1].slice(0, 11);
+          } else {
+            district = this.form.district[0].slice(0, 8);
+          }
+        }
+        this.getList({...pages,...this.form,district:district})
       },
       // 选中的数据
       handleSelectionChange(val) {