江门2.0 修改

.env.development

@@ -7,7 +7,7 @@ VITE_PUBLIC_PATH = ./
 # Cross-domain proxy, you can configure multiple
 # Please note that no line breaks
 # VITE_PROXY = [["/service","http://192.168.9.27:1804"], ["/fusion","http://192.168.9.27:1804"]]
-VITE_PROXY = [["/service","http://192.168.0.43:8088"], ["/fusion","http://192.168.0.43:8088"]]
+VITE_PROXY = [["/service","http://192.168.0.125:1804"], ["/fusion","http://192.168.0.125:1804"]]
 # VITE_PROXY=[["/api","https://vvbin.cn/test"]]
 
 # Delete console

src/api/jyUserPlatform/index.ts

@@ -17,6 +17,7 @@ enum Api {
   yhupdate = '/service/manage/jyUserPlatform/update',
   yhdel = '/service/manage/jyUserPlatform/del',
   addressKey = '/service/manage/index/addressKey/',
+  sceneGroupCount = '/service/manage/scene/sceneGroupCount/',
 }
 
 /**
@@ -34,6 +35,17 @@ export const allList = (params: PageParams) =>
     },
   });
 
+export const sceneGroupCount = ({ type = 'platform' }) =>
+  defHttp.get<userList>({
+    url: Api.sceneGroupCount + type,
+    params: {},
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
 export const jyPlatformlist = (params: PageParams) =>
   defHttp.post({
     url: Api.list,

src/api/operate/case.ts

@@ -14,6 +14,7 @@ enum Api {
   caseTabulationCopy = '/service/manage/caseTabulation/copy',
   caseTabulationRename = '/service/manage/caseTabulation/rename',
   caseTabulationDel = '/service/manage/caseTabulation/del',
+  caseFusionAdd = '/service/manage/caseFusion/addOrUpdate',
   caseFusionList = '/service/manage/caseFusion/list',
   caseFusionMove = '/service/manage/caseFusion/move',
   caseFusionDel = '/service/manage/caseFusion/del',
@@ -109,6 +110,17 @@ export const caseTabulationDel = (params) =>
       ignoreCancelToken: true,
     },
   });
+export const caseFusionAdd = (params) =>
+  defHttp.post<Result>({
+    url: Api.caseFusionAdd,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
 export const caseFusionList = (params: PageParams) =>
   defHttp.post<Result>({
     url: Api.caseFusionList,

src/api/operate/draw.ts

@@ -6,10 +6,12 @@ import { getToken } from '/@/utils/auth';
 const token = getToken();
 
 enum Api {
+  caseOverviewAdd = '/fusion/caseOverview/addOrUpdate',
   caseOverviewList = '/service/manage/caseOverview/list',
   caseOverviewCopy = '/service/manage/caseOverview/copy',
   caseOverviewRename = '/service/manage/caseOverview/rename',
   caseOverviewDel = '/service/manage/caseOverview/del',
+  caseTabulationAdd = '/fusion/caseTabulation/addOrUpdate',
   caseTabulationList = '/service/manage/caseTabulation/list',
   caseTabulationCopy = '/service/manage/caseTabulation/copy',
   caseTabulationRename = '/service/manage/caseTabulation/rename',
@@ -19,6 +21,16 @@ enum Api {
 /**
  * @description: Get sample list value
  */
+export const caseOverviewAdd = (params) =>
+  defHttp.post<Result>({
+    url: Api.caseOverviewAdd,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 
 export const caseOverviewList = (params: PageParams) =>
   defHttp.post<Result>({
@@ -30,6 +42,27 @@ export const caseOverviewList = (params: PageParams) =>
       ignoreCancelToken: true,
     },
   });
+export const caseTabulationAdd = (params) =>
+  defHttp.post<Result>({
+    url: Api.caseTabulationAdd,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
+export const caseOverImgList = (params: PageParams) =>
+  defHttp.post<Result>({
+    url: params.tableType ? Api.caseTabulationList : Api.caseOverviewList,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 export const caseOverviewRename = (params) =>
   defHttp.post<Result>({
     url: Api.caseOverviewRename,

src/api/operate/index.ts

@@ -72,6 +72,7 @@ enum Api {
   getInfoMail = '/service/manage/getInfo',
   updateMail = '/service/manage/update',
   caseaddOrUpdate = '/service/manage/case/addOrUpdate',
+  addFusionIds = '/fusion/case/addFusionIds',
   caseList = '/service/manage/case/list',
   caseSceneList = '/service/manage/case/sceneList',
   caseDel = '/service/manage/case/del',
@@ -94,6 +95,8 @@ enum Api {
   getCaseByNum = '/service/manage/case/getCaseByNum',
   getSceneBuildLog = '/service/manage/scene/getSceneBuildLog/',
   uploadSceneOrig = '/service/manage/scene/uploadSceneOrig',
+  uploadSceneCheck = '/service/manage/scene/uploadSceneCheck',
+  caseFusionList = '/service/manage/caseFusion/list',
 }
 
 /**
@@ -183,6 +186,16 @@ export const caseaddOrUpdateApi = (params: PageParams) =>
       ignoreCancelToken: true,
     },
   });
+export const addFusionIds = (params: PageParams) =>
+  defHttp.post<RentListGetResultModel>({
+    url: Api.addFusionIds,
+    params: params,
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
 
 export const casePublicApi = (params: PageParams) =>
   defHttp.get<RentListGetResultModel>({
@@ -330,7 +343,7 @@ export const newDelete = (params: PageParams) =>
     },
   });
 
-export const operateSceneList = (params: operateList) =>
+export const operateSceneList = (params) =>
   defHttp.post<Result>({
     url: Api.operateSceneList,
     params: params,
@@ -340,6 +353,18 @@ export const operateSceneList = (params: operateList) =>
       ignoreCancelToken: true,
     },
   });
+export const operateAddSceneList = (params) => {
+  console.log('operateAddSceneList', params);
+  return defHttp.post<Result>({
+    url: params.sceneType == 2 || params.sceneType == 3 ? Api.caseFusionList : Api.operateSceneList,
+    params: { ...params, isShare: params.sceneType == 3 || params.sceneType == 1 ? 1 : 0 },
+    // data: params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+};
 export const overallList = (params: overallList) =>
   defHttp.post<Result>({
     url: Api.overallList,
@@ -594,7 +619,7 @@ export const getByRyId = (params) =>
     },
   });
 // 根据警员ID获取用户列表
-export const getinnerByRyId = (params) =>
+export const getinnerByRyId = (params, isTransformResponse= false) =>
   defHttp.post<Result>(
     {
       url: Api.getinnerByRyId,
@@ -605,7 +630,7 @@ export const getinnerByRyId = (params) =>
       },
     },
     {
-      isTransformResponse: false,
+      isTransformResponse: isTransformResponse,
     },
   );
 
@@ -724,3 +749,14 @@ export const uploadSceneOrig = (filePath) =>
       ignoreCancelToken: true,
     },
   });
+export const uploadSceneCheck = (filePath) =>
+  defHttp.post<Result>({
+    url: Api.uploadSceneCheck,
+    params: {
+      filePath,
+    },
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });

src/components/Upload/src/UploadModal.vue

@@ -81,7 +81,7 @@
       //   是否正在上传
       const isUploadingRef = ref(false);
       const fileListRef = ref<FileItem[]>([]);
-      const { accept, helpText, maxNumber, maxSize } = toRefs(props);
+      const { accept, helpText, maxNumber, maxSize, sizeUnit } = toRefs(props);
 
       const { t } = useI18n();
       const [register, { closeModal }] = useModalInner();
@@ -91,6 +91,7 @@
         helpTextRef: helpText,
         maxNumberRef: maxNumber,
         maxSizeRef: maxSize,
+        sizeUnitRef: sizeUnit,
       });
 
       const { createMessage } = useMessage();
@@ -125,17 +126,17 @@
       // 上传前校验
       function beforeUpload(file: File) {
         const { size, name } = file;
-        const { maxSize, accept } = props;
+        const { maxSize, accept, sizeUnit } = props;
         const type = name.split('.').pop() || '';
         console.log('beforeUpload', type, name);
         if (accept && accept.length > 0 && !accept.includes(type.toLowerCase())) {
           createMessage.error(t('component.upload.accept', [accept.join(',')]));
           return false;
         }
-        console.log('file', type, props);
+        let newMaxSize = sizeUnit == 'GB'? (maxSize*1024) : sizeUnit == 'KB'? (maxSize/1024) : maxSize
         // 设置最大值，则判断
-        if (maxSize && file.size / 1024 / 1024 >= maxSize) {
-          createMessage.error(t('component.upload.maxSizeMultiple', [maxSize]));
+        if (maxSize && file.size / 1024 / 1024 >= newMaxSize) {
+          createMessage.error(t('component.upload.maxSizeMultiple', {number: maxSize, unit: sizeUnit || 'MB'}));
           return false;
         }
 

src/components/Upload/src/data.tsx

@@ -2,7 +2,8 @@ import type { BasicColumn, ActionItem } from '/@/components/Table';
 import { FileItem, PreviewFileItem, UploadResultStatus } from './typing';
 import {
   // checkImgType,
-  isImgTypeByName,validateBase64
+  isImgTypeByName,
+  validateBase64,
 } from './helper';
 import { Progress, Tag } from 'ant-design-vue';
 import TableAction from '/@/components/Table/src/components/TableAction.vue';
@@ -52,7 +53,13 @@ export function createTableColumns(): BasicColumn[] {
       title: t('component.upload.fileSize'),
       width: 100,
       customRender: ({ text = 0 }) => {
-        return text && (text / 1024).toFixed(2) + 'KB';
+        const kb = text && (text / 1024).toFixed(2);
+        if (kb > 1024 * 1024) {
+          return (kb / (1024 * 1024)).toFixed(2) + 'GB';
+        } else if (kb > 1024) {
+          return (kb / 1024).toFixed(2) + 'MB';
+        }
+        return kb + 'KB';
       },
     },
     // {
@@ -110,10 +117,10 @@ export function createPreviewColumns(): BasicColumn[] {
       title: t('component.upload.legend'),
       width: 100,
       customRender: ({ record }) => {
-        console.log('record',record)
+        console.log('record', record);
         const { url } = (record as PreviewFileItem) || {};
-        if(validateBase64(url)){
-          return <ThumbUrl fileUrl={url} />
+        if (validateBase64(url)) {
+          return <ThumbUrl fileUrl={url} />;
         }
         return isImgTypeByName(url) && <ThumbUrl fileUrl={url} />;
       },
@@ -139,7 +146,7 @@ export function createPreviewActionColumn({
     dataIndex: 'action',
     fixed: false,
     customRender: ({ record }) => {
-      console.log('record',record)
+      console.log('record', record);
       const actions: ActionItem[] = [
         {
           label: t('component.upload.del'),
@@ -148,7 +155,7 @@ export function createPreviewActionColumn({
         },
         {
           label: t('component.upload.download'),
-          ifShow:false,
+          ifShow: false,
           onClick: handleDownload.bind(null, record),
         },
       ];

src/components/Upload/src/props.ts

@@ -1,5 +1,6 @@
 import type { PropType } from 'vue';
 import { FileBasicColumn } from './typing';
+import { string } from 'vue-types';
 
 export const basicProps = {
   helpText: {
@@ -11,6 +12,11 @@ export const basicProps = {
     type: Number as PropType<number>,
     default: 2,
   },
+  // 文件最大多少MB
+  sizeUnit: {
+    type: String,
+    default: 'MB',
+  },
   // 最大数量的文件，Infinity不限制
   maxNumber: {
     type: Number as PropType<number>,

src/components/Upload/src/useUpload.ts

@@ -6,11 +6,13 @@ export function useUploadType({
   helpTextRef,
   maxNumberRef,
   maxSizeRef,
+  sizeUnitRef,
 }: {
   acceptRef: Ref<string[]>;
   helpTextRef: Ref<string>;
   maxNumberRef: Ref<number>;
   maxSizeRef: Ref<number>;
+  sizeUnitRef: String;
 }) {
   // 文件类型限制
   const getAccept = computed(() => {
@@ -46,9 +48,11 @@ export function useUploadType({
     }
 
     const maxSize = unref(maxSizeRef);
+    const unit = unref(sizeUnitRef);
     if (maxSize) {
-      helpTexts.push(t('component.upload.maxSize', [maxSize]));
+      helpTexts.push(t('component.upload.maxSize', { number: maxSize, unit: unit || 'MB' }));
     }
+    console.log('maxSizeMultiple', maxSize, unit, 'helpTexts', helpTexts);
 
     const maxNumber = unref(maxNumberRef);
     if (maxNumber && maxNumber !== Infinity) {

src/design/public.less

@@ -50,3 +50,12 @@
     opacity: 75%;
   }
 }
+// .ant-table-cell-ellipsis:empty:after {
+//       content: "-";
+// }
+.ant-table-cell:empty:after {
+      content: "-";
+}
+.ant-table-cell-fix-right:empty:after {
+      content: "";
+}

src/layouts/default/tabs/index.vue

@@ -18,7 +18,7 @@
         </TabPane>
       </template>
 
-      <template #tabBarExtraContent v-if="getShowRedo || getShowQuick">
+      <template #rightExtra v-if="getShowRedo || getShowQuick">
         <TabRedo v-if="getShowRedo" />
         <TabContent isExtra :tabItem="$route" v-if="getShowQuick" />
         <FoldButton v-if="getShowFold" />

src/locales/lang/en/component.ts

@@ -104,7 +104,7 @@ export default {
     accept: 'Support {0} format',
     acceptUpload: 'Only upload files in {0} format',
     maxSize: 'A single file does not exceed {0}MB ',
-    maxSizeMultiple: 'Only upload files up to {0}MB!',
+    maxSizeMultiple: 'Only upload files up to {number}{unit}!',
     maxNumber: 'Only upload up to {0} files',
 
     legend: 'Legend',

src/locales/lang/zh-CN/component.ts

@@ -106,8 +106,8 @@ export default {
 
     accept: '支持{0}格式',
     acceptUpload: '只能上传{0}格式文件',
-    maxSize: '单个文件不超过{0}MB',
-    maxSizeMultiple: '只能上传不超过{0}MB的文件!',
+    maxSize: '单个文件不超过{number}{unit}',
+    maxSizeMultiple: '只能上传不超过{number}{unit}的文件!',
     maxNumber: '最多只能上传{0}个文件',
 
     legend: '略缩图',

src/settings/siteSetting.ts

@@ -8,4 +8,9 @@ export const DOC_URL = 'https://vvbin.cn/doc-next/';
 export const SITE_URL = 'https://vvbin.cn/next/';
 
 // sider preset color
-export const SCENE_TYPE: string[] = ['四维看见', '四维看看', '四维深时', '四维深光', '圆周率'];
+export const SCENE_TYPE: string[] = ['现勘三号', '四维看看', '现勘一号', '现勘二号', '现勘补拍仪'];
+// 更改相机名称：
+// 现勘一号：四维深时
+// 现勘二号：四维深光
+// 现勘三号：四维看见
+// 现勘补拍仪：圆周率

src/utils/file/download.ts

@@ -1,45 +1,55 @@
 import { openWindow } from '..';
 import { dataURLtoBlob, urlToBase64 } from './base64Conver';
-import * as XLSX from 'xlsx' // Vue3 版本
-import fs from 'file-saver'
+import * as XLSX from 'xlsx'; // Vue3 版本
+import fs from 'file-saver';
 /**
  * Download online pictures
  * @param data
  * @param filename
  */
- export function exportElsxFile(json, fields, filename = '表格.xlsx') {
-  json.forEach(item => {
-      for (let i in item) {
-          if (fields.hasOwnProperty(i)) {
-              item[fields[i]] = item[i];
-          }
-          delete item[i]; //删除原先的对象属性
+export function exportElsxFile(json, fields, filename = '表格.xlsx') {
+  json.forEach((item) => {
+    for (const i in item) {
+      if (fields.hasOwnProperty(i)) {
+        item[fields[i]] = item[i];
       }
-  })
+      delete item[i]; //删除原先的对象属性
+    }
+  });
 
-  let sheetName = filename //excel的文件名称
-  let wb = XLSX.utils.book_new()  //工作簿对象包含一SheetNames数组，以及一个表对象映射表名称到表对象。XLSX.utils.book_new实用函数创建一个新的工作簿对象。
-  let ws = XLSX.utils.json_to_sheet(json, { header: Object.values(fields) }) //将JS对象数组转换为工作表。
-  wb.SheetNames.push(sheetName)
-  wb.Sheets[sheetName] = ws
-  const defaultCellStyle = { font: { name: "Verdana", sz: 13, color: "FF00FF88" }, fill: { fgColor: { rgb: "FFFFAA00" } } };//设置表格的样式
-  let wopts = { bookType: 'xlsx', bookSST: false, type: 'binary', cellStyles: true, defaultCellStyle: defaultCellStyle, showGridLines: false }  //写入的样式
-  let wbout = XLSX.write(wb, wopts)
-  let blob = new Blob([s2ab(wbout)], { type: 'application/octet-stream' })
-  fs.saveAs(blob, filename + '.xlsx')
+  const sheetName = filename; //excel的文件名称
+  const wb = XLSX.utils.book_new(); //工作簿对象包含一SheetNames数组，以及一个表对象映射表名称到表对象。XLSX.utils.book_new实用函数创建一个新的工作簿对象。
+  const ws = XLSX.utils.json_to_sheet(json, { header: Object.values(fields) }); //将JS对象数组转换为工作表。
+  wb.SheetNames.push(sheetName);
+  wb.Sheets[sheetName] = ws;
+  const defaultCellStyle = {
+    font: { name: 'Verdana', sz: 13, color: 'FF00FF88' },
+    fill: { fgColor: { rgb: 'FFFFAA00' } },
+  }; //设置表格的样式
+  const wopts = {
+    bookType: 'xlsx',
+    bookSST: false,
+    type: 'binary',
+    cellStyles: true,
+    defaultCellStyle: defaultCellStyle,
+    showGridLines: false,
+  }; //写入的样式
+  const wbout = XLSX.write(wb, wopts);
+  const blob = new Blob([s2ab(wbout)], { type: 'application/octet-stream' });
+  fs.saveAs(blob, filename + '.xlsx');
 }
-const s2ab = s => {
+const s2ab = (s) => {
   if (typeof ArrayBuffer !== 'undefined') {
-      var buf = new ArrayBuffer(s.length)
-      var view = new Uint8Array(buf)
-      for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xff
-      return buf
+    var buf = new ArrayBuffer(s.length);
+    const view = new Uint8Array(buf);
+    for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xff;
+    return buf;
   } else {
-      var buf = new Array(s.length);
-      for (var i = 0; i != s.length; ++i) buf[i] = s.charCodeAt(i) & 0xFF;
-      return buf;
+    var buf = new Array(s.length);
+    for (var i = 0; i != s.length; ++i) buf[i] = s.charCodeAt(i) & 0xff;
+    return buf;
   }
-}
+};
 
 /**
  * Download online pictures
@@ -95,6 +105,10 @@ export function downloadByData(data: BlobPart, filename: string, mime?: string,
  * Download file according to file address
  * @param {*} sUrl
  */
+function getExtension(name) {
+  if (!name) return;
+  return name.substring(name.lastIndexOf('.'));
+}
 export function downloadByUrl({
   url,
   target = '_blank',
@@ -115,9 +129,9 @@ export function downloadByUrl({
     const link = document.createElement('a');
     link.href = url;
     link.target = target;
-
+    const newfileName = fileName + getExtension(url);
     if (link.download !== undefined) {
-      link.download = fileName || url.substring(url.lastIndexOf('/') + 1, url.length);
+      link.download = fileName ? newfileName : url.substring(url.lastIndexOf('/') + 1, url.length);
     }
 
     if (document.createEvent) {

src/views/case/addCaseModal.vue

@@ -1,5 +1,6 @@
 <template>
   <BasicModal
+    class="resultListTab"
     v-bind="$attrs"
     @register="register"
     title="新增案件"
@@ -13,14 +14,36 @@
       <div class="mx-5 BasicForm flex">
         <span style="line-height: 32px; margin-right: 10px">案件名称</span>
         <div class="input">
-          <a-input style="width: 600px" maxlength="100" showCount v-model:value="fileFlow.caseTitle" placeholder="请输入" />
+          <a-input
+            style="width: 600px"
+            maxlength="100"
+            showCount
+            v-model:value="fileFlow.caseTitle"
+            placeholder="请输入"
+          />
         </div>
         <!-- <a-button type="primary" @click="handleAdd"> 新增</a-button> -->
       </div>
-      <BasicTable @register="registerTable">
+      <BasicTable class="zdyform" @register="registerTable">
+        <template #tableTitle>
+          <a-tabs class="resultListTab" v-model:activeKey="sceneType" @change="changeTable">
+            <Tabs.TabPane :key="0" tab="我的场景" />
+            <Tabs.TabPane :key="1" tab="共享场景" />
+            <Tabs.TabPane :key="2" tab="多元融合" />
+            <Tabs.TabPane :key="3" tab="共享多元融合" />
+            <!-- <Tabs.TabPane :key="3" tab="多元融合共享" /> -->
+          </a-tabs>
+        </template>
         <template #href="{ record }">
           <a
-            v-if="record.status == 1 || (record.status == -2 && record.payStatus == 1)"
+            v-if="record.fusionTitle"
+            target="_blank"
+            :title="record.fusionTitle"
+            :href="`/code/index.html?caseId=${record.fusionId}#/show`"
+            >{{ record.fusionTitle || record.title }}</a
+          >
+          <a
+            v-else-if="record.status == 1 || (record.status == -2 && record.payStatus == 1)"
             target="_blank"
             :title="record.sceneName"
             :href="record.webSite"
@@ -39,7 +62,9 @@
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { sceneMove } from '/@/api/operate';
+  import { sceneColumns, diversityColumns } from './data';
   import { useI18n } from '/@/hooks/web/useI18n';
+  import { Tabs } from 'ant-design-vue';
   import { getByKey, addOrUpdate, del } from '/@/api/media';
   import {
     BasicTable,
@@ -49,10 +74,10 @@
     TableImg,
     FormProps,
   } from '/@/components/Table';
-  import { caseaddOrUpdateApi, operateSceneList } from '/@/api/operate';
+  import { caseaddOrUpdateApi, operateAddSceneList } from '/@/api/operate';
   const { t } = useI18n();
   export default defineComponent({
-    components: { BasicModal, BasicTable, TableAction },
+    components: { BasicModal, BasicTable, TableAction, [Tabs.name]: Tabs },
     props: {
       userData: { type: Object },
     },
@@ -60,67 +85,14 @@
     setup(props, { emit }) {
       const modelRef = ref({});
       const loading = ref(false);
+      const sceneType = ref(0);
       const fileFlow = reactive({
         caseTitle: '',
         file: null,
         dylist: [],
         mslist: [],
+        fusionIds: [],
       });
-      const columns: BasicColumn[] = [
-        {
-          title: '场景标题',
-          dataIndex: 'sceneName',
-          ellipsis: true,
-          slots: { customRender: 'href' },
-          resizable: true,
-          minWidth: 150,
-          width: 150,
-        },
-        {
-          title: '场景码',
-          dataIndex: 'num',
-          ellipsis: true,
-          width: 180,
-        },
-        {
-          title: '计算完成时间',
-          dataIndex: 'algorithmTime',
-          width: 180,
-        },
-        {
-          title: '场景大小',
-          dataIndex: 'sceneSize',
-          width: 80,
-          customRender: ({ record }) => {
-            return record.sceneSize && record.sceneSize != 0
-              ? h('span', { class: 'sceneSize' }, Math.ceil(record.sceneSize / 1024 / 1024) + 'M')
-              : '-';
-          },
-        },
-        {
-          title: '状态',
-          dataIndex: 'status',
-          width: 80,
-          customRender: ({ record }) => {
-            let str;
-            switch (record.status - 0) {
-              case 0:
-                str = '计算中';
-                break;
-              case 1:
-                str = '计算成功';
-                break;
-              case -2:
-                str = '计算成功';
-                break;
-              case -1:
-                str = '计算失败';
-                break;
-            }
-            return record.payStatus == -2 ? '封存' : str;
-          },
-        },
-      ];
       const searchForm: Partial<FormProps> = {
         labelWidth: 60,
         autoSubmitOnEnter: true,
@@ -139,85 +111,75 @@
               xxl: 7,
             },
           },
-          // {
-          //   field: 'isObj',
-          //   label: '场景类型',
-          //   component: 'Select',
-          //   labelWidth: 80,
-          //   // labelWidth: 50,
-          //   defaultValue: '1',
-          //   componentProps: {
-          //     allowClear: false,
-          //     options: [
-          //       {
-          //         label: '点云场景',
-          //         value: '0',
-          //         key: '0',
-          //       },
-          //       {
-          //         label: 'Mesh 场景',
-          //         value: '1',
-          //         key: '1',
-          //       },
-          //     ],
-          //     onChange: (value) => {
-          //       reload({
-          //         searchInfo: { isObj: value },
-          //       }).then(() => {
-          //         setSelectedRowKeys(value == 0 ? fileFlow.dylist : fileFlow.mslist);
-          //       });
-          //     },
-          //   },
-          //   colProps: {
-          //     xl: 7,
-          //     xxl: 7,
-          //   },
-          // },
         ],
       };
       const { createMessage, createConfirm } = useMessage();
-      const [registerTable, { reload, getForm, setSelectedRowKeys }] = useTable({
-        api: operateSceneList,
-        title: ``,
-        showTableSetting: false,
-        rowSelection: { type: 'checkbox',getCheckboxProps: getRowSelection, onChange: onSelectChange },
-        // titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
-        columns: columns,
-        searchInfo: { isObj: '1' },
-        useSearchForm: true,
-        formConfig: searchForm,
-        showIndexColumn: false,
-        rowKey: 'num',
-        fetchSetting: {
-          pageField: 'pageNum',
-          sizeField: 'pageSize',
-          listField: 'list',
-          totalField: 'total',
-        },
-        canResize: true,
-      });
+      const [registerTable, { reload, getForm, setSelectedRowKeys, setPagination, setColumns }] =
+        useTable({
+          api: operateAddSceneList,
+          title: ``,
+          showTableSetting: false,
+          rowSelection: {
+            type: 'checkbox',
+            getCheckboxProps: getRowSelection,
+            onChange: onSelectChange,
+          },
+          // titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
+          columns: sceneColumns,
+          searchInfo: { isObj: '1', sceneType: sceneType },
+          useSearchForm: true,
+          formConfig: searchForm,
+          immediate: false,
+          showIndexColumn: false,
+          rowKey: 'num',
+          beforeFetch: (T) => {
+            T.fusionTitle = T.sceneName;
+            return T;
+          },
+          afterFetch: listAfterFetch,
+          fetchSetting: {
+            pageField: 'pageNum',
+            sizeField: 'pageSize',
+            listField: 'list',
+            totalField: 'total',
+          },
+          canResize: true,
+        });
       onMounted(() => {});
       let addListFunc = () => {};
       const [register, { closeModal }] = useModalInner((data) => {
         console.log(data);
         getForm().resetFields();
-        reload()
+        reload();
         data && onDataReceive(data);
       });
       function getRowSelection(record) {
         return {
-        disabled: record.inCase || !(record.status == 1 || record.status == -2), // Column configuration not to be checked
-        name: record.name,}
-       }
+          disabled: !(record.fusionId || record.status == 1 || record.status == -2 ), // Column configuration not to be checked
+          name: record.name,
+        };
+      }
       function onSelectChange(selectedRowKeys: any, selectedRows: any) {
-        fileFlow.dylist = [];
-        fileFlow.mslist = selectedRowKeys;
+        console.log('selectedRowKeys changed: ', selectedRowKeys, selectedRows, sceneType.value);
+        let fusionIds = [], dylist = [], mslist = [];
+        selectedRows.map(ele => {
+          if(ele.fusionId){
+            fusionIds.push(ele.fusionId);
+          }else{
+            mslist.push(ele.num)
+          }
+        })
+        fileFlow.fusionIds = fusionIds;
+        fileFlow.dylist = dylist;
+        fileFlow.mslist = mslist;
       }
       function onDataReceive(data) {
+        sceneType.value = 0;
         fileFlow.caseTitle = '';
         modelRef.value = data;
         fileFlow.dylist = [];
         fileFlow.mslist = [];
+        fileFlow.fusionIds = [];
         fileFlow.caseTitle = '';
         setSelectedRowKeys([]);
       }
@@ -236,8 +198,11 @@
         });
       }
       const handleSubmit = async () => {
-        if(!fileFlow.caseTitle?.trim()){
-          return createMessage.warning('请输入案件名称')
+        if (!fileFlow.caseTitle?.trim()) {
+          return createMessage.warning('请输入案件名称');
+        }
+        if (fileFlow.mslist.length == 0 && fileFlow.fusionIds.length == 0) {
+          return createMessage.warning('至少选择一个场景或者多元融合');
         }
         try {
           loading.value = true;
@@ -252,6 +217,10 @@
                 type: 1,
                 numList: fileFlow.mslist,
               },
+              {
+                type: 2,
+                numList: fileFlow.fusionIds,
+              },
             ],
           };
           console.log('res', apiData);
@@ -259,6 +228,7 @@
           console.log('res', res);
           closeModal();
           createMessage.success('新增案件成功。');
+          sceneType.value = 0;
           emit('update');
           loading.value = false;
         } catch (error) {
@@ -270,6 +240,21 @@
         // console.log(v);
         // v && props.userData && nextTick(() => onDataReceive(props.userData));
       }
+      function changeTable(params) {
+        console.log(params, 'changeTable', sceneType.value);
+        setColumns(sceneType.value == 2 || sceneType.value == 3 ? diversityColumns : sceneColumns);
+        setPagination({ current: 1 });
+        reload();
+      }
+      function listAfterFetch(list) {
+        console.log(list, 'changeTable', sceneType.value);
+        return list.map(ele => {
+          if(!ele.num){
+            ele.num = ele.fusionId;
+          }
+          return ele;
+        });
+      }
       async function handleDelete(record: Recordable) {
         console.log('handleDelete', record);
         createConfirm({
@@ -291,6 +276,8 @@
         registerTable,
         model: modelRef,
         fileFlow,
+        sceneType,
+        changeTable,
         handleVisibleChange,
         handleSubmit,
         addListFunc,
@@ -301,3 +288,16 @@
     },
   });
 </script>
+
+<style lang="less">
+  .resultListTab {
+    .ant-tabs-nav {
+      margin: 0;
+    }
+  }
+  .zdyform {
+    .vben-basic-form {
+      margin: 0;
+    }
+  }
+</style>

src/views/case/addResultModal.vue

@@ -57,10 +57,10 @@
       const optionsName = ref([]);
       const schemas: FormSchema[] = [
         {
-          field: 'id',
+          field: 'caseId',
           component: 'Input',
           show: false,
-          label: 'id',
+          label: 'caseId',
           defaultValue: '111',
           required: false,
         },
@@ -169,6 +169,7 @@
       let addListFunc = () => {};
       const [register, { closeModal }] = useModalInner(async (data) => {
         console.log('useModalInner', data);
+        setFieldsValue({caseId: data.caseId})
       });
       function onFilterOption(inputText: string, option) {
         console.log('option', inputText, option.value);
@@ -192,13 +193,15 @@
       const handleSubmit = async () => {
         const params = await validate();
         try {
-          let res = await getNotAuthScene({ ...params, caseId: params.id, authType: 0 });
-          console.log('params', params, res);
-          if (!res) {
+          let data = await getNotAuthScene({ ...params, authType: 0, sourceType: 'scene' },true) || [];
+          console.log('not passing', data);
+          let isChecke = data.some((item) => item.list && item.list.length);
+          console.log('not passing', data, isChecke);
+          if ( !isChecke ) {
             closeModal();
             resetFields();
             emit('ok');
-            createMessage.success('此用户拥有所有场景查看、编辑权限');
+            createMessage.success('此用户拥有所有场景或者多元融合的查看、编辑权限');
           } else {
             openModal(true, {...params, name: params.ryNickName});
           }

src/views/case/data.tsx

@@ -0,0 +1,104 @@
+import { BasicColumn } from '/@/components/Table/src/types/table';
+import { Time } from '/@/components/Time';
+import { h } from 'vue';
+import { Badge } from 'ant-design-vue';
+
+export const sceneColumns: BasicColumn[] = [
+  {
+    title: '场景标题',
+    dataIndex: 'sceneName',
+    ellipsis: true,
+    slots: { customRender: 'href' },
+    resizable: true,
+    minWidth: 150,
+    width: 150,
+  },
+  {
+    title: '场景码',
+    dataIndex: 'num',
+    ellipsis: true,
+    width: 180,
+  },
+  {
+    title: '计算完成时间',
+    dataIndex: 'algorithmTime',
+    width: 180,
+  },
+  {
+    title: '场景大小',
+    dataIndex: 'sceneSize',
+    width: 80,
+    customRender: ({ record }) => {
+      return record.sceneSize && record.sceneSize != 0
+        ? h('span', { class: 'sceneSize' }, Math.ceil(record.sceneSize / 1024 / 1024) + 'M')
+        : '-';
+    },
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    width: 80,
+    customRender: ({ record }) => {
+      let str;
+      switch (record.status - 0) {
+        case 0:
+          str = '计算中';
+          break;
+        case 1:
+          str = '计算成功';
+          break;
+        case -2:
+          str = '计算成功';
+          break;
+        case -1:
+          str = '计算失败';
+          break;
+      }
+      return record.payStatus == -2 ? '封存' : str;
+    },
+  },
+];
+
+export const diversityColumns: BasicColumn[] = [
+  {
+    title: '标题',
+    dataIndex: 'sceneName',
+    ellipsis: true,
+    slots: { customRender: 'href' },
+    resizable: true,
+    minWidth: 150,
+    width: 300,
+  },
+  // {
+  //   title: '所属案件',
+  //   dataIndex: 'caseTitle',
+  //   slots: { customRender: 'caseTitle' },
+  //   ellipsis: true,
+  //   width: 140,
+  // },
+  {
+    title: '人员编号',
+    dataIndex: 'ryNo',
+    ellipsis: true,
+    width: 140,
+  },
+  // {
+  //   title: '姓名',
+  //   dataIndex: 'ryNickName',
+  //   ellipsis: true,
+  //   width: 140,
+  // },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 180,
+    customRender: ({ record }) => {
+      return record.createTime
+        ? h(Time, {
+            value: record.createTime,
+            mode: 'datetime',
+          })
+        : '-';
+    },
+  },
+];

src/views/case/list.vue

@@ -5,8 +5,8 @@
         <a-tabs v-model:activeKey="tableType" @change="changeTable">
           <Tabs.TabPane :key="0" tab="案件管理" :disabled="loading" />
           <Tabs.TabPane :key="1" tab="案件共享" :disabled="loading" />
-        </a-tabs
-      ></template>
+        </a-tabs>
+      </template>
       <div class="desc-wrap-BasicTable">
         <BasicTable @register="registerTable">
           <template #toolbar>
@@ -18,7 +18,7 @@
               v-if="record.caseTitle"
               target="_blank"
               :title="record.caseTitle"
-              :href="`/code/index.html?caseId=${record.caseId}#/show`"
+              :href="`/mix3d/?show=true#/abstract/${record.caseId}`"
               >{{ record.caseTitle }}</a
             >
             <span v-else>-</span>
@@ -29,35 +29,25 @@
               :actions="[
                 {
                   label: '编辑',
-                  disabled: tableType == 1 && !record.isEdit,
-                  ifShow: getTypeCheckPerm('case-edit'),
+                  //disabled: !record.isEdit,
+                  ifShow: (tableType == 1 && record.isEdit || tableType == 0) && getTypeCheckPerm('case-edit'),
                   onClick: handlegotoEdit.bind(null, record),
                 },
                 {
                   label: '权限',
-                  disabled: tableType == 1 && !record.isAuth,
-                  ifShow: getTypeCheckPerm('case-powers'),
+                  ifShow: (record.isAuth && tableType == 0) && getTypeCheckPerm('case-powers'),
                   onClick: handlePowers.bind(null, record),
                 },
-                {
-                  label: '下载',
-                  ifShow: getTypeCheckPerm('case-download') && !record.isOpen,
-                  //  getTypeCheckPerm('scenes-download') &&
-                  //  tableType != 3 &&
-                  //  (record.userName == userInfo.userName ||
-                  //    userInfo.roleId == 1 ||
-                  //    userInfo.roleId == 45 ||
-                  //    userInfo.roleId == 48),
-                  // disabled: !(record.status == 1 || (record.status == -2 && record.payStatus == 1)),
-                  //icon: 'carbon:download',
-                  disabled:  tableType == 1,
-                  onClick: createConfirmDownload.bind(null, record),
-                },
+                //{
+                //  label: '下载',
+                //  ifShow: getTypeCheckPerm('case-download') && !record.isOpen,
+                //  disabled:  tableType == 0,
+                //  onClick: createConfirmDownload.bind(null, record),
+                //},
                 {
                   label: '删除',
-                  ifShow: getTypeCheckPerm('case-delete') && !record.isOpen,
+                  ifShow: tableType == 0 && getTypeCheckPerm('case-delete') && !record.isOpen,
                   //icon: 'ic:outline-delete-outline',
-                  disabled: tableType == 1,
                   color: 'error',
                   onClick: handleDelete.bind(null, record),
                 },
@@ -178,6 +168,12 @@
           width: 100,
         },
         {
+          title: '勘验号',
+          dataIndex: 'knumber',
+          ellipsis: true,
+          width: 100,
+        },
+        {
           title: '创建时间',
           dataIndex: 'createTime',
           width: 230,

src/views/case/resultListModal.vue

@@ -1,33 +1,46 @@
 <template>
   <BasicModal
+    class="resultListTab"
     v-bind="$attrs"
     @register="register"
+    :showCancelBtn="false"
     :title="fileFlow.name + '查询结果'"
     okText="我知道了"
     @visible-change="handleVisibleChange"
     :confirmLoading="loading"
+    width="700px"
     min-height="50"
     @ok="handleSubmit"
   >
     <div class="pt-2px pr-3px">
       <div class="text"
-        >查询到
-        <span style="color: #0960bd">{{ fileFlow.name }}</span>
+        >查询到 {{ fileFlow.name }}
+        <!-- <span style="color: #0960bd">{{ fileFlow.name }}</span> -->
         无以下场景权限，请联系管理员开通</div
       >
-      <a-tabs class="resultListTab" v-model:activeKey="tableType" @change="changeTable">
-        <a-tab-pane :key="0" tab="查看权限" :disabled="loading" />
-        <a-tab-pane :key="1" tab="编辑权限" :disabled="loading" />
-      </a-tabs>
-      <BasicTable @register="registerTable">
+      <BasicTable class="zdyform" @register="registerTable">
+        <template #tableTitle>
+          <a-tabs v-model:activeKey="authType" @change="changeTable">
+          <Tabs.TabPane :key="0" tab="场景查看权限" :disabled="loading" />
+          <Tabs.TabPane :key="1" tab="场景编辑权限" :disabled="loading" />
+          <Tabs.TabPane :key="2" tab="多元融合查看权限" :disabled="loading" />
+          <Tabs.TabPane :key="3" tab="多元融合编辑权限" :disabled="loading" />
+        </a-tabs>
+          <!-- <a-tabs class="resultListTab" v-model:activeKey="authType" @change="changeTable">
+            <Tabs.TabPane :key="0" tab="查看权限" />
+            <Tabs.TabPane :key="1" tab="编辑权限" />
+          </a-tabs> -->
+        </template>
         <template #href="{ record }">
-          <a
-            v-if="record.title"
-            target="_blank"
-            :title="record.title"
-            :href="record.webSite"
-            >{{ record.title }}</a
-          >
+          <a v-if="record.title" target="_blank" :title="record.title" :href="record.webSite">{{
+            record.title
+          }}</a>
+          <span v-else>-</span>
+        </template>
+        <template #href1="{ record }">
+          <a v-if="record.title" target="_blank" :title="record.title" :href="`/code/index.html?caseId=${record.id}#/show`">{{
+            record.title
+          }}</a>
           <span v-else>-</span>
         </template>
       </BasicTable>
@@ -57,11 +70,13 @@
       const fileFlow = reactive({
         file: null,
         name: '',
+        list: [],
         type: 2, //2-普通发票，3-专用发票
       });
       const caseId = ref<number>(0); //0查看 、1编辑
       const ryId = ref<string>(''); //0查看 、1编辑
-      const tableType = ref<number>(0); //0查看 、1编辑
+      const authType = ref<number>(0); //0查看 、1编辑
+      const sourceType = ref<string>('scene'); //0查看 、1编辑
       const columns = [
         {
           title: '场景标题',
@@ -78,23 +93,39 @@
           ellipsis: true,
         },
       ];
-      const [registerTable, { reload }] = useTable({
-        api: getNotAuthScene,
+      const columns1 = [
+        {
+          title: '标题',
+          dataIndex: 'sceneName',
+          ellipsis: true,
+          slots: { customRender: 'href1' },
+          resizable: true,
+          minWidth: 150,
+          width: 250,
+        },
+        {
+          title: '姓名',
+          dataIndex: 'ryNickName',
+          ellipsis: true,
+        },
+      ];
+      const [registerTable, { reload, setTableData, setColumns }] = useTable({
         title: ``,
         // titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
         columns: columns,
-        searchInfo: { authType: tableType, caseId: caseId, ryId: ryId },
+        searchInfo: { authType: authType.value == 2?0:authType.value == 3?1:authType, caseId: caseId, ryId: ryId, sourceType },
         useSearchForm: false,
         showIndexColumn: false,
         showTableSetting: true,
-        beforeFetch: (T) => {
-          loading.value = true;
-          return T;
-        },
-        afterFetch: (T) => {
-          loading.value = false;
-          return T;
-        },
+        pagination: false,
+        //beforeFetch: (T) => {
+        //  loading.value = true;
+        //  return T;
+        //},
+        //afterFetch: (T) => {
+        //  loading.value = false;
+        //  return T;
+        //},
         rowKey: 'caseId',
         fetchSetting: {
           pageField: 'pageNum',
@@ -114,19 +145,22 @@
         data && onDataReceive(data);
       });
       function onDataReceive(data) {
-        caseId.value = data.id;
+        caseId.value = data.caseId || data.id;
+        fileFlow.name = data.ryNo;
         ryId.value = data.ryId;
-        reload();
+        getList()
       }
       const handleSubmit = async () => {
         loading.value = true;
         try {
-          const params = await validate();
-          const apiData = params;
-          console.log('res', apiData, params);
-          await InvoiceRegister(apiData);
+          // const params = await validate();
+          // const apiData = params;
+          // console.log('res', apiData, params);
+          // await InvoiceRegister(apiData);
           closeModal();
-          createMessage.success(t('common.optSuccess'));
+          authType.value = 0
+          changeTable()
+          // createMessage.success(t('common.optSuccess'));
           emit('update');
           loading.value = false;
         } catch (error) {
@@ -134,8 +168,25 @@
           console.log('not passing', error);
         }
       };
-      function changeTable () {
-        reload();
+      const getList = async () => {
+        fileFlow.list = await getNotAuthScene({caseId: caseId.value, ryId: ryId.value})
+          console.log('not passing', fileFlow.list, authType.value);
+        let { list } = fileFlow.list[authType.value];
+          console.log('not passing', list);
+        setTableData(list)
+      }
+      function changeTable() {
+        console.log('changeTable', authType);
+        if (authType.value == 1 || authType.value == 0) {
+          sourceType.value = 'scene';
+        } else {
+          sourceType.value = 'fusion';
+        }
+        setColumns(sourceType.value == 'scene'?columns:columns1);
+        let { list } = fileFlow.list[authType.value];
+        console.log('setTableData', list);
+        setTableData(list || [])
+        // reload();
       }
       function handleVisibleChange(v) {
         v && props.userData && nextTick(() => onDataReceive(props.userData));
@@ -149,16 +200,24 @@
         addListFunc,
         reload,
         okText,
+        authType,
         loading,
+        changeTable,
         t,
       };
     },
   });
 </script>
+
 <style lang="less">
   .resultListTab {
     .ant-tabs-nav {
       margin: 0;
     }
   }
+  .zdyform {
+    .vben-basic-form {
+      margin: 0;
+    }
+  }
 </style>

src/views/device/index.vue

@@ -60,6 +60,7 @@
   import batchOutflowModal from './OutflowModal.vue';
   import detailModal from './detailsMoadl.vue';
   import batchPutModal from './batchPutModal.vue';
+  import { SCENE_TYPE } from '/@/settings/siteSetting';
   import PutModal from './putModal.vue';
   import { useModal } from '/@/components/Modal';
   import { useRouter } from 'vue-router';
@@ -111,11 +112,11 @@
           customRender: ({ record }) => {
             let typeObj = {
               '0': '旧双目相机',
-              '1': '四维看看',
-              '2': '四维看看lite',
-              '9': '四维看见',
-              '10': '四维深时',
-              '11': '四维深光',
+              '1': SCENE_TYPE[1],
+              '2': SCENE_TYPE[1],
+              '9': SCENE_TYPE[0],
+              '10': SCENE_TYPE[2],
+              '11': SCENE_TYPE[3],
             };
             return typeObj[record.type];
           }

src/views/diversity/MoveModal.vue

@@ -2,7 +2,7 @@
   <BasicModal
     v-bind="$attrs"
     @register="register"
-    title="迁移场景"
+    title="迁移多元融合"
     @visible-change="handleVisibleChange"
     @cancel="resetFields"
     @ok="handleSubmit"
@@ -59,7 +59,7 @@
           // required: true,
         },
         {
-          field: 'ryId',
+          field: 'ryNo',
           component: 'Input',
           label: '迁移至',
 
@@ -105,7 +105,7 @@
       let addListFunc = () => {};
       const [register, { closeModal }] = useModalInner((data) => {
         console.log(data);
-        data && onDataReceive({...data, ryId: ''});
+        data && onDataReceive({...data, ryNo: ''});
       });
 
       function onDataReceive(data) {

src/views/diversity/addCaseModal.vue

@@ -13,11 +13,18 @@
       <div class="mx-5 BasicForm flex">
         <span style="line-height: 32px; margin-right: 10px">案件名称</span>
         <div class="input">
-          <a-input style="width: 600px" maxlength="100" showCount v-model:value="fileFlow.caseTitle" placeholder="请输入" />
+          <a-input
+            style="width: 600px"
+            maxlength="100"
+            showCount
+            v-model:value="fileFlow.caseTitle"
+            placeholder="请输入"
+          />
         </div>
         <!-- <a-button type="primary" @click="handleAdd"> 新增</a-button> -->
       </div>
       <BasicTable @register="registerTable">
+
         <template #href="{ record }">
           <a
             v-if="record.status == 1 || (record.status == -2 && record.payStatus == 1)"
@@ -180,7 +187,11 @@
         api: operateSceneList,
         title: ``,
         showTableSetting: false,
-        rowSelection: { type: 'checkbox',getCheckboxProps: getRowSelection, onChange: onSelectChange },
+        rowSelection: {
+          type: 'checkbox',
+          getCheckboxProps: getRowSelection,
+          onChange: onSelectChange,
+        },
         // titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
         columns: columns,
         searchInfo: { isObj: '1' },
@@ -201,14 +212,15 @@
       const [register, { closeModal }] = useModalInner((data) => {
         console.log(data);
         getForm().resetFields();
-        reload()
+        reload();
         data && onDataReceive(data);
       });
       function getRowSelection(record) {
         return {
-        disabled: record.inCase || !(record.status == 1 || record.status == -2), // Column configuration not to be checked
-        name: record.name,}
-       }
+          disabled: record.inCase || !(record.status == 1 || record.status == -2), // Column configuration not to be checked
+          name: record.name,
+        };
+      }
       function onSelectChange(selectedRowKeys: any, selectedRows: any) {
         fileFlow.dylist = [];
         fileFlow.mslist = selectedRowKeys;
@@ -236,8 +248,8 @@
         });
       }
       const handleSubmit = async () => {
-        if(!fileFlow.caseTitle?.trim()){
-          return createMessage.warning('请输入案件名称')
+        if (!fileFlow.caseTitle?.trim()) {
+          return createMessage.warning('请输入案件名称');
         }
         try {
           loading.value = true;

src/views/diversity/list.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="scren">
     <PageWrapper contentBackground>
-      <!-- <template #footer>
+      <template #footer>
         <a-tabs v-model:activeKey="tableType" @change="changeTable">
-          <Tabs.TabPane :key="0" tab="案件管理" :disabled="loading" />
-          <Tabs.TabPane :key="1" tab="案件共享" :disabled="loading" />
+          <Tabs.TabPane :key="0" tab="多元融合" :disabled="loading" />
+          <Tabs.TabPane :key="1" tab="共享多元融合" :disabled="loading" />
         </a-tabs
-      ></template> -->
+      ></template>
       <div class="desc-wrap-BasicTable">
-        <BasicTable @register="registerTable">
+        <BasicTable @register="registerTable" :columns="columnsFun">
           <template #toolbar>
-            <a-button type="primary"  @click="handleAdd" v-if="getCheckPerm('case-Add') && tableType == 0"> 新增案件</a-button>
+            <a-button type="primary"  @click="handleAdd" v-if="getCheckPerm('diversity-Add') && tableType == 0"> 新增</a-button>
           </template>
 
           <template #href="{ record }">
@@ -23,55 +23,37 @@
             >
             <span v-else>-</span>
           </template>
-          <template #caseTitle="{ record }">
-            <a
-              v-if="record.caseTitle"
-              target="_blank"
-              :title="record.caseTitle"
-              :href="`/mix3d/#/home/${record.caseId}`"
-              >{{ record.caseTitle }}</a
-            >
-            <span v-else>-</span>
-          </template>
           <template #action="{ record }">
             <TableAction
               stopButtonPropagation
               :actions="[
                 {
                   label: '迁移',
-                  ifShow: getTypeCheckPerm('case-edit'),
+                  ifShow: getTypeCheckPerm('diversity-move') && tableType == 0,
                   onClick: handleMove.bind(null, record),
                 },
                 {
                   label: '编辑',
-                  ifShow: getTypeCheckPerm('case-edit'),
+                  ifShow: getTypeCheckPerm('diversity-edit'),
+                  disabled: !record.editAuth,
                   onClick: handlegotoEdit.bind(null, record),
                 },
                 {
                   label: '权限',
-                  disabled: tableType == 1 && !record.isAuth,
-                  ifShow: getTypeCheckPerm('case-powers'),
+                  disabled: !record.isAuth,
+                  ifShow: getTypeCheckPerm('diversity-powers'),
                   onClick: handlePowers.bind(null, record),
                 },
-                {
-                  label: '下载',
-                  ifShow: getTypeCheckPerm('case-download') && !record.isOpen,
-                  //  getTypeCheckPerm('scenes-download') &&
-                  //  tableType != 3 &&
-                  //  (record.userName == userInfo.userName ||
-                  //    userInfo.roleId == 1 ||
-                  //    userInfo.roleId == 45 ||
-                  //    userInfo.roleId == 48),
-                  // disabled: !(record.status == 1 || (record.status == -2 && record.payStatus == 1)),
-                  //icon: 'carbon:download',
-                  disabled:  tableType == 1,
-                  onClick: createConfirmDownload.bind(null, record),
-                },
+                //{
+                //  label: '下载',
+                //  ifShow: getTypeCheckPerm('diversity-download') && !record.isOpen,
+                //  disabled:  tableType == 1,
+                //  onClick: createConfirmDownload.bind(null, record),
+                //},
                 {
                   label: '删除',
-                  ifShow: getTypeCheckPerm('case-delete') && !record.isOpen,
-                  //icon: 'ic:outline-delete-outline',
-                  disabled: tableType == 1,
+                  ifShow: getTypeCheckPerm('diversity-delete') && !record.isOpen && tableType == 0,
+                  disabled: !record.editAuth,
                   color: 'error',
                   onClick: handleDelete.bind(null, record),
                 },
@@ -91,22 +73,18 @@
         :okButtonProps="{ disabled: canDownload }"
       />
       <MoveModal @register="registerMoveModal" @update="reload" />
-      <AddModal @register="registerAddModal"  @update="reload"/>
+      <AddModal @register="registerAddModal" @update="reload" />
       <PowersModal @register="registerPowersModal" />
     </PageWrapper>
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, h, computed, toRefs, ref, onMounted } from 'vue';
-  import Icon from '/@/components/Icon/index';
-  import dayjs from 'dayjs';
-  import { QrCode } from '/@/components/Qrcode/index';
+  import { defineComponent, h, computed, ref, onMounted } from 'vue';
   import {
     BasicTable,
     useTable,
     TableAction,
     BasicColumn,
-    TableImg,
     FormProps,
   } from '/@/components/Table';
   import { PageWrapper } from '/@/components/Page';
@@ -115,19 +93,18 @@
   import MoveModal from './MoveModal.vue';
   import PowersModal from '/@/views/productOperation/modal/PowersModal.vue';
   import { Time } from '/@/components/Time';
-  import { Descriptions, Tabs, Progress } from 'ant-design-vue';
+  import { Descriptions, Tabs } from 'ant-design-vue';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useModal } from '/@/components/Modal';
   import {
     caseFusionList,
-    caseFusionMove,
+    caseFusionAdd,
     caseFusionDel,
   } from '/@/api/operate/case';
   import { message } from 'ant-design-vue';
   import { usePermissionStore } from '/@/store/modules/permission';
   import { useUserStore } from '/@/store/modules/user';
-  import { func } from 'vue-types';
   export default defineComponent({
     components: {
       DownLoadModal,
@@ -138,7 +115,6 @@
       PageWrapper,
       [Descriptions.name]: Descriptions,
       [Descriptions.Item.name]: Descriptions.Item,
-      QrCode,
       AddModal,
       // Tabs,
       [Tabs.name]: Tabs,
@@ -153,26 +129,26 @@
       const { getCheckPerm } = permissionStore;
       const loading = ref(false);
       const tableType = ref<number>(0); //0看看 、1看见、2深时
-      const columns: BasicColumn[] = [
+      const columns = () => [
         {
           title: '标题',
           dataIndex: 'sceneName',
+          fixed: 'left',
           ellipsis: true,
           slots: { customRender: 'href' },
-          resizable: true,
-          minWidth: 150,
+          // resizable: true,
           width: 300,
         },
-        {
-          title: '所属案件',
-          dataIndex: 'caseTitle',
-          slots: { customRender: 'caseTitle' },
-          ellipsis: true,
-          width: 140,
-        },
+        // {
+        //   title: '所属案件',
+        //   dataIndex: 'caseTitle',
+        //   slots: { customRender: 'caseTitle' },
+        //   ellipsis: true,
+        //   width: 140,
+        // },
         {
           title: '人员编号',
-          dataIndex: 'ryId',
+          dataIndex: 'ryNo',
           ellipsis: true,
           width: 140,
         },
@@ -196,98 +172,6 @@
             );
           },
         },
-        // {
-        //   title: '计算完成时间',
-        //   dataIndex: 'amount',
-        //   width: 180,
-        //   customRender: ({ record }) => {
-        //     return (
-        //       (record.algorithmTime &&
-        //         h(Time, {
-        //           value: record.algorithmTime,
-        //           mode: 'datetime',
-        //         })) ||
-        //       '-'
-        //     );
-        //   },
-        // },
-        // {
-        //   title: 'SN码',
-        //   dataIndex: 'snCode',
-        //   width: 180,
-        // },
-        // {
-        //   title: '场景大小',
-        //   dataIndex: 'sceneSize',
-        //   width: 80,
-        //   customRender: ({ record }) => {
-        //     return record.sceneSize && record.sceneSize != 0
-        //       ? h('span', { class: 'sceneSize' }, Math.ceil(record.sceneSize / 1024 / 1024) + 'M')
-        //       : '-';
-        //   },
-        // },
-        // {
-        //   title: '是否复制',
-        //   dataIndex: 'isCopy',
-        //   width: 80,
-        //   customRender: ({ record }) => {
-        //     return record.isCopy ? '是' : '否';
-        //   },
-        // },
-        // {
-        //   title: '复制时间',
-        //   dataIndex: 'copyTime',
-        //   width: 180,
-        //   customRender: ({ record }) => {
-        //     return record.copyTime
-        //       ? h(Time, {
-        //           value: record.copyTime,
-        //           mode: 'datetime',
-        //         })
-        //       : '-';
-        //   },
-        // },
-        // {
-        //   title: '人员编号',
-        //   dataIndex: 'userName',
-        //   width: 100,
-        // },
-        // {
-        //   title: t('routes.staff.userName'),
-        //   dataIndex: 'nickName',
-        //   width: 100,
-        //   customRender: ({ record }) => {
-        //     return record.nickName || '-';
-        //   },
-        // },
-        // {
-        //   title: '浏览量',
-        //   dataIndex: 'viewCount',
-        //   width: 80,
-        // },
-        // {
-        //   title: '状态',
-        //   dataIndex: 'status',
-        //   width: 80,
-        //   customRender: ({ record }) => {
-        //     let str;
-        //     switch (record.status - 0) {
-        //       case 0:
-        //         str = '计算中';
-        //         break;
-        //       case 1:
-        //         str = '计算成功';
-        //         break;
-        //       case -2:
-        //         str = '计算成功';
-        //         break;
-        //       case -1:
-        //         str = '计算失败';
-        //         break;
-        //     }
-        //     return record.payStatus == -2 ? '封存' : str;
-        //   },
-        // },
         {
           title: '操作',
           dataIndex: 'action',
@@ -304,8 +188,8 @@
         autoAdvancedLine: 1,
         schemas: [
           {
-            field: 'caseTitle',
-            label: '案件名称',
+            field: 'fusionTitle',
+            label: '多元融合名称',
             component: 'Input',
             componentProps: {
               maxLength: 100,
@@ -324,11 +208,10 @@
       const [registerDownModal, { openModal: openDownModal }] = useModal();
       const [registerMoveModal, { openModal: openMoveModal }] = useModal();
       const [registerPowersModal, { openModal: openPowersModal }] = useModal();
-      const [registerTable, { reload }] = useTable({
+      const [registerTable, { reload, setPagination, getColumns, setColumns }] = useTable({
         api: caseFusionList,
-        title: ``,
+        title: `多元融合列表`,
         // titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
-        columns: columns,
         searchInfo: { isShare: tableType },
         useSearchForm: true,
         formConfig: searchForm,
@@ -342,22 +225,26 @@
           loading.value = false;
           return T;
         },
-        rowKey: 'caseId',
+        rowKey: 'fusionId',
         fetchSetting: {
           pageField: 'pageNum',
           sizeField: 'pageSize',
           listField: 'list',
           totalField: 'total',
-        },               
+        },
         canResize: true,
       });
       function changeTable(val: number) {
         tableType.value = val;
+        setColumns(columns())
+        setPagination({ current: 1 });
         reload();
       }
-      function handleAdd() {
-        openAddModal(true, {})
-        // router.push({ path: '/scene/add' });
+      async function handleAdd() {
+        console.log('addPowes', getColumns(), columns());
+        let res = await caseFusionAdd({});
+        console.log('handleAdd', res);
+        handlegotoEdit(res)
       }
       async function handleCopy(record: Recordable) {
         createConfirm({
@@ -409,7 +296,7 @@
         createConfirm({
           title: '提示',
           okText: '继续',
-          content: '案件资源过大会导致离线包下载失败，请尽可能缩小案件资源后再下载。',
+          content: '多元融合资源过大会导致离线包下载失败，请尽可能缩小多元融合资源后再下载。',
           onOk: async () => {
             handleDownload(record)
           },
@@ -507,12 +394,19 @@
         window.open(url);
       }
       function handlePowers(record: Recordable) {
+        console.log('handlePowers', record);
         openPowersModal(true, {
           ...record,
+          sourceType: 'fusion',
+          caseId: undefined,
           tableType: tableType.value,
         });
+        setTimeout(() => {
+          setColumns(columns())
+        }, 2000)
       }
       onMounted(() => {
+        setColumns(columns())
       });
       return {
         registerTable,
@@ -540,6 +434,7 @@
         handlegotoEdit,
         handlePowers,
         userInfo,
+        columnsFun: columns(),
         handleAdd,
         reload,
         getCheckPerm,
@@ -584,6 +479,9 @@
         }
       }
     }
+    :deep(.ant-table-cell-content){
+      display: block !important;
+    }
   }
   // .tableHeader {
   //   height: 50px;

src/views/draw/list.vue

@@ -4,29 +4,29 @@
       <template #footer>
         <a-tabs v-model:activeKey="tableType" @change="changeTable">
           <Tabs.TabPane :key="0" tab="方位图" :disabled="loading" />
-          <Tabs.TabPane :key="1" tab="户型图" :disabled="loading" /> </a-tabs
+          <Tabs.TabPane :key="1" tab="平面图" :disabled="loading" /> </a-tabs
       ></template>
       <div class="desc-wrap-BasicTable">
         <BasicTable v-show="tableType" @register="registerTable">
           <template #toolbar>
             <a-button
               type="primary"
+              v-if="getTypeCheckPerm('overview-add')"
               @click="handleAdd('overview')"
-              v-if="getCheckPerm('case-Add') && tableType == 0"
             >
               新增</a-button
             >
           </template>
 
           <template #href="{ record }">
-            <a
-              v-if="record.listCover || record.mapUrl"
+            <!-- <a
+              v-if="!!record.listCover || record.mapUrl"
               target="_blank"
               :title="record.title"
-              :href="record.listCover || record.mapUrl"
+              :href="!!record.listCover || record.mapUrl"
               >{{ record.title || '-' }}</a
-            >
-            <span v-else>{{ record.title || '-' }}</span>
+            > -->
+            <span>{{ record.title || '-' }}</span>
           </template>
           <template #action="{ record }">
             <TableAction
@@ -34,27 +34,27 @@
               :actions="[
                 {
                   label: '复制',
-                  ifShow: getTypeCheckPerm('case-powers'),
+                  ifShow: getTypeCheckPerm('overview-copy') && !!record.listCover,
                   onClick: handleCopy.bind(null, record),
                 },
                 {
                   label: '重命名',
-                  ifShow: getTypeCheckPerm('case-edit'),
+                  ifShow: getTypeCheckPerm('overview-rename') && !!record.listCover,
                   onClick: handlegoRename.bind(null, record),
                 },
                 {
                   label: '编辑',
-                  ifShow: getTypeCheckPerm('case-edit'),
+                  ifShow: getTypeCheckPerm('overview-edit'),
                   onClick: handlegotoEdit.bind(null, record),
                 },
                 {
                   label: '下载',
-                  ifShow: getTypeCheckPerm('case-download') && !record.isOpen,
+                  ifShow: getTypeCheckPerm('overview-download') && !!record.listCover,
                   onClick: createConfirmDownload.bind(null, record),
                 },
                 {
                   label: '删除',
-                  ifShow: getTypeCheckPerm('case-delete') && !record.isOpen,
+                  ifShow: getTypeCheckPerm('overview-delete'),
                   color: 'error',
                   onClick: handleDelete.bind(null, record),
                 },
@@ -66,22 +66,22 @@
           <template #toolbar>
             <a-button
               type="primary"
+              v-if="getTypeCheckPerm('tabulation-add')"
               @click="handleAdd('tabulation')"
-              v-if="getCheckPerm('case-Add') && tableType == 0"
             >
               新增</a-button
             >
           </template>
 
           <template #href="{ record }">
-            <a
-              v-if="record.listCover || record.mapUrl"
+            <!-- <a
+              v-if="!!record.listCover || record.mapUrl"
               target="_blank"
               :title="record.title"
-              :href="record.listCover || record.mapUrl"
+              :href="!!record.listCover || record.mapUrl"
               >{{ record.title || '-' }}</a
-            >
-            <span v-else>{{ record.title || '-' }}</span>
+            > -->
+            <span>{{ record.title || '-' }}</span>
           </template>
           <template #action="{ record }">
             <TableAction
@@ -89,27 +89,28 @@
               :actions="[
                 {
                   label: '复制',
-                  ifShow: getTypeCheckPerm('case-powers'),
+                  ifShow: getTypeCheckPerm('tabulation-copy') && !!record.listCover,
+
                   onClick: handleCopy.bind(null, record),
                 },
                 {
                   label: '重命名',
-                  ifShow: getTypeCheckPerm('case-edit'),
+                  ifShow: getTypeCheckPerm('tabulation-rename') && !!record.listCover,
                   onClick: handlegoRename.bind(null, record),
                 },
                 {
                   label: '编辑',
-                  ifShow: getTypeCheckPerm('case-edit'),
+                  ifShow: getTypeCheckPerm('tabulation-edit'),
                   onClick: handlegotoEdit.bind(null, record),
                 },
                 {
                   label: '下载',
-                  ifShow: getTypeCheckPerm('case-download') && !record.isOpen,
+                  ifShow: getTypeCheckPerm('tabulation-download') && !!record.listCover,
                   onClick: createConfirmDownload.bind(null, record),
                 },
                 {
                   label: '删除',
-                  ifShow: getTypeCheckPerm('case-delete') && !record.isOpen,
+                  ifShow: getTypeCheckPerm('tabulation-delete'),
                   color: 'error',
                   onClick: handleDelete.bind(null, record),
                 },
@@ -158,6 +159,7 @@
     caseOverviewCopy,
     caseTabulationDel,
   } from '/@/api/operate/case';
+  import { caseOverviewAdd, caseTabulationAdd } from '/@/api/operate/draw.ts';
   import { message } from 'ant-design-vue';
   import { usePermissionStore } from '/@/store/modules/permission';
   import { useUserStore } from '/@/store/modules/user';
@@ -191,7 +193,6 @@
           title: '标题',
           dataIndex: 'title',
           ellipsis: true,
-          slots: { customRender: 'href' },
           resizable: true,
           minWidth: 150,
           width: 300,
@@ -201,6 +202,9 @@
           dataIndex: 'resource',
           ellipsis: true,
           width: 100,
+          customRender: ({ record }) => {
+            return record.isCopy ? '复制' : record.resource || '-';
+          },
         },
         {
           title: '创建时间',
@@ -271,7 +275,7 @@
           loading.value = false;
           return T;
         },
-        rowKey: 'caseId',
+        rowKey: 'id',
         fetchSetting: {
           pageField: 'pageNum',
           sizeField: 'pageSize',
@@ -298,7 +302,7 @@
           loading.value = false;
           return T;
         },
-        rowKey: 'caseId',
+        rowKey: 'id',
         fetchSetting: {
           pageField: 'pageNum',
           sizeField: 'pageSize',
@@ -331,15 +335,20 @@
         // });
       }
 
-      function handleAdd(type) {
+      async function handleAdd(type) {
         // openAddModal(true, {});
         if (type == 'overview') {
-          window.open(`/draw/#/overview`);
+          let record = await caseOverviewAdd({ type: 0 });
+          // handlegotoEdit(record);
+          // window.open(`/draw/#/overview`);
           // window.open(`/draw/#/overview?caseId=${caseId.value}`);
         } else {
           // window.open(`/draw/#/tabulation?caseId=${caseId.value}&tabulationId=${res.id}`);
-          window.open(`/draw/#/tabulation`);
+          let record = await caseTabulationAdd({ type: 1 });
+          // handlegotoEdit(record);
+          // window.open(`/draw/#/tabulation`);
         }
+        reload();
         // router.push({ path: '/scene/add' });
       }
       function reload() {
@@ -351,9 +360,10 @@
         let url = tableType.value == 1 ? caseOverviewCopy : caseTabulationCopy;
         let param =
           tableType.value == 1
-            ? { overviewId: record.id }
+            ? { overviewIds: [record.id], isCopy: 1 }
             : {
-                tabulationId: record.id,
+                tabulationIds: [record.id],
+                isCopy: 1,
               };
         createConfirm({
           title: '复制',
@@ -410,24 +420,28 @@
       const downloadOption = ref<Object>({});
       const canDownload = ref<boolean>(true);
       function createConfirmDownload(record: Recordable) {
-        createConfirm({
-          title: '提示',
-          okText: '继续',
-          content: '是否确定下载。',
-          onOk: async () => {
-            handleDownload(record);
-          },
-        });
+        handleDownload(record);
+        // createConfirm({
+        //   title: '提示',
+        //   okText: '继续',
+        //   content: '是否确定下载。',
+        //   onOk: async () => {
+        //   },
+        // });
       }
 
       function handleDownload(record: Recordable) {
-        console.log('handleDownload', record, canDownload.value);
+        console.log('handleDownload', record, record.listCover || record.mapUrl);
         downloadByUrl({
           url: record.listCover || record.mapUrl,
           target: '_blank',
-          fileName: record.title + '.jpg',
+          fileName: record.title,
         });
       }
+      function getExtension(name) {
+        if (!name) return;
+        return name.substring(name.lastIndexOf('.'));
+      }
       function handleEdit(record: Recordable) {
         window.open(record.thumbEdit + '&&token=' + token.value);
       }
@@ -478,9 +492,9 @@
       }
       function handlegotoEdit(record) {
         if (!tableType.value) {
-          window.open(`/draw/#/tabulation?caseId=${record.caseId}&tabulationId=${record.id}`);
+          window.open(`/draw/#/tabulation?tabulationId=${record.id}`);
         } else {
-          window.open(`/draw/#/overview?caseId=${record.id}`);
+          window.open(`/draw/#/overview?overviewId=${record.id}`);
         }
       }
       function handlePowers(record: Recordable) {

src/views/draw/reName.vue

@@ -60,11 +60,12 @@
           component: 'Input',
           label: '名称',
           componentProps: {
-            maxLength: 50,
+            maxlength: 100,
+            showCount: true,
           },
           required: true,
           colProps: {
-            span: 18,
+            span: 22,
           },
         },
       ];

src/views/mediaLibrary/list.vue

@@ -138,7 +138,7 @@
         },
         {
           title: '勘验号',
-          dataIndex: 'dictNames',
+          dataIndex: 'kno',
           width: 80,
         },
         {
@@ -229,6 +229,10 @@
               style: { maxWidth: '250px' },
               api: getByKey,
               immediate: false,
+              filterOption: (inputText: string, option) => {
+                return option?.label.indexOf(inputText) >= 0
+              },
+              showSearch: true,
               labelField: 'dictName',
               valueField: 'id',
               params: {

src/views/mediaLibrary/modal/grouping.vue

@@ -18,7 +18,7 @@
       <BasicTable style="padding: 0" @register="registerTable">
         <template #action="{ record }">
           <TableAction
-            v-if="!record.isShare && record.useType != 'animation'"
+            v-if="!record.isShare && record.useType != 'animation' && record.useType != 'trace_evidence'"
             stopButtonPropagation
             :actions="[
               {

src/views/mediaLibrary/modal/uploadModal.vue

@@ -108,6 +108,10 @@
             style: 'width: 350px',
             labelField: 'dictName',
             listHeight: 150,
+            filterOption: (inputText: string, option) => {
+              return option?.label.indexOf(inputText) >= 0
+            },
+            showSearch: true,
             valueField: 'id',
             params: {
               type: 1,

src/views/planImg/addCaseModal.vue

@@ -2,7 +2,7 @@
   <BasicModal
     v-bind="$attrs"
     @register="register"
-    title="重命名"
+    :title="title"
     @visible-change="handleVisibleChange"
     @ok="handleSubmit"
     :confirmLoading="loading"
@@ -53,6 +53,7 @@
     setup(props, { emit }) {
       const modelRef = ref({});
       const loading = ref(false);
+      const title = ref('重命名');
       const fileFlow = reactive({
         title: '',
         caseTitle: '',
@@ -68,6 +69,7 @@
       });
       function onDataReceive(data) {
         fileFlow.caseTitle = '';
+        title.value = data.caseTitle?'重命名':'名称';
         modelRef.value = data;
         fileFlow.dylist = [];
         fileFlow.mslist = [];
@@ -147,6 +149,7 @@
         addListFunc,
         handleDelete,
         t,
+        title,
         loading,
       };
     },

src/views/planImg/list.vue

@@ -14,11 +14,11 @@
 
           <template #href="{ record }">
             <a
-              v-if="record.caseTitle"
+              v-if="record.title"
               target="_blank"
-              :title="record.caseTitle"
-              :href="`/code/index.html?caseId=${record.caseId}#/show`"
-              >{{ record.caseTitle }}</a
+              :title="record.title"
+              :href="`/code/index.html?caseId=${record.fusionId}#/show`"
+              >{{ record.title }}</a
             >
             <span v-else>-</span>
           </template>
@@ -96,23 +96,17 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useModal } from '/@/components/Modal';
   import {
-    operateSceneList,
-    sceneMove,
-    sceneDelete,
-    sceneReset,
-    sceneDownload,
     caseCheckDown,
-    downloadProcess,
     sceneCopy,
     rebuildScene,
     buildSceneObj,
     sceneDetail,
-    sceneCount,
     caseDelApi,
     caseListApi,
     caseProcess,
     caseDown,
   } from '/@/api/operate';
+  import { caseOverImgList } from '/@/api/operate/draw';
   import { message } from 'ant-design-vue';
   import { usePermissionStore } from '/@/store/modules/permission';
   import { useUserStore } from '/@/store/modules/user';
@@ -154,7 +148,7 @@
         },
         {
           title: '来源',
-          dataIndex: 'userName',
+          dataIndex: 'resource',
           ellipsis: true,
           width: 100,
         },
@@ -221,11 +215,11 @@
       const [registerMoveModal, { openModal: openMoveModal }] = useModal();
       const [registerPowersModal, { openModal: openPowersModal }] = useModal();
       const [registerTable, { reload, setColumns }] = useTable({
-        api: caseListApi,
+        api: caseOverImgList,
         title: ``,
         // titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
         columns: columns,
-        searchInfo: { isShare: tableType },
+        searchInfo: { tableType: tableType },
         useSearchForm: true,
         formConfig: searchForm,
         showIndexColumn: false,

src/views/productOperation/cameraScene.vue

@@ -47,7 +47,7 @@
       <div class="desc-wrap-BasicTable">
         <BasicTable @register="registerTable">
           <template #toolbar>
-            <a-button type="primary" @click="handleUpload"> 上传</a-button>
+            <a-button type="primary" v-if="tableType == 0" @click="handleUpload"> 上传</a-button>
             <!-- <a-button type="primary" @click="exportExcel"> 导出1</a-button> -->
           </template>
 
@@ -90,7 +90,7 @@
                 {
                   label: '编辑',
                   disabled: !(record.status == 1 || record.status == -2),
-                  ifShow: getTypeCheckPerm('scenes-edit') && tableType != 3 && record.editAuth,
+                  ifShow: getTypeCheckPerm('scenes-edit') && record.editAuth,
                   onClick: handlegotoEdit.bind(null, record),
                 },
                 {
@@ -196,14 +196,15 @@
         @cancelDownload="cancelDownload"
         :okButtonProps="{ disabled: canDownload }"
       />
-      <MoveModal @register="registerMoveModal" />
-      <PowersModal @register="registerPowersModal" />
+      <MoveModal @register="registerMoveModal" @update="reload" />
+      <PowersModal @register="registerPowersModal" @update="reload" />
       <uplodaModal @register="registerUplodaModal" @update="reload" />
-      <caseListModal @register="registerCaseListModal" />
+      <caseListModal @register="registerCaseListModal" @update="reload" />
     </PageWrapper>
   </div>
 </template>
 <script lang="ts">
+  import { jyPlatformlist, sceneGroupCount } from '/@/api/jyUserPlatform/index'; //roleLIstApi
   import { defineComponent, h, computed, toRefs, ref, onMounted } from 'vue';
   import Icon from '/@/components/Icon/index';
   import dayjs from 'dayjs';
@@ -227,6 +228,7 @@
   import { Descriptions, Tabs, Progress, Tooltip } from 'ant-design-vue';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { SCENE_TYPE } from '/@/settings/siteSetting';
   import { useModal } from '/@/components/Modal';
   import {
     operateSceneList,
@@ -345,25 +347,34 @@
             let str;
             switch (record.type) {
               case 0:
-                str = '四维看看';
+                str = SCENE_TYPE[1];
                 break;
               case 1:
-                str = '四维看见';
+                str = SCENE_TYPE[0];
                 break;
               case 2:
-                str = '四维深时/点云';
+                str = SCENE_TYPE[2];
                 break;
               case 5:
-                str = '四维深时';
+                str = SCENE_TYPE[4];
                 break;
               case 6:
-                str = '四维深光/点云';
+                str = SCENE_TYPE[3];
                 break;
               case 7:
-                str = '四维深光';
+                str = SCENE_TYPE[3];
                 break;
               case 8:
-                str = '圆周率';
+                str = SCENE_TYPE[4];
+                break;
+              case 9:
+                str = SCENE_TYPE[0];
+                break;
+              case 10:
+                str = SCENE_TYPE[2];
+                break;
+              case 11:
+                str = SCENE_TYPE[3];
                 break;
             }
             return str;
@@ -415,6 +426,20 @@
           },
         },
         {
+          title: '计算时长',
+          dataIndex: 'amountdf',
+          width: 180,
+          customRender: ({ record }) => {
+            let startBuildTime = record.startBuildTime;
+            if(!record.algorithmTime || !startBuildTime) return '-'
+            let seconds =  dayjs(record.algorithmTime).diff(dayjs(startBuildTime), 'seconds')
+            if(record.statusString == '计算中'){
+              seconds =  dayjs().diff(dayjs(startBuildTime), 'seconds')
+            }
+            return convertSeconds(seconds);
+          },
+        },
+        {
           title: 'SN码',
           dataIndex: 'snCode',
           defaultHidden: true,
@@ -485,53 +510,61 @@
           {
             field: 'type',
             label: '相机类型',
-            component: 'Select',
-            // defaultValue: '7',
+            component: 'ApiSelect',
             componentProps: {
-              // allowClear: false,
-              options: [
-                {
-                  label: '四维看看',
-                  value: '0',
-                  key: '0',
-                },
-                {
-                  label: '四维看见',
-                  value: '1',
-                  key: '1',
-                },
-                // {
-                //   label: '四维深时/点云',
-                //   value: '2',
-                //   key: '2',
-                // },
-                {
-                  label: '四维深时',
-                  value: '5',
-                  key: '5',
-                },
-                // {
-                //   label: '四维深光/点云',
-                //   value: '6',
-                //   key: '6',
-                // },
-                {
-                  label: '四维深光',
-                  value: '7',
-                  key: '7',
-                },
-                {
-                  label: '圆周率',
-                  value: '8',
-                  key: '8',
-                },
-              ],
+              style: { maxWidth: '250px', placeholder: '全部' },
+              placeholder: '全部',
+              api: sceneGroupCount,
+              immediate: false,
+              resultField: 'list',
+              labelField: 'name',
+              valueField: 'id',
+              params: { type: 'camera' },
             },
             colProps: {
               xl: 6,
               xxl: 6,
             },
           },
+          // {
+          //   field: 'type',
+          //   label: '相机类型',
+          //   component: 'Select',
+          //   // defaultValue: '7',
+          //   componentProps: {
+          //     options: [
+          //       {
+          //         label: SCENE_TYPE[1],
+          //         value: '0',
+          //         key: '0',
+          //       },
+          //       {
+          //         label: SCENE_TYPE[0],
+          //         value: '1',
+          //         key: '1',
+          //       },
+          //       {
+          //         label: SCENE_TYPE[2],
+          //         value: '5',
+          //         key: '5',
+          //       },
+          //       {
+          //         label: SCENE_TYPE[3],
+          //         value: '7',
+          //         key: '7',
+          //       },
+          //       {
+          //         label: SCENE_TYPE[4],
+          //         value: '8',
+          //         key: '8',
+          //       },
+          //     ],
+          //   },
+          //   colProps: {
+          //     xl: 6,
+          //     xxl: 6,
+          //   },
+          // },
           {
             field: 'num',
             label: '场景码',
@@ -556,6 +589,25 @@
               xxl: 5,
             },
           },
+          {
+            field: 'platform',
+            label: '平台',
+            component: 'ApiSelect',
+            ifShow: false,
+            componentProps: {
+              style: { maxWidth: '250px', placeholder: '全部' },
+              placeholder: '全部',
+              api: sceneGroupCount,
+              immediate: false,
+              resultField: 'list',
+              labelField: 'name',
+              valueField: 'id',
+            },
+            colProps: {
+              xl: 18,
+              xxl: 18,
+            },
+          },
         ],
       };
       function cancelDownload() {
@@ -569,7 +621,7 @@
       const [registerUplodaModal, { openModal: openUplodaModal }] = useModal();
       const [registerPowersModal, { openModal: openPowersModal }] = useModal();
       const [registerCaseListModal, { openModal: openCaseListModal }] = useModal();
-      const [registerTable, { reload }] = useTable({
+      const [registerTable, { reload, getForm }] = useTable({
         api: operateSceneList,
         title: `场景列表`,
         // titleHelpMessage: ['已启用expandRowByClick', '已启用stopButtonPropagation'],
@@ -598,6 +650,7 @@
       });
       function changeTable(val: string) {
         tableType.value = val;
+        getForm().updateSchema({ field: 'platform', ifShow: val == '1' });
         reload();
       }
       async function handleCopy(record: Recordable) {
@@ -630,6 +683,14 @@
         //   },
         // });
       }
+      function convertSeconds(seconds) {
+        if(seconds == 'NaN') return
+      var days =seconds>(3600*24)? Math.floor(seconds / (3600*24)):0;
+      var hours = seconds>3600?Math.floor((seconds % (3600*24)) / 3600):0;
+      var minutes = Math.floor((seconds % 3600) / 60);
+      var remainingSeconds = seconds % 60;
+      return  `${ days && (days + '天')||''} ${hours && (hours + '小时')||''} ${minutes ||'0'}分钟 ${remainingSeconds||'0'}秒`
+    }
       async function handleMove(record: Recordable) {
         openMoveModal(true, {
           ...record,
@@ -652,8 +713,9 @@
       function handleDownload(record: Recordable) {
         console.log('handleDownload', record, canDownload.value);
         canDownload.value = true;
-        let isObj = record.type == 5 || record.type == 7 ? 1 : 0;
-        let params = { num: record.num, isObj };
+        // todo: bug修复
+        // let isObj = record.type == 5 || record.type == 7 ? 1 : 0;
+        let params = { num: record.num, isObj: 1 };
         checkDownLoad(params).then(async (res) => {
           let sceneDownloadRes = res;
           if (res.downloadStatus != 3) {
@@ -763,17 +825,18 @@
         }
       }
       async function handlePowers(record: Recordable) {
-        let res = await getCaseByNum({ num: record.num });
-        if (res && res.length) {
-          openCaseListModal(true, {
-            list: res,
-          });
-        } else {
+        let res = await getCaseByNum({ num: record.num, authType: 0,  });
+        // if (res && res.length) {
+        //   openCaseListModal(true, {
+        //     list: res,
+        //   });
+        // } else {
           openPowersModal(true, {
             ...record,
+            sourceType: 'scene',
             tableType: tableType.value,
           });
-        }
+        // }
       }
       onMounted(async () => {
         let list = await sceneCount();
@@ -813,6 +876,7 @@
         registerUplodaModal,
         afterClose,
         timer,
+        reload,
         canDownload,
         downloadOption,
         cancelDownload,

src/views/productOperation/modal/PowersModal.vue

@@ -2,20 +2,20 @@
   <BasicModal
     v-bind="$attrs"
     @register="register"
-    :title="caseId?'设置权限':'设置场景权限'"
+    :title="(caseId||fusionId)?'设置权限':'设置场景权限'"
     @cancel="resetFields"
     @ok="handleSubmit"
     :width="1100"
     :min-height="0"
   >
     <div class="pt-2px pr-3px">
-      <div style="margin-left: 17px">提示：若添加的用户已有部分场景权限，新的权限覆盖原有的权限。</div>
+      <div style="margin-left: 17px">提示：若添加的用户已有部分{{fusionId?'':'场景'}}权限，新的权限覆盖原有的权限。</div>
       <BasicForm @register="registerForm" :model="model">
         <template #text="{ model, field }">
           {{ model[field] }}
         </template>
       </BasicForm>
-      <BasicTable class="powesrTable" @register="registerTable">
+      <BasicTable class="powesrTable" ref="tableRef" @register="registerTables">
         <template #toolbar>
           <a-button type="primary" v-if="getCheckPerm('scenes-powers-add')" @click="addPowes">
             新增
@@ -75,15 +75,19 @@
     emits: ['update', 'register'],
     setup(props, { emit }) {
       const modelRef = ref({});
+      const tableRef = ref(null);
+
       const numRef = ref(null);
       const caseId = ref(null);
+      const fusionId = ref(null);
+      const sourceType = ref(null);
       const type = ref(0);
       const fileFlow = reactive({
         showList: true,
       });
       const [registerryNoModal, { openModal: openryNoModal }] = useModal();
       const [registerDetail, { openModal: openDetaileModal }] = useModal();
-      const columns: BasicColumn[] = [
+      const columnssss: BasicColumn[] = [
         {
           title: '警员ID',
           dataIndex: 'ryNo',
@@ -148,25 +152,19 @@
       const roleId = computed(() => userStore.getUserInfo?.roleId);
       const { getCheckPerm } = permissionStore;
       const { createMessage, createConfirm } = useMessage();
-      const [registerTable, { reload, getRawDataSource }] = useTable({
+      const [registerTables, { reload, getColumns }] = useTable({
         api: getAuthList,
         title: `已授权列表`,
-        columns: columns,
+        columns: columnssss,
         useSearchForm: false,
         immediate: false,
         searchInfo: {
           num: numRef,
+          sourceType: sourceType,
           caseId: caseId,
           authType: type,
+          fusionId: fusionId,
         },
-        // afterFetch: (T) => {
-        //   let { authType } = getRawDataSource();
-        //   setFieldsValue({
-        //     authType,
-        //   });
-        //   fileFlow.showList = authType ? false : true;
-        //   return T;
-        // },
         showTableSetting: true,
         tableSetting: { fullScreen: true },
         showIndexColumn: false,
@@ -218,27 +216,25 @@
       async function onDataReceive(data) {
         console.log('onDataReceive', data);
         modelRef.value = data;
-        numRef.value = data.num;
+        numRef.value = data.sourceType=='fusion'?data.fusionId: data.num;
+        sourceType.value = data.sourceType;
+        fusionId.value = data.fusionId;
         caseId.value = data.caseId;
         resetFields();
-        const { authType } = await getAuthType({ num: numRef.value, caseId: caseId.value });
+        const { authType } = await getAuthType({ num: numRef.value,  sourceType: sourceType.value });
         fileFlow.showList = authType ? false : true;
         type.value = authType;
         setFieldsValue({
           type: data.sceneName,
           authType,
         });
-        console.log(
-          'roleId',
-          roleId.value,
-          userName.value != data.userName || roleId.value != 1 || roleId.value != 45 || roleId.value != 48,
-        );
         let disabled = !(
           userName.value == data.userName ||
           roleId.value == 1 ||
           roleId.value == 45 ||
           roleId.value == 48
         );
+
         updateSchema({
           field: 'authType',
           componentProps: {
@@ -262,6 +258,7 @@
             caseId: caseId.value,
             ...params,
             lookAuth: params.authType,
+            sourceType: sourceType.value,
           });
           console.log('res', res);
           closeModal();
@@ -273,10 +270,11 @@
         }
       };
       function addPowes() {
-        openDetaileModal(true, { num: modelRef.value.num, caseId: caseId.value, qxType: fileFlow.showList });
+        console.log('addPowes', getColumns(), columnssss);
+        openDetaileModal(true, { num: numRef.value, caseId: caseId.value, qxType: fileFlow.showList, sourceType: sourceType.value });
       }
       function handleRyno(record) {
-        openryNoModal(true, {...record, caseId: caseId.value});
+        openryNoModal(true, {...record, caseId: caseId.value, sourceType: sourceType.value});
       }
       function handleEdit(record: Recordable) {
         openDetaileModal(true, record);
@@ -286,7 +284,7 @@
           title: '删除',
           content: `确定要删除 ${record.ryNickName} 吗？`,
           onOk: async () => {
-            await delAuth({ id: record.id });
+            await delAuth({ id: record.id, num: numRef.value, sourceType: sourceType.value, });
             createMessage.success('删除成功');
             reload();
           },
@@ -306,7 +304,7 @@
         getCheckPerm,
         handleEdit,
         handleDelete,
-        registerTable,
+        registerTables,
         registerDetail,
         registerryNoModal,
         openDetaileModal,
@@ -314,6 +312,8 @@
         reload,
         userName,
         caseId,
+        fusionId,
+        tableRef,
       };
     },
   });

src/views/productOperation/modal/detailModal.vue

@@ -46,6 +46,10 @@
       });
       const { createMessage } = useMessage();
       const title = ref('新增客户');
+      const modelDataRef = ref({
+        num: '',
+        sourceType: '',
+      });
       const optionsName = ref([]);
       const range = (start, end) => {
         const result = [];
@@ -399,7 +403,9 @@
       let addListFunc = () => {};
       const [register, { closeModal }] = useModalInner(async (data) => {
         onSearch('');
-        let checkAuthOther = await checkAuthOtherApi({ num: data.num, caseId: data.caseId, authType: data.qxType ? 0 : 1, });
+        modelDataRef.value.num = data.num;
+        modelDataRef.value.sourceType = data.sourceType;
+        let checkAuthOther = await checkAuthOtherApi({ num: data.num, caseId: data.caseId, authType: data.qxType ? 0 : 1, sourceType: data.sourceType });
         let setData = {
           ...checkAuthOther,
           ...data,
@@ -550,6 +556,7 @@
                 ? 1
                 : 0,
             authType: fileFlow.qxType ? 0 : 1,
+            ...modelDataRef.value,
           });
           closeModal();
           resetFields();

src/views/productOperation/modal/resultListModal.vue

@@ -22,7 +22,7 @@
             v-if="record.caseTitle"
             target="_blank"
             :title="record.caseTitle"
-            :href="`/code/index.html?caseId=${record.caseId}#/show`"
+            :href="`/code/index.html?caseId=${record.fusionId}#/show`"
             >{{ record.caseTitle }}</a
           >
           <span v-else>-</span>

src/views/productOperation/modal/uploadModal.vue

@@ -3,9 +3,11 @@
     v-bind="$attrs"
     @register="register"
     title="原始数据上传"
+    :showCancelBtn="false"
     @visible-change="handleVisibleChange"
     @cancel="resetFields"
     @ok="handleSubmit"
+    :loading="loading"
     :min-height="0"
   >
     <div class="pt-2px pr-3px">
@@ -19,11 +21,11 @@
   </BasicModal>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, nextTick, onMounted, reactive } from 'vue';
+  import { defineComponent, ref, nextTick, onMounted, reactive, h } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { uploadSceneOrig } from '/@/api/operate';
+  import { uploadSceneOrig, uploadSceneCheck } from '/@/api/operate';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { uploadApi } from '/@/api/product/index';
 
@@ -39,7 +41,8 @@
       const fileFlow = reactive({
         filePath: null,
       });
-      const { createMessage } = useMessage();
+      const loading = ref(false);
+      const { createMessage, createConfirm } = useMessage();
       const schemas: FormSchema[] = [
         {
           field: 'filePath',
@@ -54,6 +57,7 @@
           componentProps: {
             api: uploadApi,
             maxNumber: 1,
+            sizeUnit: 'GB',
             maxSize: 5,
             // accept: ['xls', 'xlsx'],
             afterFetch: function (data) {
@@ -93,12 +97,35 @@
         try {
           const params = await validate();
           let filePath = params.filePath[0];
-          const res = await uploadSceneOrig(filePath);
-          console.log('res', res);
-          closeModal();
-          resetFields();
-          createMessage.success('上传成功。');
-          emit('update');
+          const resCheck = await uploadSceneCheck(filePath);
+          if (resCheck.code == 60042) {
+            return createConfirm({
+              iconType: 'warning',
+              title: '提示',
+              content: () =>
+                h('div', {}, [
+                  h('div', null, `此场景原属于${resCheck.data}，继续上传将重新计算并覆盖原场景：`),
+                  h('div', null, `归属权转移至当前账号；`),
+                  h('div', null, `清除原所有者的权限设置；`),
+                  h('div', null, `清空场景内由用户手动添加的空间模型。`),
+                  h('div', null, `确定继续吗？`),
+                ]),
+              onOk: async () => {
+                Submit(filePath)
+              },
+            });
+          }
+          if(resCheck.code == 60043) {
+            return createConfirm({
+              iconType: 'warning',
+              title: '提示',
+              content: `此场景此前已上传过‌，继续上传将重新计算并覆盖原场景，场景内由用户手动添加的空间模型也会清空，确定继续吗？`,
+              onOk: async () => {
+                Submit(filePath)
+              },
+            });
+          }
+          Submit(filePath)
         } catch (error) {
           console.log('not passing', error);
         }
@@ -107,6 +134,16 @@
         // console.log(v);
         // v && props.userData && nextTick(() => onDataReceive(props.userData));
       }
+      async function Submit(filePath) {
+        loading.value = true;
+        const res = await uploadSceneOrig(filePath);
+        loading.value = false;
+        console.log('res', res, filePath);
+        closeModal();
+        resetFields();
+        createMessage.success('上传成功。');
+        emit('update');
+      }
       return {
         register,
         schemas,
@@ -116,6 +153,7 @@
         handleVisibleChange,
         handleSubmit,
         addListFunc,
+        loading,
         resetFields,
         t,
       };

src/views/workerShare/addModal.vue

@@ -2,7 +2,7 @@
   <BasicModal
     v-bind="$attrs"
     @register="register"
-    title="新增人员"
+    :title="title"
     @cancel="resetFields"
     @ok="handleSubmit"
   >
@@ -34,9 +34,11 @@
       const modelRef = ref(false);
       const fileFlow = reactive({
         file: null,
+        id: '',
       });
       const { createMessage } = useMessage();
       const optionsName = ref([]);
+      const title = ref('新增人员');
       const schemas: FormSchema[] = [
         {
           field: 'id',
@@ -61,6 +63,7 @@
                   return Promise.reject('请输入人员编号');
                 }
                 let res = await getinnerByRyId({ ryNo: value });
+                fileFlow.id = res && res.data ? res.data.id : '';
                 console.log('value', value, res);
                 if (res && !res.data) {
                   return Promise.reject('人员编号不存在');
@@ -93,14 +96,14 @@
           },
         },
         {
-          field: 'isTop',
+          field: 'shareTypes',
           component: 'CheckboxGroup',
           required: true,
           label: '共享内容',
           componentProps: {
             options: [
-              { label: '所有场景', value: 1 },
-              { label: '所有案件', value: 0 },
+              { label: '查看场景', value: 'scene' },
+              { label: '查看多元融合', value: 'fusion' },
             ],
           },
           colProps: {
@@ -124,6 +127,17 @@
       let addListFunc = () => {};
       const [register, { closeModal }] = useModalInner(async (data) => {
         console.log('option', data);
+        fileFlow.id = data.id;
+        title.value = data.id ? '编辑人员' : '新增人员';
+        // let shareTypeObj = {
+        //   0: [0],
+        //   1: [1],
+        //   2: [0, 1],
+        // }
+        setFieldsValue({
+          ...data,
+          // shareType: data.shareType && shareTypeObj[data.shareType]||[]
+        })
       });
       function onFilterOption(inputText: string, option) {
         console.log('option', inputText, option.value);
@@ -148,7 +162,12 @@
         const params = await validate();
         try {
           console.log('params', params);
-          await userShareAdd(params);
+          // let shareType = params.shareType.length == 2 ? 2 : params.shareType[0];
+          await userShareAdd({
+            ...params,
+            id: fileFlow.id,
+            // shareType: shareType,
+          });
           closeModal();
           resetFields();
           emit('ok');
@@ -167,6 +186,7 @@
         handleSubmit,
         addListFunc,
         resetFields,
+        title,
         t,
       };
     },

src/views/workerShare/data.ts

@@ -18,7 +18,13 @@ export const userListSchema: BasicColumn[] = [
     width: 200,
     dataIndex: 'ryNo1',
     customRender: ({ record }) => {
-      return record.status == 1 ? '场景' : '案件';
+      if (!record.shareTypes) return '';
+      const shareTypes = record.shareTypes.toString();
+      return shareTypes == 'scene'
+        ? '查看场景'
+        : shareTypes == 'fusion'
+        ? '查看多元融合'
+        : '查看场景 查看多元融合';
     },
   },
   {

src/views/workerShare/index.vue

@@ -10,6 +10,11 @@
         <TableAction
           :actions="[
             {
+              label: '编辑',
+              ifShow: getCheckPerm('sceneShare-edit'),
+              onClick: handleEdit.bind(null, record),
+            },
+            {
               label: '删除',
               color: 'error',
               ifShow: getCheckPerm('sceneShare-del'),
@@ -107,6 +112,10 @@
       function handleOpen(record) {
         console.log('点击了启用', record);
       }
+      function handleEdit(record) {
+        openAddModal(true, record);
+      }
+      
       async function handleDlet(record) {
         createConfirm({
           title: '删除',
@@ -126,6 +135,7 @@
         reload,
         handleDlet,
         getCheckPerm,
+        handleEdit,
         handleCreate,
         t,
       };