Merge branch 'qingban' of http://192.168.101.4:3000/jiaxiaoqiang/JG-CLIENT-TEMP into qingban

docker/Dockerfile

@@ -9,7 +9,7 @@ RUN echo "server {  \
                       location   /client-server/ { \
                         proxy_pass              http://192.168.101.4:7103/; \
                         proxy_redirect          off; \
-                        proxy_set_header        Host mes-server; \
+                        proxy_set_header        Host client-server; \
                         proxy_set_header        X-Real-IP \$remote_addr; \
                         proxy_set_header        X-Forwarded-For \$proxy_add_x_forwarded_for; \
                      } \

src/components/ExcelView/index.vue

@@ -20,9 +20,9 @@
           class="in"
           v-if="option.in"
         >
-          <template #trigger>
+<!--          <template #trigger>
             <span class="btn">导入</span>
-          </template>
+          </template>-->
         </el-upload>
       </div>
       <div class="info">当前操作表格：{{ inName == "" ? "-" : inName }}</div>
@@ -81,7 +81,6 @@ const resetOb = ref({
   container: "luckysheet", // 设定DOM容器的id
   title: "Luckysheet Demo", // 设定表格名称
   lang: "zh", // 设定表格语言
-  title: false, // 工作簿名称
   enableAddBackTop: true, //返回头部按钮
   userInfo: false, // 右上角的用户信息展示样式
   showinfobar: false, // 是否显示顶部信息栏

src/layout/components/header.vue

@@ -58,8 +58,8 @@
               <el-dropdown-item command="b">退出登录</el-dropdown-item>
               <!--              <el-dropdown-item command="c" divided>Action 3</el-dropdown-item>-->
               <el-dropdown-item command="c"
-                >{{ notice ? "关闭" : "打开" }}触摸提示</el-dropdown-item
-              >
+                >{{ notice ? "关闭" : "打开" }}触摸提示
+              </el-dropdown-item>
             </el-dropdown-menu>
           </template>
         </el-dropdown>
@@ -130,7 +130,8 @@ const handleCommand = (command: string | number | object) => {
   if (command === "b") {
     logoutApi().then(() => {
       localStorage.setItem("token", "");
-      location.reload();
+      // location.reload();
+      router.replace("/login");
     });
   }
   if (command === "c") {

src/plugins/permission.ts

@@ -2,6 +2,7 @@ import router from "@/router";
 import NProgress from "@/utils/nprogress";
 import { useDictionaryStore } from "@/store/modules/dictionary";
 import { getUserDicts } from "@/api/auth";
+
 export function setupPermission() {
   // 白名单路由
   const whiteList: string[] = ["client-traceability"]; //由于包含动态路由，这里面存储的是路由的name而不是path
@@ -23,8 +24,10 @@ export function setupPermission() {
     const hasToken = localStorage.getItem("token");
     if (hasToken) {
       if (to.path === "/login") {
-        // 如果已登录，跳转首页
-        next({ path: "/" });
+        // 如果已登录，跳转首页,并且清空token
+        localStorage.setItem("token", "");
+        next();
+        // next({ path: "/" });
         NProgress.done();
       } else {
         const dictStore = useDictionaryStore();

src/router/index.ts

@@ -1,4 +1,4 @@
-import { createRouter, createWebHashHistory } from "vue-router";
+import { createRouter, createWebHistory } from "vue-router";
 
 const moduleFiles: any = import.meta.glob("./modules/*.ts", { eager: true });
 
@@ -23,7 +23,7 @@ const configRoutes = Object.keys(moduleFiles).reduce(
  * 创建路由
  */
 const router = createRouter({
-  history: createWebHashHistory(),
+  history: createWebHistory(),
   routes: configRoutes,
   // 刷新时，滚动条位置还原
   scrollBehavior: () => ({ left: 0, top: 0 }),

src/views/pro-steps/components/excel.vue

@@ -166,6 +166,7 @@ const useExcelHook = () => {
     excelData.value = excelViewRef.value.getData();
     const { data, code } = await setExcelData({
       excelData: excelData.value,
+      excelFormId: excelSelectRow.value.excelFormId,
       formName: excelSelectRow.value.formName,
       formType: excelSelectRow.value.formType,
       processId: store.scanInfo.id,