Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

src/assets/scss/main-shuju.scss

@@ -159,6 +159,13 @@
       }
     }
   }
+
+  &.z-iframe {
+    padding-top: 0;
+    .aui-content--tabs {
+      padding-top: 0;
+    }
+  }
 }
 
 /* Navbar

src/utils/index.js

@@ -43,8 +43,10 @@ export function getDictLabel(dictType, dictValue) {
  * 清除登录信息
  */
 export function clearLoginInfo() {
+  console.log('==========clearLoginInfo')
   store.commit("resetStore");
   localStorage.removeItem("token");
+  localStorage.setItem('thePageAtExit', location.href);
   window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] = false;
 }
 
@@ -164,7 +166,11 @@ export function computedCard(idCard) {
   if (sex % 2 === 0)
     sex = "0"; // 性别代码 1代表男，0代表女，暂时不涉及其他类型性别
   else sex = "1";
-  return { age, sex, birth };
+  return {
+    age,
+    sex,
+    birth
+  };
 }
 // 将数组分成小块数组的集合
 export function spliceIntoChunks(arr, chunkSize) {

src/views/main-shuju/main.vue

@@ -1,22 +1,27 @@
 <template>
   <fixed1920>
-    <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,
         },
-      ]">
+        { 'z-iframe': $store.state.inIframe },
+      ]"
+    >
       <template v-if="!loading">
-        <main-navbar ref="ref_navbar" />
+        <main-navbar ref="ref_navbar" v-if="!$store.state.inIframe" />
 
         <div class="g-cnt">
-          <main-content v-if="!$store.state.contentIsNeedRefresh"
+          <main-content
-                        @changeCustomerName="changeCustomerName" />
+            v-if="!$store.state.contentIsNeedRefresh"
+            @changeCustomerName="changeCustomerName"
+          />
         </div>
-        <main-theme-tools v-if="!$store.state.inIframe" />
+        <main-theme-tools />
       </template>
     </div>
   </fixed1920>
@@ -33,10 +38,10 @@ import fixed1920 from "@/views/components/fixed1920.vue";
 import MainThemeTools from "./main-theme-tools";
 
 export default {
-  provide () {
+  provide() {
     return {
       // 刷新
-      refresh () {
+      refresh() {
         this.$store.state.contentIsNeedRefresh = true;
         this.$nextTick(() => {
           this.$store.state.contentIsNeedRefresh = false;
@@ -44,7 +49,7 @@ export default {
       },
     };
   },
-  data () {
+  data() {
     return {
       loading: true,
       userType: localStorage.getItem("userType"),
@@ -54,13 +59,13 @@ export default {
     MainNavbar,
     MainContent,
     fixed1920,
-    MainThemeTools
+    MainThemeTools,
   },
 
   watch: {
     $route: "routeHandle",
   },
-  async created () {
+  async created() {
     this.windowResizeHandle();
     this.routeHandle(this.$route);
     Promise.all([this.getWorkUserInfo()]).then(() => {
@@ -69,11 +74,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(
@@ -85,7 +90,7 @@ export default {
       );
     },
     // 路由, 监听
-    routeHandle (route) {
+    routeHandle(route) {
       if (!route.meta.isTab) {
         this.$store.state.mainShuju.activeName = "";
         this.$store.state.mainShuju.contentTabsActiveName = "";
@@ -111,7 +116,7 @@ export default {
     },
 
     // 获取当前管理员信息
-    async getWorkUserInfo () {
+    async getWorkUserInfo() {
       const url = "/epmetuser/customerstaff/staffbasicinfo";
       let params = {};
       const { data, code, msg } = await requestPost(url, params);

src/views/main.vue

@@ -22,7 +22,7 @@
           @changeCustomerName="changeCustomerName"
         />
       </div>
-      <main-theme-tools v-if="!$store.state.inIframe" />
+      <main-theme-tools />
 
       <!-- <secretary-log-notice v-if="!$store.state.inIframe" /> -->
     </template>

src/views/modules/plugins/rent/rentcontractreview.vue

@@ -196,9 +196,9 @@
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'2')">登记</el-button>
+             <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id, 'edit')">修改</el-button>
+            <el-button v-if="scope.row.state === '0'" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
             <el-button v-else type="text" size="small" @click="lookOrCheckHandle(scope.row.id,'1')">{{ $t('lookBtn') }}</el-button>
-            <!-- <el-button v-if="scope.row.isPcInput == '1'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id, 'edit')">修改</el-button> -->
-<!--            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
           </template>
         </el-table-column>
       </el-table>
@@ -229,7 +229,7 @@ export default {
       mixinViewModuleOptions: {
         getDataListURL: '/pli/power/rentContractInfo/page',
         getDataListIsPage: true,
-        deleteURL: '/pli/power/rentContractInfo',
+        deleteURL: '/pli/power/rentContractInfo/delete',
         deleteIsBatch: true
       },
       optionsV: [],

src/views/modules/visual/basicinfo/basicInfoMain.vue

@@ -137,6 +137,8 @@ import People from "./people";
 import cptCard from "@/views/modules/visual/cpts/card";
 import gridMap from "@/views/modules/visual/cpts/map/index";
 import ScreenLoading from "@/views/modules/visual/cpts/loading";
+import getQueryPara from "dai-js/modules/getQueryPara";
+
 
 let loading; //加载动画
 
@@ -191,6 +193,15 @@ export default {
   },
 
   async mounted() {
+    const queryOrgId = getQueryPara("orgId");
+    const queryOrgLevel = getQueryPara("orgLevel");
+    console.log("orgId", queryOrgId);
+    if(queryOrgId){
+      this.orgId = queryOrgId
+      this.orgLevel = queryOrgLevel || 'agency'
+    }
+
+
     //加载组织数据
     await this.loadOrgData();
     await this.loadList();

src/views/pages/login.vue

@@ -154,6 +154,16 @@ export default {
   },
 
   methods: {
+    // 登陆后跳转逻辑
+    skipAfterLogin() {
+      let href = localStorage.getItem("thePageAtExit");
+      if (href) {
+        localStorage.removeItem("thePageAtExit");
+        location.href = href;
+      } else {
+        this.$router.replace({ name: "index" });
+      }
+    },
     // 获取公钥
     getPubKey() {
       this.$http
@@ -227,7 +237,7 @@ export default {
           localStorage.setItem("userType", "work");
           localStorage.setItem("showHeader", "0");
           localStorage.setItem("token", res.data.token);
-          this.$router.replace({ name: "index" });
+          this.skipAfterLogin();
         })
         .catch(() => {});
       // epmet-ext9.elinkservice.cn/platform-admin
@@ -257,7 +267,7 @@ export default {
           localStorage.setItem("userType", "work");
 
           localStorage.setItem("token", res.data.token);
-          this.$router.replace({ name: "index" });
+          this.skipAfterLogin();
         })
         .catch(() => {
           this.endLoading();