Merge branch 'xj' of http://192.168.0.115:3000/bill/public-fuse into xj

src/app/fire/view/dispatch/index.vue

@@ -87,6 +87,7 @@
             await setFire({...row, isDelete: 0} as any)
             pagging.refresh();
           }"
+          v-pdpath="['retruen']"
           style="color: var(--primaryColor)"
         >
           恢复
@@ -94,6 +95,7 @@
         <span
           class="oper-span"
           @click="pagging.del(row)"
+          v-pdpath="['del']"
           style="color: var(--primaryColor)"
         >
           删除

src/constant/permission.ts

@@ -6,7 +6,7 @@ import { DataScope } from "@/store/role";
 export const permissionChilds = ["select", "update", "delete", "add"];
 
 // 共有菜单
-export const pubPermissionMenus = [RouteName.statistics];
+export const pubPermissionMenus = [];
 
 // 登录用户共有权限
 export const pubPermissions: UserPermission[] = pubPermissionMenus.map(

src/store/permission.ts

@@ -19,6 +19,7 @@ changSaveLocal("permission", () => permission.value);
  * @param routeNames 所有路由
  */
 export const getPermissionRoutes = (routeNames: string[], e: string[] = []) => {
+  console.log(permission.value);
   return routeNames
     .filter(
       (routeName) =>

src/view/case/help.ts

@@ -39,12 +39,7 @@ export const getFuseCodeLink = (caseId: number, query?: boolean) => {
 
 export const getSWKKSyncLink = async (caseId: number) => {
   const scenes = await getCaseSceneList(caseId);
-  const supportTypes = [
-    SceneType.SWKK,
-    SceneType.SWKJ,
-    SceneType.SWSSMX,
-    SceneType.SWYDMX,
-  ];
+  const supportTypes = [SceneType.SWKJ, SceneType.SWSSMX, SceneType.SWYDMX];
   const kkScenes = scenes.filter((scene) =>
     supportTypes.includes(scene.type)
   ) as QuoteScene[];

src/view/layout/slide/index.vue

@@ -20,10 +20,20 @@ import subMenu from "./submenu.vue";
 import { getPermissionRoutes } from "@/store/permission";
 import { RouteName, router } from "@/router";
 import { FireRouteName } from "@/app/fire/routeConfig";
+import { watchEffect } from "vue";
 
 const props = defineProps<{ names: string[] }>();
 
 const routes = getPermissionRoutes(props.names, []);
+watchEffect(() => {
+  if (!router.currentRoute.value.name) return;
+
+  if (!routes.some(({ name }) => name === router.currentRoute.value.name)) {
+    router.replace({ name: routes[0].name });
+  }
+
+  // if (routes)
+});
 </script>
 
 <style lang="scss" scoped>

src/view/vrmodel/modelContent.vue

@@ -60,15 +60,18 @@
         >
           查看
         </span>
-        <span
-          class="oper-span delBtn"
-          v-pdscene="row"
-          @click="delOrCancel(row)"
-          v-pdpath="'del'"
-        >
-          {{ row.createStatus !== ModelSceneStatus.RUN ? "删除" : "取消上传" }}
-        </span>
       </template>
+      <span
+        v-else-if="
+          [ModelSceneStatus.SUCCESS, ModelSceneStatus.ERR].includes(row.createStatus)
+        "
+        class="oper-span delBtn"
+        v-pdscene="row"
+        @click="delOrCancel(row)"
+        v-pdpath="'del'"
+      >
+        {{ row.createStatus !== ModelSceneStatus.RUN ? "删除" : "取消上传" }}
+      </span>
 
       <span
         v-else-if="row.createStatus === ModelSceneStatus.REV"