Merge remote-tracking branch 'origin/main'

src/permission.js

@@ -60,7 +60,7 @@ router.beforeEach((to, from, next) => {
       if(loginPath==1){
         next(`/login`) // 否则全部重定向到登录页
       }else{
-        next(`/loginPad`) // 否则全部重定向到登录页
+        next(`/pad`) // 否则全部重定向到登录页
       }
 
       NProgress.done()

src/views/pad/data/company.json

@@ -467,7 +467,7 @@
         "poi": [112.751429, 37.699199],
         "children": [
           {
-            "value": "1K001",
+            "value": "1K00100",
             "label": "国网电力公司晋中供电公司",
             "poi": [112.751429, 37.699199],
             "city": "晋中市"
@@ -546,7 +546,7 @@
         "poi": [112.732551, 38.455998],
         "children": [
           {
-            "value": "1H001",
+            "value": "1H00100",
             "label": "国网电力公司忻州供电公司",
             "poi": [112.732551, 38.455998],
             "city": "忻州市"
@@ -704,7 +704,7 @@
         "poi": [112.428691, 39.326848],
         "children": [
           {
-            "value": "1F001",
+            "value": "1F00100",
             "label": "国网电力公司朔州供电公司",
             "poi": [112.428691, 39.326848],
             "city": "朔州市"
@@ -753,7 +753,7 @@
         "poi": [113.598369, 37.856476],
         "children": [
           {
-            "value": "1C001",
+            "value": "1C00100",
             "label": "国网电力公司阳泉供电公司",
             "poi": [113.598369, 37.856476],
             "city": "阳泉市"

src/views/screen/building/distributionList.vue

@@ -185,30 +185,30 @@
       }
     }
     .flo{
-      width:33%;
+      width:20%;
       text-align: center;
     }
     .pot{
-      width:33%;
+      width:40%;
       text-align: center;
     } 
     .spa{
-      width:33%;
+      width:40%;
       text-align: center;
     }
   
   
     .fir{
-      width:33%;
+      width:20%;
       text-align: center;
       border-left: 1px solid #40E5F2;
     }
     .snd{
-      width:33%;
+      width:40%;
       text-align: center;
     }
     .thr{
-        width:33%;
+        width:40%;
         text-align: center;
     }
   

src/views/screen/data/company.json

@@ -467,7 +467,7 @@
         "poi": [112.751429, 37.699199],
         "children": [
           {
-            "value": "1K001",
+            "value": "1K00100",
             "label": "国网电力公司晋中供电公司",
             "poi": [112.751429, 37.699199],
             "city": "晋中市"
@@ -546,7 +546,7 @@
         "poi": [112.732551, 38.455998],
         "children": [
           {
-            "value": "1H001",
+            "value": "1H00100",
             "label": "国网电力公司忻州供电公司",
             "poi": [112.732551, 38.455998],
             "city": "忻州市"
@@ -704,7 +704,7 @@
         "poi": [112.428691, 39.326848],
         "children": [
           {
-            "value": "1F001",
+            "value": "1F00100",
             "label": "国网电力公司朔州供电公司",
             "poi": [112.428691, 39.326848],
             "city": "朔州市"
@@ -753,7 +753,7 @@
         "poi": [113.598369, 37.856476],
         "children": [
           {
-            "value": "1C001",
+            "value": "1C00100",
             "label": "国网电力公司阳泉供电公司",
             "poi": [113.598369, 37.856476],
             "city": "阳泉市"

src/views/screen/logistics/main.vue

@@ -40,7 +40,7 @@
           alt=""
         />
         <!-- 返回按钮 -->
-        <div class="bottom-left flex-row align-items-center">
+        <div class="bottom-left flex-row align-items-center" style="display: flex;">
             <div class="left-item">
               <el-cascader
               v-model="curCompany"

src/views/screen/service/main.vue

@@ -73,7 +73,7 @@
       />
       <!-- 返回按钮 -->
       <div class="bottom-area flex-row align-items-center space-between">
-        <div class="bottom-left flex-row align-items-center">
+        <div class="bottom-left flex-row align-items-center" style="display: flex;">
           <div class="left-item">
             <el-cascader
               v-model="curCompany"