1

src/views/case/addCaseModal.vue

@@ -5,6 +5,7 @@
     title="新增案件"
     @visible-change="handleVisibleChange"
     @ok="handleSubmit"
+    :confirmLoading="loading"
     :width="900"
     :min-height="0"
   >
@@ -58,6 +59,7 @@
     emits: ['update', 'register'],
     setup(props, { emit }) {
       const modelRef = ref({});
+      const loading = ref(false);
       const fileFlow = reactive({
         caseTitle: '',
         file: null,
@@ -217,6 +219,7 @@
         console.log('isObj', isObj, fileFlow);
       }
       function onDataReceive(data) {
+        fileFlow.caseTitle = '';
         modelRef.value = data;
         fileFlow.dylist = [];
         fileFlow.mslist = [];
@@ -242,6 +245,7 @@
           return createMessage.warning('请输入案件名称')
         }
         try {
+          loading.value = true;
           const apiData = {
             caseTitle: fileFlow.caseTitle?.trim(),
             sceneNumParam: [
@@ -261,7 +265,9 @@
           closeModal();
           createMessage.success('新增案件成功。');
           emit('update');
+          loading.value = false;
         } catch (error) {
+          loading.value = false;
           console.log('not passing', error);
         }
       };
@@ -295,6 +301,7 @@
         addListFunc,
         handleDelete,
         t,
+        loading,
       };
     },
   });

src/views/case/list.vue

@@ -152,7 +152,7 @@
       const tableType = ref<Recordable>(0); //0看看 、1看见、2深时
       const columns: BasicColumn[] = [
         {
-          title: '场景标题',
+          title: '标题',
           dataIndex: 'sceneName',
           ellipsis: true,
           slots: { customRender: 'href' },

src/views/mediaLibrary/list.vue

@@ -425,9 +425,8 @@
       }
       function floadileUrl(record) {
         if (record.fileType == 3) {
-          let url = `/code/index.html?title=%E6%A8%A1%E5%9E%8B&type=obj&fileUrl=/oss/manage/media-library/result/3fe92d7c8a03422ca78ad77e657dbd41/wwwroot/scene_view_data/YZL-jm-IfYPeJEKEfr/data/mesh/mesh.glb#/sign-model`
-          record.fileUrl;
-          return window.open(record.fileUrl);
+          let url = `/code/index.html?title${record.fileName}type=${record.fileFormat}&fileUrl=${record.fileUrl}#/sign-model`
+          return window.open(url);
         }else{
           return window.open(record.fileUrl);
         }

src/views/mediaLibrary/modal/grouping.vue

@@ -11,7 +11,7 @@
     <div class="pt-2px pr-3px">
       <div class="mx-5 BasicForm flex">
         <div class="input">
-          <a-input v-model:value="fileFlow.dictName" placeholder="请输入" />
+          <a-input style="width: 395px" maxlength="50" showCount v-model:value="fileFlow.dictName" placeholder="请输入" />
         </div>
         <a-button type="primary" @click="handleAdd"> 新增</a-button>
       </div>
@@ -149,21 +149,7 @@
         });
       }
       const handleSubmit = async () => {
-        try {
-          const params = await validate();
-          const apiData = {
-            snCode: params.snCode,
-            num: modelRef.value.num,
-          };
-          console.log('res', apiData, params);
-          const res = await sceneMove(apiData);
-          console.log('res', res);
-          closeModal();
-          createMessage.success('场景迁移成功。');
-          emit('update');
-        } catch (error) {
-          console.log('not passing', error);
-        }
+        closeModal();
       };
       function handleVisibleChange(v) {
         // console.log(v);

src/views/mediaLibrary/modal/uploadModal.vue

@@ -7,6 +7,7 @@
     @cancel="resetFields"
     @ok="handleSubmit"
     :min-height="250"
+    :height="700"
   >
     <div class="pt-2px pr-3px">
       <BasicForm @register="registerForm" :model="model">
@@ -15,10 +16,18 @@
         </template>
       </BasicForm>
       <div style="padding: 0 0 0 82px">
-        <div style="margin-bottom: 20px"
+        <div style="margin-bottom: 10px"
           >支持jpg、png、jpeg、mp4、wav、mp3 、shp格式文件上传。文件大小 ≤ 2G</div
         >
         <span>注意：模型需使用zip包上传。包含贴图、模型、mtl文件，包内不得包含文件夹。</span>
+        <div style="margin-bottom: 10px">
+          <div> 上传 obj：需使用zip包上传。包含贴图、模型、mtl文件，包内不得包含文件夹，文件名不得使用中文。如图：</div>
+          <img style="width: 150px" :src="obj" alt="" />
+        </div>
+        <div style="margin-bottom: 10px">
+          <div> 上传 osgb：需使用zip包上传。包含 Data 文件夹、mtl文件，包内不得包含文件夹，文件名不得使用中文。如图：</div>
+          <img style="width: 150px" :src="osgb" alt="" />
+        </div>
       </div>
     </div>
   </BasicModal>
@@ -29,6 +38,8 @@
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { addOrUpdate, uploadApi, getByKey } from '/@/api/media';
+  import obj from '/@/assets/images/obj.jpg';
+  import osgb from '/@/assets/images/osgb.jpg';
   import { useI18n } from '/@/hooks/web/useI18n';
 
   const { t } = useI18n();
@@ -81,6 +92,7 @@
           required: true,
           componentProps: {
             api: getByKey,
+            style: 'width: 350px',
             labelField: 'dictName',
             listHeight: 150,
             valueField: 'id',
@@ -150,6 +162,8 @@
         addListFunc,
         resetFields,
         t,
+        obj,
+        osgb,
       };
     },
   });

src/views/productOperation/cameraScene.vue

@@ -463,7 +463,7 @@
             },
           },
           {
-            field: 'userName',
+            field: 'snCode',
             label: 'SN 码',
             component: 'Input',
             componentProps: {

src/views/productOperation/modal/MoveModal.vue

@@ -112,7 +112,7 @@
         try {
           const params = await validate();
           const apiData = {
-            snCode: params.snCode,
+            ryNo: params.snCode,
             num: modelRef.value.num,
           };
           console.log('res', apiData, params);

src/views/productOperation/modal/PowersModal.vue

@@ -9,7 +9,7 @@
     :min-height="0"
   >
     <div class="pt-2px pr-3px">
-      <div style="margin-left: 17px">提示：若添加的用户已有部分场景权限，新的权限覆盖原有的权限。</div>
+      <div style="margin-left: 17px">提示：若添加的用户已有部分场景权限，新的权限覆盖原有的权限。{{ caseId }}</div>
       <BasicForm @register="registerForm" :model="model">
         <template #text="{ model, field }">
           {{ model[field] }}
@@ -216,6 +216,7 @@
       });
 
       async function onDataReceive(data) {
+        console.log('onDataReceive', data);
         modelRef.value = data;
         numRef.value = data.num;
         caseId.value = data.caseId;
@@ -311,6 +312,7 @@
         addPowes,
         reload,
         userName,
+        caseId,
       };
     },
   });

src/views/productOperation/modal/ryNoSceneModal.vue

@@ -57,6 +57,7 @@
           />
         </template>
       </BasicTable>
+      <div>提示：案件权限将覆盖上述权限</div>
       <detailModal @register="registerDetail" @update="reload" />
     </div>
   </BasicModal>
@@ -149,7 +150,7 @@
       const { createMessage, createConfirm } = useMessage();
       const [registerTable, { reload, getRawDataSource }] = useTable({
         api: getCaseNumByRyId,
-        title: `已授权列表`,
+        title: ``,
         columns: columns,
         useSearchForm: false,
         immediate: false,