浏览代码

修改bug

bill 1 年之前
父节点
当前提交
91769355f8

+ 1 - 1
src/app/criminal/view/example/index.vue

@@ -41,7 +41,7 @@
         <CaseEditMenu
           :caseId="row.caseId"
           :prevMenu="[
-            { key: 'edit', label: '编辑案件', onClick: () => editHandler(row) },
+            { key: 'info', label: '编辑案件', onClick: () => editHandler(row) },
           ]"
           v-if="row.caseId"
         />

+ 1 - 1
src/app/fire/view/dispatch/index.vue

@@ -44,7 +44,7 @@
         <CaseEditMenu
           :prev-menu="[
             {
-              key: 'editInfo',
+              key: 'info',
               label: '火调信息',
               onClick: () => editHandler(row),
             },

+ 4 - 1
src/directive/permission.ts

@@ -16,6 +16,9 @@ export const operateIsPermissionByScene = (scene: Scene) => {
 
 // 查看某个操作是否有权限
 export const operateIsPermissionByPath = (...operate: string[]) => {
+  // if (import.meta.env.DEV) {
+  //   return true;
+  // }
   const routeName = router.currentRoute.value.name as string;
   const currentRoleName = `${routeName}:${operate.join(":")}`;
   return permission.value.find((item) => item.resourceKey === currentRoleName);
@@ -30,7 +33,7 @@ export const operateIsPermissionByDept = (data: any[]) => {
     // 4 5 只有相同depId才能操作
     const sameDeptScopes = [DataScope.personCreate, DataScope.selfInner];
     return (
-      !sameDeptScopes.includes(permission.dataScope) ||
+      !sameDeptScopes.includes((permission as any).dataScope) ||
       data[0].deptId === user.value.info.deptId
     );
   }

+ 3 - 8
src/view/case/addScenes.vue

@@ -15,9 +15,7 @@
       >
         <el-table-column type="selection" width="50" />
         <el-table-column label="标题" v-slot:default="{ row }">
-          {{
-            pagging.state.query.type === SceneType.SWMX ? row.modelTitle : row.sceneName
-          }}
+          {{ pagging.state.query.type === SceneType.SWMX ? row.modelTitle : row.name }}
         </el-table-column>
         <el-table-column
           label="原始数据格式"
@@ -59,11 +57,8 @@ const syncTableSelects = (pagging: ScenePagging) => {
 
   const stopParamWatch = watchEffect(
     () => {
-      if (pagging.state.query.type === SceneType.SWMX) {
-        pagging.state.query.status = 2;
-      } else {
-        delete pagging.state.query.status;
-      }
+      console.log(pagging.state.query.status);
+      pagging.state.query.status = 2;
     },
     { flush: "sync" }
   );

+ 12 - 7
src/view/case/editMenu.vue

@@ -8,7 +8,12 @@
     </span>
     <template #dropdown>
       <el-dropdown-menu>
-        <el-dropdown-item v-for="menu in menus" :key="menu.key" @click="menu.onClick()">
+        <el-dropdown-item
+          v-for="menu in menus"
+          :key="menu.key"
+          @click="menu.onClick()"
+          :disabled="!operateIsPermissionByPath('edit', menu.key)"
+        >
           {{ menu.label }}
         </el-dropdown-item>
       </el-dropdown-menu>
@@ -22,9 +27,8 @@ import { getFuseCodeLink, checkScenesOpen, MenuItem, getSWKKSyncLink } from "./h
 import { showCaseScenes, addCaseScenes, shareCase } from "./quisk";
 import { RouteName, router } from "@/router";
 import { getCaseSceneList } from "@/store/case";
-import { SceneType } from "@/store/scene";
 import { alert } from "@/helper/message";
-import { SceneTypeDesc, SceneTypeDomain, SceneTypePaths } from "@/constant/scene";
+import { operateIsPermissionByPath } from "@/directive/permission";
 
 const props = defineProps<{
   caseId: number;
@@ -44,7 +48,8 @@ const menus = computed(() => {
       onClick: () => item.onClick(caseId),
     })),
     {
-      key: "sceneManage",
+      key: "scene",
+      disabled: true,
       label: "场景管理",
       onClick: () =>
         showCaseScenes({
@@ -58,7 +63,7 @@ const menus = computed(() => {
       onClick: () => checkScenesOpen(caseId, `${fuseLink}#fuseEdit/merge`),
     },
     {
-      key: "getView",
+      key: "view",
       label: "视图提取",
       onClick: () => checkScenesOpen(caseId, `${fuseLink}#sceneEdit/view`),
     },
@@ -77,7 +82,7 @@ const menus = computed(() => {
       },
     },
     {
-      key: "syncScene",
+      key: "sync",
       label: "带看",
       onClick: async () => {
         const href = await getSWKKSyncLink(caseId);
@@ -85,7 +90,7 @@ const menus = computed(() => {
       },
     },
     {
-      key: "shapre",
+      key: "share",
       label: "分享",
       onClick: async () => {
         const scenes = await getCaseSceneList(caseId);

+ 2 - 3
src/view/vrmodel/sceneContent.vue

@@ -40,15 +40,14 @@
       >
         编辑
       </span>
-      <span
+      <!-- <span
         class="oper-span"
         v-pdpath="['download']"
         @click="sceneDownload({ scene: row })"
         v-if="row.num"
       >
         下载
-      </span>
-      <!-- <span class="oper-span delBtn" v-pdscene="row" @click="del(row)"> 删除 </span> -->
+      </span> -->
     </el-table-column>
   </el-table>
 </template>