bill пре 1 година
родитељ
комит
3f6f1c9342

+ 2 - 2
src/app/fire/view/dispatch/leaveMsgList.vue

@@ -5,7 +5,7 @@
       ref="multipleTable"
       :data="state.table.rows"
       tooltip-effect="dark"
-      style="width: 100%; min-height: 540px; max-height: 540px"
+      style="width: 100%; max-height: 540px"
     >
       <el-table-column label="留言内容" prop="content" v-slot:default="{ row }">
         <el-tooltip
@@ -26,7 +26,7 @@
         label="创建日期"
         prop="createTime"
         v-slot:default="{ row }"
-        width="150"
+        width="180"
       >
         {{ format(row.createTime) }}
       </el-table-column>

+ 4 - 0
src/assets/style/public.scss

@@ -554,4 +554,8 @@ html .el-input-group__append button.el-button {
   color                    : var(--el-button-text-color) !important;
   border-top-left-radius   : 0 !important;
   border-bottom-left-radius: 0 !important;
+}
+
+.el-table__empty-block {
+  width: 100% !important;
 }

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

@@ -2,10 +2,12 @@
   <el-form ref="form" label-width="100px" class="camera-from">
     <el-form-item label="SN码:" class="mandatory">
       <el-input
+        v-if="!bindCamera.id || operateIsPermissionByPath('edit', 'sn')"
         :modelValue="bindCamera.snCode"
         placeholder="请输入相机底部SN码,如214D5RE2G8"
         @update:modelValue="(val: string) => (bindCamera.snCode = val.trim())"
-      ></el-input>
+      />
+      <span v-else>{{ bindCamera.snCode }}</span>
     </el-form-item>
     <el-form-item label="所属架构:" class="mandatory">
       <com-company v-model="bindCamera.deptId" hide-all />
@@ -25,6 +27,8 @@
 
 <script setup lang="ts">
 import comCompany from "@/components/company-select/index.vue";
+import { operateIsPermissionByPath } from "@/directive/permission";
+
 import { Camera, addCamera, editCamera } from "@/store/camera";
 import { UserInfo, getUsers } from "@/store/user";
 import { ref, watchEffect } from "vue";

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

@@ -37,6 +37,7 @@
           {{ state.pag.size * (state.pag.currentPage - 1) + $index + 1 }}
         </div>
       </el-table-column>
+      <el-table-column label="设备类型" prop="snCode"></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="云容量使用情况" v-slot:default="{ row }">

+ 18 - 3
src/view/case/sceneList.vue

@@ -5,7 +5,7 @@
 
   <el-table :data="list" tooltip-effect="dark" style="width: 100%" size="large">
     <el-table-column label="标题" v-slot:default="{ row }">
-      {{ row.type === SceneType.SWMX ? row.modelTitle : row.sceneName }}
+      {{ row.type === SceneType.SWMX ? row.modelTitle : row.name }}
     </el-table-column>
     <el-table-column label="类型" v-slot:default="{ row }: { row: Scene }">
       {{ SceneTypeDesc[row.type] }}
@@ -16,11 +16,12 @@
         class="oper-span"
         v-pdpath="['view']"
         @click="openSceneUrl(row, OpenType.query)"
+        v-if="hasSuccess(row)"
       >
         查看
       </span>
       <span
-        v-if="row.type !== SceneType.SWMX"
+        v-if="row.type !== SceneType.SWMX && hasSuccess(row)"
         class="oper-span"
         v-pdpath="['edit']"
         @click="openSceneUrl(row, OpenType.edit)"
@@ -39,7 +40,14 @@ import comDialog from "@/components/dialog/index.vue";
 import { SceneTypeDesc } from "@/constant/scene";
 import { confirm } from "@/helper/message";
 import { getCaseSceneList, getCaseScenes, replaceCaseScenes } from "@/store/case";
-import { Scene, SceneType } from "@/store/scene";
+import {
+  ModelScene,
+  ModelSceneStatus,
+  QuoteScene,
+  QuoteSceneStatus,
+  Scene,
+  SceneType,
+} from "@/store/scene";
 import { onMounted, ref } from "vue";
 import { openSceneUrl, OpenType } from "./help";
 
@@ -49,6 +57,13 @@ const props = defineProps<{
 }>();
 
 const list = ref<Scene[]>([]);
+const hasSuccess = (scene: Scene) => {
+  if (scene.type === SceneType.SWMX) {
+    return (scene as ModelScene).createStatus === ModelSceneStatus.SUCCESS;
+  } else {
+    return (scene as QuoteScene).status === QuoteSceneStatus.SUCCESS;
+  }
+};
 const refresh = async () => {
   list.value = await getCaseSceneList(props.caseId);
 };

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

@@ -8,7 +8,7 @@
       :show-file-list="false"
       :http-request="() => {}"
       :file-list="[]"
-      :class="{ dispable: percentage }"
+      :class="{ disabled: percentage }"
       :before-upload="uploadCheck"
     >
       <el-button v-pdpath="'sync'" type="primary">
@@ -122,6 +122,9 @@ const refreshStatus = (models: ModelScene[]) => {
     const { status, progress } = await getModelSceneStatus(scene);
     scene.createStatus = status;
     scene.progress = progress;
+    if (status == ModelSceneStatus.SUCCESS) {
+      props.pagging.refresh();
+    }
   });
   return Promise.all(refreshStatusAll);
 };

+ 4 - 2
src/view/vrmodel/sceneContent.vue

@@ -25,11 +25,12 @@
       {{ QuoteSceneStatusDesc[row.status] }}
     </el-table-column>
     <el-table-column label="所属架构" prop="deptName"></el-table-column>
-    <el-table-column label="操作" v-slot:default="{ row }">
+    <el-table-column label="操作" v-slot:default="{ row }: { row: QuoteScene }">
       <span
         class="oper-span"
         v-pdpath="['view']"
         @click="openSceneUrl(row, OpenType.query)"
+        v-if="row.status === QuoteSceneStatus.SUCCESS"
       >
         查看
       </span>
@@ -37,6 +38,7 @@
         class="oper-span"
         v-pdpath="['edit']"
         @click="openSceneUrl(row, OpenType.edit)"
+        v-if="row.status === QuoteSceneStatus.SUCCESS"
       >
         编辑
       </span>
@@ -53,7 +55,7 @@
 </template>
 
 <script setup lang="ts">
-import { QuoteScene } from "@/store/scene";
+import { QuoteScene, QuoteSceneStatus } from "@/store/scene";
 import { ScenePagging } from "./pagging";
 import { sceneDownload } from "../window";
 import { QuoteSceneStatusDesc, SceneTypePaths } from "@/constant/scene";

+ 1 - 1
vite.config.ts

@@ -3,7 +3,7 @@ import vue from "@vitejs/plugin-vue";
 import { resolve } from "path";
 import ElementPlus from "unplugin-element-plus/vite";
 
-let app = "criminal";
+let app = "fire";
 if (process.argv.length > 3) {
   app = process.argv[process.argv.length - 1].trim();
 }