围栏相关

package-lock.json

@@ -3081,6 +3081,11 @@
       "integrity": "sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==",
       "dev": true
     },
+    "china-area-data": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/china-area-data/-/china-area-data-5.0.1.tgz",
+      "integrity": "sha512-BQDPpiv5Nn+018ekcJK2oSD9PAD+E1bvXB0wgabc//dFVS/KvRqCgg0QOEUt3vBkx9XzB5a9BmkJCEZDBxVjVw=="
+    },
     "chokidar": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
@@ -4659,6 +4664,15 @@
       "integrity": "sha512-8mFfiAesXdEdE0DhkMKO7W9U6VU/9T3VTWwZ+4g84/YMP4kgwgFtQgUxuu7FUMcvSeKSNhFQNU+WZ68BQTLT5A==",
       "dev": true
     },
+    "element-china-area-data": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/element-china-area-data/-/element-china-area-data-5.0.2.tgz",
+      "integrity": "sha512-vLQuvOKJy/uiX7MRHEk3x/j09hipuIl6DJ/C4XFUG7D7Pj3O47sy+Y6aAArM6k9v8cD9UX6e+yz2S4J+IPnZ8g==",
+      "requires": {
+        "china-area-data": "^5.0.1",
+        "lodash-es": "^4.17.15"
+      }
+    },
     "element-ui": {
       "version": "2.15.1",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.1.tgz",
@@ -7543,6 +7557,11 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
+    "lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+    },
     "lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",

package.json

@@ -12,6 +12,7 @@
     "axios": "^0.21.1",
     "core-js": "^3.6.5",
     "echarts": "^4.8.0",
+    "element-china-area-data": "^5.0.2",
     "element-ui": "^2.15.1",
     "js-md5": "^0.7.3",
     "screenfull": "^5.0.0",

src/styles/layout.scss

@@ -3,7 +3,7 @@
     //   position: relative;
     //   overflow: hidden;
     // }
-  .mainColor{
+    .mainColor {
         color: #409EFF;
     }
     .wrapper {
@@ -27,6 +27,7 @@
         padding: 0 !important;
     }
 }
+
 .EnterpriseInformation {
     margin: 20px 20px;
     background: #fff;
@@ -34,6 +35,7 @@
     border-radius: 0.8rem;
     box-shadow: 1px 1px 20px #c7c5c58f;
 }
+
 // sideBar
 #app {
     .sideBar {
@@ -58,6 +60,7 @@
         }
     }
 }
+
 // header
 .header {
     height: 50px;
@@ -67,6 +70,7 @@
     left: 0;
     z-index: 999;
 }
+
 .header_l {
     width: 200px;
     height: 100%;
@@ -77,6 +81,7 @@
     transition: width 0.3s;
     overflow: hidden;
 }
+
 .header_r {
     height: 100%;
     margin-left: 200px;
@@ -84,6 +89,7 @@
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(0, 0, 0, 0.05);
     transition: all 0.3s;
 }
+
 .logoLink {
     color: $white !important;
     font-size: 15px;
@@ -100,6 +106,7 @@
         top: -3px;
     }
 }
+
 .headr_d1 {
     float: left;
     height: 100%;
@@ -113,6 +120,7 @@
         margin: 18px 0 0 20px;
     }
 }
+
 .headr_d2 {
     float: right;
     height: 100%;
@@ -163,6 +171,7 @@
         }
     }
 }
+
 .el-dropdown-menu__item {
     i {
         font-size: 16px;
@@ -173,6 +182,7 @@
         height: 100%;
     }
 }
+
 .notificatBar {
     position: fixed;
     height: calc(100% - 50px);
@@ -183,36 +193,29 @@
     background-color: $white;
     z-index: 99;
 }
+
 // collapse
 #app {
     .closeBar {
         .sideBar {
             width: 64px !important;
-      .el-menu--collapse > .sideItem .el-menu-item [class^='el-icon-'],
-      .el-menu--collapse
-        > .sideItem
-        .el-submenu
-        > .el-submenu__title
-        [class^='el-icon-'] {
+            .el-menu--collapse>.sideItem .el-menu-item [class^='el-icon-'],
+            .el-menu--collapse>.sideItem .el-submenu>.el-submenu__title [class^='el-icon-'] {
                 margin: 0;
                 vertical-align: middle;
                 width: 24px;
                 text-align: center;
             }
-      .el-menu--collapse > .sideItem .el-menu-item span,
-      .el-menu--collapse > .sideItem .el-submenu > .el-submenu__title span {
+            .el-menu--collapse>.sideItem .el-menu-item span,
+            .el-menu--collapse>.sideItem .el-submenu>.el-submenu__title span {
                 height: 0;
                 width: 0;
                 overflow: hidden;
                 visibility: hidden;
                 display: inline-block;
             }
-      .el-menu--collapse > .sideItem .el-menu-item .el-submenu__icon-arrow,
-      .el-menu--collapse
-        > .sideItem
-        .el-submenu
-        > .el-submenu__title
-        .el-submenu__icon-arrow {
+            .el-menu--collapse>.sideItem .el-menu-item .el-submenu__icon-arrow,
+            .el-menu--collapse>.sideItem .el-submenu>.el-submenu__title .el-submenu__icon-arrow {
                 display: none;
             }
         }
@@ -225,18 +228,18 @@
             margin-left: 64px;
         }
     }
-
-  .el-table td, .el-table th{
+    .el-table td,
+    .el-table th {
         padding: 7.5px 0;
     }
-
-  .el-date-editor .el-range__icon{
+    .el-date-editor .el-range__icon {
         line-height: 24px;
     }
-  .el-date-editor .el-range-separator{
+    .el-date-editor .el-range-separator {
         line-height: 24px;
     }
-  .el-table td, .el-table th{
+    .el-table td,
+    .el-table th {
         //padding: 10px 0;
     }
     .el-card__header {
@@ -246,7 +249,7 @@
         font-size: 15px;
         font-weight: bold;
         span::before {
-      content:'';
+            content: '';
             display: inline-block;
             width: 2px;
             height: 18px;
@@ -265,11 +268,11 @@
         padding-bottom: 20px;
         .count-part {
             font-size: 14px;
-      & > span:nth-child(2) {
+            &>span:nth-child(2) {
                 color: #409eff;
             }
         }
-    & > div:nth-child(2) {
+        &>div:nth-child(2) {
             flex: 1;
             text-align: center;
         }

src/views/DepartmentInformation/index.vue

@@ -38,6 +38,7 @@
             <div>
               <span> 自定义分组 </span>
               <div>
+         
                 <div
                   class="text itemlist"
                   v-for="(items, indexs) in departmentdatas[0].children"
@@ -126,6 +127,9 @@
                   header-align="center"
                   align="center"
                 >
+                    <template slot-scope="scope">
+                    <span>{{ scope.row.deptName || '/' }}</span>
+                  </template>
                 </el-table-column>
                 <el-table-column
                   prop="phoneNumber"
@@ -849,6 +853,7 @@ export default {
         this.departmentdata = table;
         this.departmentdatas = [];
         organizationsInfo({}, this.parentid).then((res) => {
+       
           if (res.status == 200) {
             
             if (res.data.orgForShort != null) {
@@ -864,7 +869,7 @@ export default {
                 children: this.departmentdata,
               });
             }
-            console.log(JSON.stringify(this.departmentdatas));
+      
           }
         });
       });
@@ -887,12 +892,9 @@ export default {
     getData(billState, page, month, rowss, sort) {
       organizationsauditType({}, this.parentid, page, rowss).then((res) => {
         if (res.status == 200) {
-          
           this.total = res.data.counts;
           this.alllength = res.data.counts;
           this.tableData = res.data.result;
-          console.log(res.data.result)
-          console.log("________")
         }
       });
     },

src/views/components/newReal.vue

@@ -823,9 +823,7 @@ export default {
         margin-right: 10px;
       }
     }
-    .el-card__body {
-      padding: 0;
-    }
+
     .footer {
       margin-left: 40px;
       border-left: 1px solid #ccc;