bill 1 سال پیش
والد
کامیت
25f9997b3c
5فایلهای تغییر یافته به همراه28 افزوده شده و 36 حذف شده
  1. 1 1
      src/app/fire/view/dispatch/list.vue
  2. 1 0
      src/constant/scene.ts
  3. 4 1
      src/store/scene.ts
  4. 1 1
      src/view/organization/index.vue
  5. 21 33
      src/view/vrmodel/modelContent.vue

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

@@ -89,7 +89,7 @@
         {{ fireStatusDesc[row.status as FireStatus] }}
       </el-table-column>
       <slot name="appendColumn" />
-      <el-table-column label="操作" v-slot:default="{ row }" :width="220">
+      <el-table-column label="操作" v-slot:default="{ row }" :width="220" fixed="right">
         <slot name="rowCtrl" :row="row" />
       </el-table-column>
     </el-table>

+ 1 - 0
src/constant/scene.ts

@@ -51,6 +51,7 @@ export const ModelSceneStatusDesc: { [key in ModelSceneStatus]: string } = {
   [ModelSceneStatus.CANCEL]: "已取消",
   [ModelSceneStatus.ERR]: "上传失败",
   [ModelSceneStatus.RUN]: "上传中",
+  [ModelSceneStatus.REV]: "转换中",
   [ModelSceneStatus.SUCCESS]: "成功",
 };
 

+ 4 - 1
src/store/scene.ts

@@ -91,6 +91,7 @@ export enum SceneType {
 export enum ModelSceneStatus {
   ERR = -1,
   RUN = 0,
+  REV = 2,
   SUCCESS = 1,
   CANCEL = -2,
 }
@@ -176,7 +177,7 @@ type ScenePaggingParams = PaggingReq<
   }
 >;
 export const getScenePagging = async (params: ScenePaggingParams) => {
-  return (
+  const data = (
     await axios.get(
       params.type === SceneType.SWMX ? getModelSceneList : getSceneList,
       {
@@ -184,6 +185,8 @@ export const getScenePagging = async (params: ScenePaggingParams) => {
       }
     )
   ).data as PaggingRes<Scene>;
+
+  return data;
 };
 
 export const delQuoteScene = (scene: QuoteScene) =>

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

@@ -173,7 +173,7 @@ onMounted(refresh);
         font-size: 14px;
         padding-right: 8px;
         .butList {
-          width: 140px;
+          width: 200px;
           a {
             margin: 0 8px;
           }

+ 21 - 33
src/view/vrmodel/modelContent.vue

@@ -44,44 +44,32 @@
     </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">
+          下载原始资源
+        </span>
+        <span class="oper-span" @click="downHash(row)"> Hash </span>
+        <span class="oper-span" @click="copyHanlder(row)"> 复制 </span>
+        <span class="oper-span" v-pdpath="['edit']" @click="editHanlder(row)">
+          修改
+        </span>
+        <span
+          class="oper-span"
+          v-pdpath="['view']"
+          @click="openSceneUrl(row, OpenType.query)"
+        >
+          查看
+        </span>
+      </template>
       <span
+        v-else-if="row.createStatus === ModelSceneStatus.REV"
         class="oper-span"
-        @click="downOrigin(row)"
-        v-if="row.createStatus === ModelSceneStatus.SUCCESS && row.fileNewName"
+        v-pdpath="['viewaaa']"
       >
-        下载原始资源
-      </span>
-      <span
-        class="oper-span"
-        @click="downHash(row)"
-        v-if="row.createStatus === ModelSceneStatus.SUCCESS"
-      >
-        Hash
-      </span>
-      <span
-        class="oper-span"
-        @click="copyHanlder(row)"
-        v-if="row.createStatus === ModelSceneStatus.SUCCESS"
-      >
-        复制
-      </span>
-      <span
-        class="oper-span"
-        v-pdpath="['edit']"
-        @click="editHanlder(row)"
-        v-if="row.createStatus === ModelSceneStatus.SUCCESS"
-      >
-        修改
-      </span>
-      <span
-        class="oper-span"
-        v-pdpath="['view']"
-        @click="openSceneUrl(row, OpenType.query)"
-        v-if="row.createStatus === ModelSceneStatus.SUCCESS"
-      >
-        查看
+        模型转换中…
       </span>
       <span
+        v-else
         class="oper-span delBtn"
         v-pdscene="row"
         @click="delOrCancel(row)"