Merge branch 'luckysheet' into dev

src/views/main-content.vue

@@ -34,7 +34,7 @@
           <template v-if="tabIsIframe(item.iframeURL)">
             <iframe
               :src="
-                item.iframeURL + '?token=' + token + '&customerId=' + customerId
+                item.iframeURL + '?token=' + `${item.iframeURL === 'http://101.126.17.175:1080/auth'?webUiToken:token}` + '&customerId=' + customerId
               "
               ref="iframes"
               class="iframes"
@@ -110,7 +110,7 @@
 import { isURL } from "@/utils/validate";
 import Cookie from "js-cookie";
 import Tips from "./tips.vue";
-import { requestPost } from "@/js/dai/request";
+import { requestPost,requestGet } from "@/js/dai/request";
 import workForm from "./modules/secretaryLog/workLog/form.vue";
 import dForm from "./modules/secretaryLog/difficulty/difficultyForm.vue";
 import hForm from "./modules/secretaryLog/humanisticCare/careForm.vue";
@@ -132,6 +132,7 @@ export default {
       formType: "",
       formLabelWidth: "120px",
       tipsList: [],
+      webUiToken:""
     };
   },
   created() {
@@ -141,6 +142,7 @@ export default {
     this.token = localStorage.getItem("token");
     this.customerId = localStorage.getItem("customerId");
     this.loopTips();
+    this.geOpenwebuiToken()
   },
   destroyed() {
     this.$store.dispatch("clearInter");
@@ -151,6 +153,12 @@ export default {
     },
   },
   methods: {
+    async geOpenwebuiToken(){
+      const {code,data} = await requestGet('/epmetuser/userOpenwebui/token')
+      if(code === 0 ){
+        this.webUiToken = data;
+      }      
+    },
     toPage(path) {
       if (path) {
         this.$router.push({

src/views/modules/base/smartExcel/cpts/excel-summary.vue

@@ -64,11 +64,12 @@ export default {
             }
         },
         close() {
-            this.showView = false
+            this.showView = false;
+            this.getTableList()
+
         },
         handleClickBack() {
             this.$emit('close')
-            this.getTableList()
         },
         handleClickShowView(val){
             const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction,subWorkBookId,workBookId,taskStateName} = val;