From cfcaf25a9c9f9487be75a36ad34576873edd46c7 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 10 Oct 2023 09:01:38 +0800
Subject: [PATCH] 1010-01

---
 src/permission.js                     |  3 ++-
 src/views/components/dialog/index.vue |  4 +--
 src/views/yingji/enterprise.vue       |  2 +-
 src/views/yingji/planManage.vue       | 37 ++++++++++++++++++---------
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index 2262922..e8733d5 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -96,7 +96,8 @@ router.beforeEach((to, from, next) => {
           next(`/login`) // 否则全部重定向到登录页
         } else {
           console.log('路由拦截跳转登录页')
-          next()
+          // next()
+          location.href = 'http://180.108.205.123:8090/sso-server/oauth2/login?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F'
         }
         NProgress.done()
       }
diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue
index c166194..3b165a7 100644
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -450,7 +450,7 @@ export default {
           })
         }
       })
-      console.log(name)
+      // console.log(name)
       return name
     },
     // 匹配重大危险源等级
@@ -831,7 +831,7 @@ export default {
         })
         this.listOne.map((item)=>{
           if(item.institutionName == dept.deptName) {
-            console.log(item.county)
+            // console.log(item.county)
             this.form.subdistrict = item.county
             this.workingArea = item.county
             this.county = true;
diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue
index 98954b4..c301e28 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("0" + 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 970203a..e511763 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 09:48:01
+ * @LastEditTime: 2023-10-09 14:10:39
 -->
 <template>
     <div class="plan-management">
@@ -57,13 +57,13 @@
             row-key="id"
             :row-class-name="tableRowClassName"
           >
-            <el-table-column
+            <!-- <el-table-column
               type="selection"
               reserve-selection
               width="55"
               header-align="center"
             >
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               prop="plannedYear"
               label="计划年月"
@@ -137,8 +137,8 @@
             :default-expand-all="isExpandAll"
             :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
           >
-          <el-table-column prop="district" label="行政区划" header-align="center" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="amount" label="企业总数" header-align="center"></el-table-column>
+            <el-table-column prop="district" label="行政区划" header-align="center" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="amount" label="企业总数" header-align="center"></el-table-column>
             <el-table-column prop="planNumb" label="已计划数" header-align="center"></el-table-column>
             <el-table-column prop="keyCount" label="已计划省重点数" header-align="center"></el-table-column>
             <el-table-column prop="keyCount" label="剩余重点数" header-align="center"></el-table-column>
@@ -246,7 +246,8 @@
         isExpandAll: true,
         // 重新渲染表格状态
         refreshTable: true,
-        county:false
+        county:false,
+        multipleSelection:[],
       }
     },
     computed: {
@@ -267,7 +268,7 @@
           if(!this.disabled) {
             if(Array.isArray(newForm.district)){
               if(newForm.district.length == 2) {
-                let district = this.form.district[1].slice(1, 11);
+                let district = this.form.district[1].slice(0, 11);
                 obj = { ...this.pages, ...this.form,district };
               } else if(newForm.district.length == 1) {
                 let district = this.form.district[0].slice(0, 8);
@@ -282,7 +283,7 @@
                 let district = this.form.district.slice(0, 8);
                 obj = { ...this.pages, ...this.form,district };
               } else {
-                let district = this.form.district.slice(1, 11);
+                let district = this.form.district.slice(0, 11);
                 obj = { ...this.pages, ...this.form,district };
               }
             }
@@ -335,6 +336,18 @@
       },
       // 导出
       exportFile(){
+        // let arr = []
+        // this.multipleSelection.map((item)=>{
+        //   arr.push(item.enterpriseId)
+        // })
+        // this.download(
+        //   "/pharmaceuticals/bPlanEnterprise/exportplan",
+        //   {
+        //     enterpriseId:arr.join(',')
+        //   },
+        //   `计划管理.xlsx`
+        // );
+        //  this.multipleSelection.length > 0 ? `确认导出选中的数据吗？` : 
         this.$confirm(`确认根据您的搜索条件导出搜索之后的数据吗?`, "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -396,10 +409,10 @@
         if(!this.disabled) {
           if(Array.isArray(this.form.district)){
             if(this.form.district.length == 2) {
-              let district = this.form.district[1].slice(1, 11);
+              let district = this.form.district[1].slice(0, 11);
               obj = { ...this.pages, ...this.form,district };
             } else if(this.form.district.length == 1) {
-              let district = this.form.district[0].slice(1, 8);
+              let district = this.form.district[0].slice(0, 8);
               obj = { ...this.pages, ...this.form,district };
             } else {
               obj = { ...this.pages, ...this.form};
@@ -408,10 +421,10 @@
           } else {
             // 判断是区县
             if(this.county){
-              let district = this.form.district.slice(1, 8);
+              let district = this.form.district.slice(0, 8);
               obj = { ...this.pages, ...this.form,district };
             } else {
-              let district = this.form.district.slice(1, 11);
+              let district = this.form.district.slice(0, 11);
               obj = { ...this.pages, ...this.form,district };
             }
           }