合并

.env.development

@@ -1,6 +1,6 @@
 NODE_ENV=development
-VUE_APP_API_SERVER =  http://epmet-dev.elinkservice.cn:41080/api
+# VUE_APP_API_SERVER =  http://epmet-dev.elinkservice.cn:41080/api
-# VUE_APP_API_SERVER =  http://192.168.1.140/api
+VUE_APP_API_SERVER =  http://192.168.1.140/api
 
 #家中开发连级的后端服务
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api

src/views/main-shuju/main.vue

@@ -1,18 +1,22 @@
 <template>
-  <div v-loading.fullscreen.lock="loading"
+  <div
-       :element-loading-text="$t('loading')"
+    v-loading.fullscreen.lock="loading"
-       :class="[
+    :element-loading-text="$t('loading')"
+    :class="[
       'g-bd',
       { 'z-sidebar--fold': $store.state.sidebarFold },
       {
         'z-sidebar--noside': true,
       },
-    ]">
+    ]"
+  >
     <template v-if="!loading">
       <main-navbar ref="ref_navbar" />
       <div class="g-cnt">
-        <main-content v-if="!$store.state.contentIsNeedRefresh"
+        <main-content
-                      @changeCustomerName="changeCustomerName" />
+          v-if="!$store.state.contentIsNeedRefresh"
+          @changeCustomerName="changeCustomerName"
+        />
       </div>
     </template>
   </div>
@@ -27,10 +31,10 @@ import nextTick from "dai-js/tools/nextTick";
 import { requestPost } from "@/js/dai/request";
 
 export default {
-  provide () {
+  provide() {
     return {
       // 刷新
-      refresh () {
+      refresh() {
         this.$store.state.contentIsNeedRefresh = true;
         this.$nextTick(() => {
           this.$store.state.contentIsNeedRefresh = false;
@@ -38,7 +42,7 @@ export default {
       },
     };
   },
-  data () {
+  data() {
     return {
       loading: true,
       userType: localStorage.getItem("userType"),
@@ -52,7 +56,7 @@ export default {
   watch: {
     $route: "routeHandle",
   },
-  async created () {
+  async created() {
     this.windowResizeHandle();
     this.routeHandle(this.$route);
     Promise.all([this.getWorkUserInfo()]).then(() => {
@@ -61,11 +65,11 @@ export default {
   },
   computed: {},
   methods: {
-    changeCustomerName (customerName) {
+    changeCustomerName(customerName) {
       this.$refs["ref_navbar"].changeCustomerName(customerName);
     },
     // 窗口改变大小
-    windowResizeHandle () {
+    windowResizeHandle() {
       this.$store.state.sidebarFold =
         document.documentElement["clientWidth"] <= 992 || false;
       window.addEventListener(
@@ -77,8 +81,10 @@ export default {
       );
     },
     // 路由, 监听
-    routeHandle (route) {
+    routeHandle(route) {
       if (!route.meta.isTab) {
+        this.$store.state.mainShuju.activeName = "";
+        this.$store.state.mainShuju.contentTabsActiveName = "";
         return false;
       }
       var tab = this.$store.state.contentTabs.filter(
@@ -101,7 +107,7 @@ export default {
     },
 
     // 获取当前管理员信息
-    async getWorkUserInfo () {
+    async getWorkUserInfo() {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
       const { data, code, msg } = await requestPost(url, params);

src/views/modules/importRecord/index.vue

@@ -1,12 +1,11 @@
 <template>
   <div class="resi-container">
     <el-card class="resi-card-table">
-
       <el-table
         :data="tableData"
         border
         style="width: 100%"
-         :height="tableHeight"
+        :height="tableHeight"
         class="resi-table"
       >
         <el-table-column label="序号" type="index" align="center" width="50" />
@@ -15,23 +14,30 @@
         <el-table-column prop="startTime" label="导入时间"> </el-table-column>
         <el-table-column label="导入状态" align="center" width="180">
           <template slot-scope="scope">
-            <span
+            <span v-if="scope.row.processStatus == 'processing'">导入中</span>
-              v-if="scope.row.processStatus == 'processing'"
+            <span v-else-if="scope.row.processStatus == 'finished_success'"
-              >导入中</span
-            >
-            <span
-              v-else-if="scope.row.processStatus == 'finished_success'"
               >已完成</span
             >
-            <a target="_blank"
+            <span v-else-if="scope.row.processStatus == 'finished_fail'"
+              >导入失败</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column label="结果说明" align="center" width="180">
+          <template slot-scope="scope">
+            <a
+              target="_blank"
               :href="scope.row.resultDescFile"
-              style="color: #00a7a9;cursor:pointer;"
+              style="color: #00a7a9; cursor: pointer"
-              v-else-if="scope.row.processStatus == 'finished_fail' && scope.row.resultDescFile"
+              v-if="scope.row.resultDescFile"
-              >下载失败说明</a
+              >下载结果说明</a
             >
             <span
-              v-else-if="scope.row.processStatus == 'finished_fail' && !scope.row.resultDescFile"
+              v-else-if="
-              >导入失败，未知错误</span
+                scope.row.processStatus == 'finished_fail' &&
+                !scope.row.resultDescFile
+              "
+              >未知错误</span
             >
           </template>
         </el-table-column>
@@ -82,13 +88,13 @@ export default {
     };
   },
   computed: {
-    tableHeight () {
+    tableHeight() {
-      const h = this.clientHeight - 240 + this.iframeHeigh
+      const h = this.clientHeight - 240 + this.iframeHeigh;
-      const _h = this.clientHeight - 240
+      const _h = this.clientHeight - 240;
-      return this.$store.state.inIframe ? h : _h
+      return this.$store.state.inIframe ? h : _h;
     },
 
-    ...mapGetters(['clientHeight', 'iframeHeight'])
+    ...mapGetters(["clientHeight", "iframeHeight"]),
   },
   watch: {},
   mounted() {
@@ -172,12 +178,8 @@ export default {
   }
 }
 
-
-
 .resi-btns {
   margin-top: 20px;
   text-align: center;
 }
-
-
 </style>

src/views/modules/visual/communityParty/party.vue

@@ -157,6 +157,8 @@ export default {
       visibleLoading: true,
       agencyId: '',
       orgType: '',
+      ageCode: '',
+      eduCode: '',
       pageNo: 1,
       pageSize: 10,
       agePageNo: 1,
@@ -489,6 +491,7 @@ export default {
 
         }
       });
+      this.ageCode = isClick && _code || ''
       this.pieAgeOptions.title.text = this.ageTotalCount
       this.pieAgeOptions.series[1].data = this.ageItem
       // this.$refs.pieChart.hideLoading()
@@ -497,6 +500,7 @@ export default {
         const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
         const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
          console.log('zlcm---isClick', isClick)
+         this.agePageNo = 1
         this.getAgeList(_arr[0], orgType, isClick && _code || '')
       }
       this.noInit = true
@@ -544,6 +548,7 @@ export default {
 
         }
       });
+      this.eduCode = isClick && _code || ''
       this.pieEduOptions.title.text = this.eduTotalCount
       this.pieEduOptions.series[1].data = this.eduItem
       // this.$refs.pieChart.hideLoading()
@@ -551,7 +556,7 @@ export default {
       if (this.noEduInit) {
         const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
         const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
-
+        this.pageNo = 1
         this.getEduList(_arr[0], orgType, isClick && _code || '')
       }
       this.noEduInit = true
@@ -757,20 +762,20 @@ export default {
     pageSizeChangeHandleAge(val) {
       this.agePageNo = 1
       this.agePageSize = val
-      this.getAgeList(this.agencyId, this.orgType)
+      this.getAgeList(this.agencyId, this.orgType, this.ageCode)
     },
     pageCurrentChangeHandleAge (val) {
       this.agePageNo = val
-      this.getAgeList(this.agencyId, this.orgType)
+      this.getAgeList(this.agencyId, this.orgType, this.ageCode)
     },
     pageSizeChangeHandleNew(val) {
       this.pageNo = 1;
       this.pageSize = val;
-      this.getEduList(this.agencyId, this.orgType)
+      this.getEduList(this.agencyId, this.orgType, this.eduCode)
     },
     pageCurrentChangeHandleNew(val) {
       this.pageNo = val;
-      this.getEduList(this.agencyId, this.orgType)
+      this.getEduList(this.agencyId, this.orgType, this.eduCode)
     },
   },
 };

src/views/modules/warning/components/screen-table/index.vue

@@ -325,13 +325,13 @@ export default {
               box-sizing: border-box;
               display: block;
               box-sizing: border-box;
-              width: 215px;
+              width: 500px;
               height: auto;
               line-height: 20px;
               border: 1px solid red;
               position: absolute;
               right: -100%;
-              top: 150%;
+              bottom: 150%;
               background: #fff;
               box-shadow: 0 0 10px 0 #2194fe;
               border: 1px solid #42a4fe;