Explorar el Código

修改节点问题云南分支

tangning hace 1 semana
padre
commit
e647c06d5d

+ 1 - 1
.env.yunnan

@@ -1,4 +1,4 @@
-VITE_APP_APP="yunnan"
+VITE_APP_APP="criminal"
 VITE_SEVER_URL="http://192.168.0.93"
 VITE_DEVCODE_URL="http://192.168.0.93/code"
 VITE_SWKK_URL="https://test.4dkankan.com"

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

@@ -61,7 +61,7 @@
         <!-- <span class="oper-span" @click="gotoQuery(row.caseId)" v-pdpath="['view']"
           >查看</span
         > -->
-        <MoreMenu :caseId="row.caseId" :title="row.caseTitle" @copy="copy" />
+        <!-- <MoreMenu :caseId="row.caseId" :title="row.caseTitle" @copy="copy" /> -->
         <!-- <span class="oper-span" @click="copy(row.caseId)" v-pdpath="['view']">
             复制
           </span> -->

+ 2 - 2
src/app/criminal/view/login/index.vue

@@ -44,10 +44,10 @@
       </el-form>
     </div>
 
-    <p class="desc" v-if="appId != 'yunnan'">
+    <!-- <p class="desc" v-if="appId != 'yunnan'">
       公安部鉴定中心 & 珠海市四维时代网络科技有限公司 |
       公安部科技强警基础工作计划(2022JC13)
-    </p>
+    </p> -->
   </div>
 </template>
 

+ 1 - 1
src/app/index.ts

@@ -55,7 +55,7 @@ if (app === "fire") {
   appConstant = fireConstant;
 } else if (app === "criminal" || app === "yunnan") {
   appRoutes = cRoutes;
-  menuRouteNames = app === "yunnan"?menuyunnanRouteNames:cMenuRouteNames;
+  menuRouteNames = menuyunnanRouteNames;
   appConstant = criminalConstant;
 } else if (app === "xmfire") {
   appRoutes = xmfireRoutes;

+ 7 - 0
src/store/scene.ts

@@ -340,3 +340,10 @@ export const getSWKKSyncLink = async (scene: Scene, caseId: number) => {
   }
   return url;
 };
+
+// 上传场景
+export const uploadScene = async (params) => {
+  const data = (await axios.post('/fusion/scene/uploadScene', params)).data as PaggingRes<Scene>;
+
+  return data;
+};

+ 1 - 0
src/store/user.ts

@@ -97,6 +97,7 @@ export const addUser = async (
 ) => {
   const password = encodePwd(params.password);
   await axios.post(userAdd, {
+    deptId: '2',
     ...params,
     password,
     deptIdList: deptPath.join(","),

+ 5 - 2
src/view/camera/bind.vue

@@ -10,7 +10,7 @@
         @update:modelValue="(val: string) => (bindCamera.snCode = val.trim())"
       />
     </el-form-item>
-    <el-form-item label="所属架构:" class="mandatory">
+    <!-- <el-form-item label="所属架构:" class="mandatory">
       <com-company
         v-model="bindCamera.deptId"
         :disabled="
@@ -18,7 +18,7 @@
         "
         hide-all
       />
-    </el-form-item>
+    </el-form-item> -->
     <el-form-item label="管理员:" class="mandatory">
       <el-select
         v-model="bindCamera.userId"
@@ -51,6 +51,9 @@ const bindCamera = ref<Camera>(
   (props.camera ? { ...props.camera } : { cameraSn: "", snCode: "" }) as Camera
 );
 const users = ref<UserInfo[]>([]);
+getUsers(2).then(res => {
+  users.value = res;
+})
 watchEffect(async () => {
   if (bindCamera.value.deptId) {
     users.value = await getUsers(bindCamera.value.deptId);

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

@@ -1,9 +1,9 @@
 <template>
   <com-head :options="[{ name: '相机管理', value: '2' }]">
     <el-form label-width="97px" inline>
-      <el-form-item label="所属架构:">
+      <!-- <el-form-item label="所属架构:">
         <com-select v-model="state.query.deptId" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="S/N码:">
         <el-input v-model="state.query.snCode" placeholder="请输入"></el-input>
       </el-form-item>
@@ -41,7 +41,7 @@
         {{ cameraTypeDesc[row.cameraType] }}
       </el-table-column>
       <el-table-column label="S/N码" prop="snCode"></el-table-column>
-      <el-table-column label="所属架构" prop="deptName"></el-table-column>
+      <!-- <el-table-column label="所属架构" prop="deptName"></el-table-column> -->
       <el-table-column label="云容量使用情况" v-slot:default="{ row }">
         {{ row.usedSpaceStr }}
       </el-table-column>
@@ -96,13 +96,14 @@ const { state, queryReset, refresh, changPageCurrent, changPageSize, add } = use
 });
 
 const changeCameraHandler = async (camera: Camera) => {
-  (await (camera ? editCamera({ camera }) : bindCamera({}))) && (await refresh());
+  console.log(camera, 'changeCameraHandler');
+  (await (camera?.id ? editCamera({ camera }) : bindCamera({}))) && (await refresh());
 };
 
 const del = async (camera: Camera) => {
   if (
     await confirm(
-      "解绑相机,该相机拍摄的场景也将一并解绑,包括已添加到多元融合或项目场景也会移除。 (场景在云端存储,不删除)确定要解绑吗?"
+      "解绑相机,该相机拍摄的场景也将一并解绑,包括已添加到多元融合或项目场景也会移除。 (场景在云端存储,不删除)确定要解绑吗?"
     )
   ) {
     await delCamera(camera);

+ 1 - 1
src/view/case/addScenes.vue

@@ -18,7 +18,7 @@
         <el-table-column label="标题" v-slot:default="{ row }">
           {{ params.isSwmx ? row.modelTitle : row.name }}
         </el-table-column>
-        <el-table-column label="所属架构" prop="deptName"></el-table-column>
+        <!-- <el-table-column label="所属架构" prop="deptName"></el-table-column> -->
         <el-table-column label="原始数据格式" prop="modelDateType" v-if="params.isSwmx" />
         <el-table-column label="拍摄时间" prop="createTime" v-slot:default="{ row }">
           {{ row.createTime.substr(0, 16) }}

+ 9 - 14
src/view/case/moreMenu.vue

@@ -62,23 +62,18 @@ const menus = computed(() => {
         shareCase({ caseId: caseId, projectName: props.projectName || '' });
       },
     }] : []),
-    {
-      key: "download",
-      label: "下载",
-      permiss: 'edit',
-      onClick: async () => {
-        downloadCase({ caseId, title: props.title || '' });
-      },
-    },
+    // {
+    //   key: "download",
+    //   label: "下载",
+    //   permiss: 'edit',
+    //   onClick: async () => {
+    //     downloadCase({ caseId, title: props.title || '' });
+    //   },
+    // },
     ...(props.lastMenu || []).map((item) => ({
       ...item,
       onClick: () => item.onClick(caseId),
     })),
-  ].filter(item => {
-    if(appId === 'yunnan'){
-      return item.key !== 'download'
-    }
-    return true
-  });
+  ];
 });
 </script>

+ 1 - 3
src/view/case/newphotos/draggable.vue

@@ -141,9 +141,7 @@ function filterItem() {
   });
 }
 onMounted(() => {
-  if(props.parentId){
-    getList();
-  }
+  getList();
   // emit("update:list", props.list.value);
 });
 defineExpose({

+ 1 - 1
src/view/case/sceneList.vue

@@ -15,7 +15,7 @@
     <el-table-column label="拍摄/创建时间" prop="createTime" v-slot:default="{ row }">
       {{ row.createTime.substr(0, 16) }}
     </el-table-column>
-    <el-table-column label="所属架构" prop="deptName"></el-table-column>
+    <!-- <el-table-column label="所属架构" prop="deptName"></el-table-column> -->
     <el-table-column label="操作" v-slot:default="{ row }: { row: Scene }" width="200">
       <span
         class="oper-span"

+ 1 - 1
src/view/mediaLibrary/index.vue

@@ -75,7 +75,7 @@
       </el-table-column>
       <el-table-column label="操作" width="240px" v-slot:default="{ row }">
         <span class="oper-span" :class="{ disable: row.status == 1 }" v-if="row.useType != 'animation'" @click="downloadMediaHandler(row)" v-pdpath="'view'">下载</span>
-        <span class="oper-span" :class="{ disable: row.status == 1 }" v-if="row.useType != 'animation'" @click="downloadHashHandler(row)" v-pdpath="'view'">hash</span>
+        <!-- <span class="oper-span" :class="{ disable: row.status == 1 }" v-if="row.useType != 'animation'" @click="downloadHashHandler(row)" v-pdpath="'view'">hash</span> -->
         <span class="oper-span" :class="{ disable: row.status == 0 }" v-if="row.useType != 'animation'" @click="editMediaHandler(row)" v-pdpath="'view'">编辑</span>
         <span class="oper-span delBtn delete-oper" :class="{ disable: row.status === 1 }" v-if="row.useType != 'animation'" @click="confirmDelete(row)" v-pdpath="'view'"> 删除 </span>
       </el-table-column>

+ 2 - 2
src/view/newFireCase/dyManager/index.vue

@@ -1,9 +1,9 @@
 <template>
   <List :params="params">
     <template v-slot:header>
-      <el-form-item label="所属架构:" v-if="params.pagging.state.query.searchType === '2'">
+      <!-- <el-form-item label="所属架构:" v-if="params.pagging.state.query.searchType === '2'">
         <com-select v-model="params.pagging.state.query.deptId" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="标题:">
         <el-input v-model="params.keyword" placeholder="请输入"></el-input>
       </el-form-item>

+ 14 - 1
src/view/newFireCase/dyManager/sceneContent.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="body-head">
     <h3 style="visibility: hidden">场景管理</h3>
+    <el-button type="primary" v-if="pagging.state.query.searchType != '1'" v-pdpath="['edit']" @click="addUpload">上传</el-button>
   </div>
 
   <el-table
@@ -35,7 +36,7 @@
     <el-table-column label="状态" v-slot:default="{ row }: { row: QuoteScene }">
       {{ QuoteSceneStatusDesc[row.status] }}
     </el-table-column>
-    <el-table-column label="所属架构" prop="deptName"></el-table-column>
+    <!-- <el-table-column label="所属架构" prop="deptName"></el-table-column> -->
     <el-table-column label="操作" v-slot:default="{ row }: { row: QuoteScene }" width="420px">
         <span class="oper-span" v-if="pagging.state.query.searchType != '1' && row.status == 2" v-pdpath="['hash']" @click="downHash(row)">
           Hash
@@ -60,6 +61,11 @@
         </span>
     </el-table-column>
   </el-table>
+  <uploadScene
+    v-model:visible="uploadVisible"
+    :groupList="groupList"
+    @refresh="refreshList"
+  />
 </template>
 
 <script setup lang="ts">
@@ -81,10 +87,14 @@ import { sceneDownload } from "./quisk";
 import { sceneShare as openSceneShare } from "@/view/case/quisk";
 import { downSceneHash } from "@/request";
 import { SceneTypeDesc } from '@/constant/scene';
+import { ref } from "vue";
+import uploadScene from "./uploadScene.vue";
 import { transformSWToken } from "@/store/user";
 const testLaserUrl = import.meta.env.VITE_SWSS_URL;
 const LaserUrl = import.meta.env.VITE_FDKK_URL;
 
+// 上传媒体弹窗
+const uploadVisible = ref(false);
 const props = defineProps<{ pagging: ScenePagging }>();
 const delSceneHandler = async (scene: QuoteScene) => {
   if (await confirm("确定要删除当前场景吗?")) {
@@ -137,4 +147,7 @@ const openSceneShareDialog = async (scene: QuoteScene) => {
   const isObj = (scene as any).isObj ?? Number(![SceneType.SWSS, SceneType.SWYDSS].includes(scene.type as any));
   await openSceneShare({ num: scene.num, isObj });
 };
+const addUpload = () => {
+  uploadVisible.value = true;
+};
 </script>

+ 260 - 0
src/view/newFireCase/dyManager/uploadScene.vue

@@ -0,0 +1,260 @@
+<template>
+  <el-dialog
+    title="上传"
+    v-model="dialogVisible"
+    width="500px"
+    :before-close="handleClose"
+    :close-on-click-modal="false"
+  >
+    <div class="upload-container">
+      <!-- <div class="group-select">
+        <span style="margin-right: 10px"><span class="required">*</span>资源包类型</span>
+        <el-radio-group v-model="sourceType">
+        <el-radio value="orig">原始数据</el-radio>
+        <el-radio value="offline">离线包</el-radio>
+      </el-radio-group>
+      </div> -->
+      <div class="upload-area" style="display: flex;">
+        <p class="upload-title"><span class="required">*</span>文件</p>
+        <el-upload
+          class="upload-box"
+          action="/api/fusion/scene/uploadSceneFile"
+          :data="{sourceType}"
+          limit="1"
+          :headers="{Token: user.token}"
+          :accept="acceptType"
+          :on-change="handleFileChange"
+          :on-success="handleChange"
+          :on-remove="handleFileRemove"
+          :file-list="fileList"
+        >
+          <div class="upload-button">
+            <el-button type="primary">选择文件</el-button>
+          </div>
+        </el-upload>
+      </div>
+    </div>
+    
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="handleClose">取 消</el-button>
+        <el-button type="primary" :disabled="!filePath" @click="handleUpload">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ref, defineEmits, defineProps, computed } from 'vue';
+import { ElMessage } from 'element-plus';
+import { uploadNewMedia } from '@/store/mediaLibrary';
+import { user } from "@/store/user";
+import { uploadScene } from "@/store/scene";
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false
+  },
+  groupList: {
+    type: Array,
+    default: () => []
+  }
+});
+
+const selectedGroup = ref('');
+const sourceType = ref('orig');
+const filePath = ref(null);
+const emit = defineEmits(['update:visible', 'refresh']);
+const acceptType = computed(() => {
+  if (selectedGroup.value == 1) {
+    return '.obj,.glb,.zip';
+  } else {
+    return '.jpg,.png,.jpeg,.mp4,.wav,.mp3,.shp,.zip';
+  }
+});
+const dialogVisible = computed({
+  get: () => props.visible,
+  set: (val) => emit('update:visible', val)
+});
+
+const fileList = ref([]);
+const changeGroup = (value) => {
+  fileList.value = [];
+};
+// 处理文件变化
+const handleChange = (file, files) => {
+  if(file.data){
+    // 检查文件类型和大小
+    filePath.value = file.data?.url;
+  } else {
+    ElMessage.error(file.message || `不支持的文件类型`);
+    files.status = 'fail'
+    fileList.value = [];
+    filePath.value = null;
+  }
+};
+
+// 处理文件变化
+const handleFileChange = (file, files) => {
+  if(file){
+    // 检查文件类型和大小
+    const isValidFile = validateFile(file);
+    if (!isValidFile) {
+      // 如果文件无效,从文件列表中移除
+      const index = files.indexOf(file);
+      if (index !== -1) {
+        files.splice(index, 1);
+      }
+      return;
+    }
+  } else {
+    fileList.value = [];
+    filePath.value = null;
+  }
+};
+
+// 验证文件类型和大小
+const validateFile = (file) => {
+  if (!file || !file.raw) return false;
+  
+  const fileName = file.name || '';
+  const fileSize = file.size || 0;
+  const fileExt = fileName.split('.').pop().toLowerCase();
+  
+  // 检查文件类型
+    // 模型库组只允许 obj、glb、zip 格式
+    if (!['obj', 'glb', 'zip'].includes(fileExt)) {
+      ElMessage.error(`不支持的文件类型`);
+      return false;
+    }
+    
+    // 检查文件大小,不能超过 5MB
+    const maxSize = 5 * 1024 * 1024; // 5MB
+    if (fileSize > maxSize) {
+      ElMessage.error(`上传文件不能超过 5MB`);
+      return false;
+    }
+    return true;
+};
+
+// 处理文件删除
+const handleFileRemove = (file, fileList) => {
+  filePath.value = '';
+};
+
+// 关闭弹窗
+const handleClose = () => {
+  dialogVisible.value = false;
+  selectedGroup.value = '';
+  fileList.value = [];
+};
+
+// 上传文件
+const handleUpload = async () => {
+  if (!filePath.value) {
+    ElMessage.warning('请选择要上传的文件');
+    return;
+  }
+
+  try {
+    // 这里实现文件上传逻辑
+    const formData = new FormData();
+    formData.append('dictId', selectedGroup.value);
+    
+    fileList.value.forEach(file => {
+      formData.append('file', file.raw);
+    });
+    
+    await uploadScene({sourceType: sourceType.value, filePath: filePath.value});
+    
+    ElMessage.success('上传成功');
+    handleClose();
+    emit('refresh');
+  } catch (error) {
+    console.error('上传失败:', error);
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.upload-container {
+  padding: 0 20px;
+  max-height: 600px;
+  overflow-y: auto;
+  :deep(.el-upload-list__item-info){
+    min-width: 300px;
+    max-width: 360px;
+  }
+}
+
+.group-select {
+  margin-bottom: 20px;
+  display: flex;
+  align-items: center;
+  
+  .required {
+    color: #f56c6c;
+    margin-right: 5px;
+  }
+  
+  .el-select {
+    margin-left: 10px;
+    width: 200px;
+  }
+}
+
+.upload-area {
+  margin-bottom: 20px;
+  .upload-box{
+    width: calc(100% - 100px);
+  }
+  .upload-title{
+    line-height: 40px;
+    // padding-left: 10px;
+    min-width: 40px;
+    margin-left: 40px;
+    margin-right: 10px;;
+  }
+  .required{
+    color: #f56c6c;
+    margin-right: 5px;
+  }
+  .upload-button {
+    display: flex;
+    align-items: center;
+    
+    span {
+      margin-right: 10px;
+    }
+  }
+}
+
+.upload-tips {
+  .tip-item {
+    margin-bottom: 15px;
+    
+    .tip-number {
+      font-weight: bold;
+      margin-bottom: 5px;
+      display: inline-block;
+    }
+    
+    .tip-content {
+      margin-bottom: 5px;
+      color: #606266;
+      font-size: 14px;
+    }
+    
+    .tip-example {
+      margin-top: 5px;
+      border: 1px solid #ebeef5;
+      padding: 10px;
+      background-color: #f5f7fa;
+      
+      img {
+        max-width: 100%;
+      }
+    }
+  }
+}
+</style>

+ 1 - 1
src/view/newFireCase/meshManager/sceneContent.vue

@@ -35,7 +35,7 @@
     <el-table-column label="状态" v-slot:default="{ row }: { row: QuoteScene }">
       {{ QuoteSceneStatusDesc[row.status] }}
     </el-table-column>
-    <el-table-column label="所属架构" prop="deptName"></el-table-column>
+    <!-- <el-table-column label="所属架构" prop="deptName"></el-table-column> -->
     <el-table-column label="操作" v-slot:default="{ row }: { row: QuoteScene }" width="340px">
         <span class="oper-span" v-if="pagging.state.query.searchType != '1' && row.status == 2" v-pdpath="['hash']" @click="downHash(row)">
           Hash

+ 1 - 1
src/view/newFireCase/mix3dManager/sceneContent.vue

@@ -15,7 +15,7 @@
       </template>
     </el-table-column>
 
-    <el-table-column label="所属架构" prop="deptName"></el-table-column>
+    <!-- <el-table-column label="所属架构" prop="deptName"></el-table-column> -->
     <!-- 创建人需要获取新值 -->
     <el-table-column label="创建人" v-slot:default="{ row }: { row: QuoteScene }">
       {{ row.createUserName }}

+ 1 - 1
src/view/newFireCase/newdispatch/example.vue

@@ -49,7 +49,7 @@
         :width="240"
       >
         <EditMenuToDetail :caseId="row.caseId" :fromRoute="'criminal'" :row="row"></EditMenuToDetail>
-        <MoreMenu :caseId="row.caseId" :title="row.projectSn" v-if="state.query.searchType !== '1'" :projectName="row.caseTitle" :searchType="state.query.searchType" @copy="copy" />
+        <!-- <MoreMenu :caseId="row.caseId" :title="row.projectSn" v-if="state.query.searchType !== '1'" :projectName="row.caseTitle" :searchType="state.query.searchType" @copy="copy" /> -->
         <span
           class="oper-span"
           @click="del(row)"

+ 1 - 1
src/view/role/index.vue

@@ -36,7 +36,7 @@
           {{ scope.row.type == 0 ? "预设" : "自定义" }}
         </template>
       </el-table-column>
-      <el-table-column label="所属架构" prop="deptName"></el-table-column>
+      <!-- <el-table-column label="所属架构" prop="deptName"></el-table-column> -->
       <el-table-column label="创建人" prop="nickName"></el-table-column>
       <el-table-column label="创建时间" prop="createTime"></el-table-column>
       <el-table-column label="操作" v-slot:default="{ row }">

+ 8 - 8
src/view/user/edit.vue

@@ -7,7 +7,7 @@
         placeholder="请输入"
       ></el-input>
     </el-form-item>
-    <el-form-item
+    <!-- <el-form-item
       label="所属架构"
       class="mandatory"
       v-if="roleLevel !== RoleLevel.detachment2"
@@ -18,7 +18,7 @@
         @update:path="(val) => (deptPath = val)"
         :disabled="disabledChangeDept"
       />
-    </el-form-item>
+    </el-form-item> -->
     <el-form-item
       v-if="disabledChangeDept"
       class="tips"
@@ -80,15 +80,15 @@ import { ElMessage } from "element-plus";
 import { QuiskExpose } from "@/helper/mount";
 
 const props = defineProps<{ user?: UserInfo }>();
-
 const isAdd = computed(() => !props.user?.id);
 const bindUser = ref<UserInfo>(props.user ? { ...props.user } : ({} as UserInfo));
 const plainFlag = ref(false);
 const disabledChangeDept = ref(false);
 const roleOptions = ref<{ label: string; value: string }[]>([]);
 watchEffect(async () => {
+// bindUser.value.deptId = 2
   if (bindUser.value.deptId) {
-    roleOptions.value = (await getRolesByDetpId(bindUser.value.deptId)).map((item) => ({
+    roleOptions.value = (await getRolesByDetpId(bindUser.value.deptId || 2)).map((item) => ({
       label: item.roleName,
       value: item.id,
     }));
@@ -103,10 +103,10 @@ defineExpose<QuiskExpose>({
       ElMessage.error("请输入用户姓名");
       throw "请输入用户姓名";
     }
-    if (!bindUser.value.deptId) {
-      ElMessage.error("请选择用户所属架构");
-      throw "请选择用户所属架构";
-    }
+    // if (!bindUser.value.deptId) {
+    //   ElMessage.error("请选择用户所属架构");
+    //   throw "请选择用户所属架构";
+    // }
     if (!bindUser.value.roleId) {
       ElMessage.error("请选择用户角色");
       throw "请选择用户角色";

+ 6 - 4
src/view/user/index.vue

@@ -1,9 +1,9 @@
 <template>
   <com-head :options="head" v-model="state.query.searchType">
     <el-form label-width="84px">
-      <el-form-item label="所属架构:" v-if="state.query.searchType === '1'">
+      <!-- <el-form-item label="所属架构:" v-if="state.query.searchType === '1'">
         <com-company v-model="state.query.deptId" />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="用户账号:">
         <el-input v-model="state.query.userName" placeholder="请输入手机号"></el-input>
       </el-form-item>
@@ -43,7 +43,7 @@
       </el-table-column>
       <el-table-column label="用户账号(手机号)" prop="userName"></el-table-column>
       <el-table-column label="用户姓名" prop="nickName"></el-table-column>
-      <el-table-column label="所属架构" prop="deptName"></el-table-column>
+      <!-- <el-table-column label="所属架构" prop="deptName"></el-table-column> -->
       <el-table-column label="角色" prop="roleName"></el-table-column>
       <el-table-column label="状态" v-slot:default="{ row }">
         {{ row.status ? "启用" : "禁用" }}
@@ -146,7 +146,9 @@ const delInfo = async (row: UserInfo) => {
 };
 
 const addHandler = async () => {
-  (await addUser({})) && refresh();
+  (await addUser({
+    // user: user.value.info
+  })) && refresh();
 };
 
 const editHandler = async (row: UserInfo) => {

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

@@ -42,7 +42,7 @@
     <el-table-column label="上传时间" v-slot:default="{ row }: { row: ModelScene }">
       {{ getStatusText(row) }}
     </el-table-column>
-    <el-table-column label="所属架构" prop="deptName"></el-table-column>
+    <!-- <el-table-column label="所属架构" prop="deptName"></el-table-column> -->
     <el-table-column label="操作" v-slot:default="{ row }" width="350px">
       <template v-if="row.createStatus === ModelSceneStatus.SUCCESS">
         <span class="oper-span" @click="downOrigin(row)" v-if="row.fileNewName">

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

@@ -24,7 +24,7 @@
     <el-table-column label="状态" v-slot:default="{ row }: { row: QuoteScene }">
       {{ QuoteSceneStatusDesc[row.status] }}
     </el-table-column>
-    <el-table-column label="所属架构" prop="deptName"></el-table-column>
+    <!-- <el-table-column label="所属架构" prop="deptName"></el-table-column> -->
     <el-table-column
       label="操作"
       v-slot:default="{ row }: { row: QuoteScene }"