bill 7 ماه پیش
والد
کامیت
3f931eb0a3

+ 3 - 2
src/components/chunk-upload/index.vue

@@ -9,10 +9,11 @@
     @remove="api.file.value = undefined"
     :file-list="api.fileList.value"
     @exceed="() => ElMessage.error('只能上传一个文件')"
-    :disable="api.percentage.value || disabled"
+    :disabled="api.percentage.value || disabled"
     :before-upload="api.upload"
+    v-pdpath="'sync'"
   >
-    <el-button v-pdpath="'sync'" type="primary" class="upload-button">
+    <el-button type="primary" class="upload-button">
       <el-icon><Upload /></el-icon>{{ api.percentage.value ? "文件上传中" : "上传数据" }}
     </el-button>
   </el-upload>

+ 0 - 1
src/components/dialog/index.vue

@@ -38,7 +38,6 @@ const props = withDefaults(defineProps<DialogProps>(), {
   enterText: "保 存",
 });
 
-
 const emit = defineEmits<{
   (e: "update:show", show: boolean): void;
   (e: "quit"): void;

+ 1 - 1
src/view/camera/bind.vue

@@ -54,7 +54,7 @@ const bindCamera = ref<Camera>(
   (props.camera ? { ...props.camera } : { cameraSn: "", snCode: "" }) as Camera
 );
 
-const cameraTypes = [CameraType.SWKJ, CameraType.SWSS1, CameraType.SWSS2];
+const cameraTypes = [CameraType.SWKJ, CameraType.SWSS2];
 const users = ref<UserInfo[]>([]);
 watchEffect(async () => {
   if (bindCamera.value.deptId) {

+ 1 - 5
src/view/camera/index.vue

@@ -91,11 +91,7 @@ const changeCameraHandler = async (camera: Camera) => {
 };
 
 const del = async (camera: Camera) => {
-  if (
-    await confirm(
-      "解绑相机,该相机拍摄的场景也将一并解绑(场景在云端存储,不会删除)确定要解绑吗?"
-    )
-  ) {
+  if (await confirm("解绑相机后,相机不再登记在当前架构,确定要解绑吗?")) {
     await delCamera(camera);
     refresh();
     ElMessage.success("解绑成功");

+ 8 - 2
src/view/case/editMenu.vue

@@ -8,8 +8,13 @@
     </span>
     <template #dropdown>
       <el-dropdown-menu>
-        <!-- :disabled="!operateIsPermissionByPath('edit', menu.key)" -->
-        <el-dropdown-item v-for="menu in menus" :key="menu.key" @click="menu.onClick()">
+        <!-- -->
+        <el-dropdown-item
+          v-for="menu in menus"
+          :key="menu.key"
+          @click="menu.onClick()"
+          :disabled="!operateIsPermissionByPath('edit', menu.key)"
+        >
           {{ menu.label }}
         </el-dropdown-item>
       </el-dropdown-menu>
@@ -23,6 +28,7 @@ import { getFuseCodeLink, checkScenesOpen, MenuItem, getSWKKSyncLink } from "./h
 import { showCaseScenes, addCaseScenes, shareCase, downloadCase } from "./quisk";
 import { RouteName, router } from "@/router";
 import { copyCase, getCaseSceneList } from "@/store/case";
+import { operateIsPermissionByPath } from "@/directive/permission";
 import { alert } from "@/helper/message";
 
 const props = defineProps<{

+ 2 - 1
src/view/vrmodel/editModel.vue

@@ -3,7 +3,8 @@
     <el-form-item label="模型名称">
       <el-input
         v-model="bindModel.modelTitle"
-        maxlength="50"
+        :maxlength="100"
+        show-word-limit
         placeholder="请输入模型名称"
       />
     </el-form-item>

+ 2 - 1
src/view/vrmodel/modelContent.vue

@@ -38,6 +38,7 @@
       <span
         class="oper-span"
         @click="contineUpload(row)"
+        v-pdpath="'sync'"
         v-if="row.uploadStatus !== UploadStatus.SUCCESS && row.uploadStatus !== null"
       >
         继续上传
@@ -126,7 +127,7 @@ const contineUpload = async (row: ModelScene) => {
     name: row.modelTitle,
     fileType: row.fileType,
     oldMd5: row.fileMd5,
-    id: row.id,
+    id: row.uploadId.toString(),
   });
   props.pagging.refresh();
 };

+ 1 - 0
src/view/vrmodel/sceneContent.vue

@@ -59,6 +59,7 @@
         class="oper-span"
         @click="contineUpload(row)"
         v-if="row.uploadStatus !== UploadStatus.SUCCESS && custom"
+        v-pdpath="'sync'"
       >
         继续上传
       </span>

+ 16 - 9
src/view/vrmodel/upload.vue

@@ -1,14 +1,20 @@
 <template>
   <el-form ref="form" label-width="100px" class="camera-from">
     <el-form-item label="标题:" class="mandatory">
-      <el-input placeholder="请输入" v-model="info.name" :disabled="props.id" />
+      <el-input
+        placeholder="请输入"
+        v-model="info.name"
+        :disabled="!!props.id"
+        :maxlength="100"
+        show-word-limit
+      />
     </el-form-item>
     <el-form-item label="类型:" class="mandatory" v-if="zipTypeOptions">
       <el-select
         v-model="info.fileType"
         placeholder="请选择"
         style="width: 100%"
-        :disabled="props.id"
+        :disabled="!!props.id"
       >
         <el-option
           v-for="item in zipTypeOptions"
@@ -60,8 +66,7 @@ const zipTypeOptionsRaw = computed(() => {
     return [
       {
         value: ZipType.a_az,
-        desc:
-          "请上传AZ系列设备导出的原始数据包文件夹使用英文或数字命名。打包成zip格式并上传。",
+        desc: "请上传AZ系列设备导出的原始数据包,打包成zip格式并上传。",
       },
     ];
   } else if (props.type === SceneType.C_SWSS) {
@@ -73,11 +78,11 @@ const zipTypeOptionsRaw = computed(() => {
       {
         value: ZipType.f_e57_s,
         desc:
-          "请从Faro Scene分别导出e57数据及全景图放在同一文件夹,文件夹使用英文或数字命名。打包成zip格式并上传。",
+          "请从Faro Scene分别导出e57数据及全景图放在同一文件夹。打包至zip格式并上传。",
       },
       {
         value: ZipType.n_e57,
-        desc: `请将标准e57数据打包文件夹,文件夹使用英文或数字命名,打包.zip格式上传。<a href="/oss/fusion/model/e57/e57.zip">查看标准e57数据样例</a>`,
+        desc: `请将标准e57数据,打包至zip格式并上传。<a href="/oss/fusion/model/e57/e57.zip">查看标准e57数据样例</a>`,
       },
     ];
   } else if (props.type === SceneType.SWMX) {
@@ -85,15 +90,17 @@ const zipTypeOptionsRaw = computed(() => {
       {
         value: ZipType.m_obj,
         desc:
-          "请将obj、mtl、贴图文件放在同一文件夹,文件夹使用英文或数字命名,打包成zip格式上传。建议大小在100M内。",
+          "请将obj、mtl、贴图文件放在同一文件夹,内部文件均使用英文或数字命名,打包成zip格式上传。建议大小在100M内,限制大小1GB。",
       },
       {
         value: ZipType.m_cot,
-        desc: "请将ply/las/laz点云文件,打包成zip格式上传。大小在50GB以内。",
+        desc:
+          "请将ply/las/laz点云文件,内部文件均使用英文或数字命名,打包至zip格式上传。大小在50GB以内。",
       },
       {
         value: ZipType.m_qx,
-        desc: "请将b3dm文件,打包成zip格式上传。大小在50GB以内。",
+        desc:
+          "请将b3dm文件,内部文件均使用英文或数字命名,打包成zip格式上传。大小在50GB以内。",
       },
     ];
   }