fix: 1

src/api/sys.ts

@@ -59,6 +59,7 @@ export type FireProject = {
   latlng?: string
   field1: string;
   field2: string;
+  caseNewName: string
   field3: string;
   field4: string;
 

src/layout/edit/scene-select.vue

@@ -29,7 +29,13 @@
           :rowSelection="rowSelection"
           :data-source="filterScenes"
           :pagination="false"
-        />
+        >
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.key === 'createStatus'">
+              {{ record.createStatus === 2 ? "转换中……" : "可用" }}
+            </template>
+          </template>
+        </Table>
       </div>
       <div style="padding: 1px" v-else>
         <Empty
@@ -83,13 +89,16 @@ const rowSelection: any = ref({
   onChange: (ids: number[]) => {
     selects.value = Array.from(new Set(ids.concat(selectIds.value)));
   },
-  getCheckboxProps: (record: Scene) => ({
-    disabled: selectIds.value.includes(record.modelId) || record.createStatus === 2,
-  }),
+  getCheckboxProps: (record: Scene) => {
+    console.error(record);
+    return {
+      disabled: selectIds.value.includes(record.modelId) || record.createStatus === 2,
+    };
+  },
 });
 const cloumns = [
   {
-    width: "400px",
+    width: "300px",
     title: "名称",
     dataIndex: "name",
     key: "name",
@@ -100,6 +109,11 @@ const cloumns = [
     key: "type",
   },
   {
+    title: "状态",
+    dataIndex: "createStatus",
+    key: "createStatus",
+  },
+  {
     title: "拍摄/创建时间",
     dataIndex: "createTime",
     key: "createTime",

src/views/fire/index.vue

@@ -33,19 +33,19 @@
       </p>
       <p>
         <span>全宗名称：</span>
-        {{ caseProject.tmProject.field2 }}
-      </p>
-      <p>
-        <span>勘验人姓名：</span>
-        {{ caseProject.tmProject.field3 }}
+        {{ caseProject.tmProject.caseNewName }}
       </p>
+      <!-- <p>
+        <span>勘验人员：</span>
+        {{ caseProject.tmProject.organizerUsers }}
+      </p> -->
       <p>
         <span>勘验人单位、职务：</span>
         {{ caseProject.tmProject.field4 }}
       </p>
 
       <p>
-        <span>承办单位：</span>
+        <span>勘验单位：</span>
         {{ caseProject.tmProject.organizerDeptName }}
       </p>
 

src/views/folder/index.vue

@@ -59,8 +59,11 @@ const preview = (floder: Floder) => {
   const ext = floder.filesUrl
     .substring(floder.filesUrl.lastIndexOf("."))
     .toLocaleLowerCase();
-    if ([".raw", ".dcm"].includes(ext)) {
-    window.open(`/xfile-viewer/index.html?file=${floder.filesUrl}&time=` + Date.now());
+  if ([".raw", ".dcm"].includes(ext)) {
+    window.open(
+      `/xfile-viewer/index.html?file=${floder.filesUrl}&name=${floder.filesTitle}&time=` +
+        Date.now()
+    );
     return;
   }
 

src/views/setting/index.vue

@@ -25,7 +25,7 @@
         <ui-icon
           ctrl
           :type="setting?.mapOpen ? 'eye-s' : 'eye-n'"
-          @click="changeBack(setting!.back, setting!.backType, setting!.openCompass, !setting!.mapOpen, setting!.mapType, setting!.scale)"
+          @click="changeBack(setting!.back, setting!.backType, setting!.openCompass, !setting!.mapOpen, setting!.mapType, {scale: setting!.scale!, rotate: setting?.rotate!})"
         />
       </template>
       <ui-group-option v-if="setting?.mapOpen">
@@ -37,7 +37,7 @@
             { label: '矢量地图', value: 'standard' },
           ]"
           :modelValue="setting!.mapType"
-          @update:modelValue="(e: string )=> changeBack(setting!.back, setting!.backType, setting!.openCompass, setting!.mapOpen, e, setting!.scale)"
+          @update:modelValue="(e: string )=> changeBack(setting!.back, setting!.backType, setting!.openCompass, setting!.mapOpen, e, {scale: setting!.scale!, rotate: setting?.rotate!})"
         />
       </ui-group-option>
     </ui-group>
@@ -104,6 +104,36 @@
         </div>
       </ui-group-option>
     </ui-group>
+    <Teleport
+      to="#layout-app"
+      v-if="
+        setting?.backType === SettingResourceType.bottomImage &&
+        $router.currentRoute.value.name === RoutesName.setting
+      "
+    >
+      <div class="slider-demo-block ant-modal-root">
+        缩放
+        <Slider
+          :value="setting!.scale || 1"
+          vertical
+          :min="0.1"
+          :step="0.01"
+          :max="3"
+          @update:value="(val: any) => changeBack(setting!.back, setting!.backType, setting!.openCompass, setting!.mapOpen, setting!.mapType, {scale: val, rotate: setting?.rotate!})"
+        />
+      </div>
+      <div class="slider-demo-block ant-modal-root" style="margin-right: 60px">
+        旋转
+        <Slider
+          :value="setting!.rotate || 0"
+          vertical
+          :min="0.1"
+          :step="0.01"
+          :max="360"
+          @update:value="(val: any) => changeBack(setting!.back, setting!.backType, setting!.openCompass, setting!.mapOpen, setting!.mapType, {scale: setting!.scale!, rotate: val})"
+        />
+      </div>
+    </Teleport>
   </RightFillPano>
 
   <div class="edit-add-type" v-if="addTemp">
@@ -140,31 +170,6 @@
       </div>
     </div>
   </div>
-
-  <Teleport to="#layout-app" v-if="setting?.backType === SettingResourceType.bottomImage">
-    <div class="slider-demo-block ant-modal-root">
-      缩放
-      <Slider
-        :value="setting!.scale || 1"
-        vertical
-        :min="0.1"
-        :step="0.01"
-        :max="3"
-        @update:value="(val: any) => changeBack(setting!.back, setting!.backType, setting!.openCompass, setting!.mapOpen, setting!.mapType, {scale: val, rotate: setting?.rotate!})"
-      />
-    </div>
-    <div class="slider-demo-block ant-modal-root" style="margin-right: 60px">
-      旋转
-      <Slider
-        :value="setting!.rotate || 0"
-        vertical
-        :min="0.1"
-        :step="0.01"
-        :max="360"
-        @update:value="(val: any) => changeBack(setting!.back, setting!.backType, setting!.openCompass, setting!.mapOpen, setting!.mapType, {scale: setting!.scale!, rotate: val})"
-      />
-    </div>
-  </Teleport>
 </template>
 
 <script lang="ts" setup>
@@ -192,6 +197,7 @@ import { SettingResource, addSettingResource } from "@/api/setting-resource";
 import { SettingResourceType } from "@/api/setting-resource";
 import { Dialog } from "bill/index";
 import { Slider } from "ant-design-vue";
+import { RoutesName } from "@/router";
 
 fetchSettingResources();