fix: 1

src/app/fire/view/dispatch/editFire.vue

@@ -34,7 +34,7 @@
       </el-input>
       <div class="search-result" v-show="!info" ref="resultEl"></div>
     </el-form-item>
-    <el-form-item label="勘验地址" class="mandatory">
+    <el-form-item label="勘验地址">
       <el-input v-model="bindFire.field1" maxlength="50" placeholder="请输入勘验地址" />
     </el-form-item>
     <el-form-item label="起火场所" class="mandatory">
@@ -46,7 +46,7 @@
         :props="{ expandTrigger: 'hover' }"
       />
     </el-form-item>
-    <el-form-item label="全宗名称" class="mandatory">
+    <el-form-item label="全宗名称">
       <el-input v-model="bindFire.field2" maxlength="50" placeholder="请输入全宗名称" />
     </el-form-item>
 
@@ -64,7 +64,7 @@
     </div>
     <div class="el-form-item">
       <el-col :span="12">
-        <el-form-item label="勘验人姓名" class="mandatory">
+        <el-form-item label="勘验人姓名">
           <el-input
             v-model="bindFire.field3"
             maxlength="18"
@@ -73,7 +73,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="单位、职务" class="mandatory">
+        <el-form-item label="单位、职务">
           <el-input
             v-model="bindFire.field4"
             maxlength="50"
@@ -103,7 +103,7 @@
 
     <div class="el-form-item">
       <el-col :span="12">
-        <el-form-item label="事件分类" class="mandatory">
+        <el-form-item label="事件分类">
           <el-input
             v-model="bindFire.field5"
             maxlength="18"
@@ -112,7 +112,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="分类登记" class="mandatory">
+        <el-form-item label="分类登记">
           <el-input
             v-model="bindFire.field6"
             maxlength="50"
@@ -124,7 +124,7 @@
 
     <div class="el-form-item">
       <el-col :span="12">
-        <el-form-item label="勘验信息" class="mandatory">
+        <el-form-item label="勘验信息">
           <el-input
             v-model="bindFire.field7"
             placeholder="请输入天气情况等标准化勘验信息"

src/app/fire/view/dispatch/header.vue

@@ -26,13 +26,6 @@
         ></el-cascader>
       </el-form-item>
 
-      <el-form-item label="勘验信息：">
-        <el-input
-          v-model="pagging.state.query.field7"
-          placeholder="请输入"
-        ></el-input>
-      </el-form-item>
-      
       <el-form-item label="承办单位：">
         <com-company v-model="pagging.state.query.deptId" />
       </el-form-item>

src/app/fire/view/dispatch/pagging.ts

@@ -43,6 +43,7 @@ export const useFirePagging = () => {
   watch(
     () => [pagging.state.query.queryType, isTeached.value, isRecycle.value],
     () => {
+      console.log(isRecycle.value);
       if (isRecycle.value) {
         pagging.state.query.queryType = FirePaggingRoute.fire;
         pagging.state.query.isDelete = 2;
@@ -53,13 +54,14 @@ export const useFirePagging = () => {
           : FirePaggingRoute.fire;
       }
     },
-    { flush: "sync", immediate: true }
+    { flush: "post", immediate: true }
   );
 
   const params = [{ ...pagging.state.query }, { ...pagging.state.query }];
   watchEffect(
     () => {
       pagging.state.query = params[isTeached.value ? 0 : 1];
+      // pagging.state.query = params[isRecycle.value ? 0 : 1];
     },
     { flush: "sync" }
   );

src/store/scene.ts

@@ -135,7 +135,13 @@ export const uploadModelScene = (
     url: uploadModel,
     data: { file },
     onUploadProgress(event: any) {
-      progressCallback(Math.round((event.loaded / event.total) * 100) || 0);
+      const p = Math.round((event.loaded / event.total) * 100);
+      console.log(p);
+      if (p === 100) {
+        progressCallback(0);
+      } else {
+        progressCallback(p || 0);
+      }
     },
   });
 

src/view/setting/index.vue

@@ -4,7 +4,7 @@
   <div class="body-layer" style="padding: 24px" v-loading="loading">
     <el-form :model="form" label-width="auto" style="max-width: 600px">
       <el-form-item label="系统标题">
-        <el-input v-model="form.name" />
+        <el-input v-model="form.name" placeholder="请输入系统标题" />
       </el-form-item>
       <el-form-item label="系统主题色">
         <el-radio-group v-model="form.color">

src/view/vrmodel/modelContent.vue

@@ -5,7 +5,7 @@
     <el-tooltip
       class="item"
       effect="dark"
-      :content="`请上传${format}（支持obj/ply/las/osgb/b3dm格式的数据），大小在${size}以内 `"
+      :content="`请上传${format}（支持obj/ply/las/laz/osgb/b3dm格式的数据），大小在${size}以内 `"
       placement="bottom-start"
       ><el-upload
         class="upload-demo"

vite.config.ts

@@ -90,7 +90,7 @@ export default defineConfig({
           ? "https://uat-laser.4dkankan.com/uat"
           : "https://laser.4dkankan.com",
         changeOrigin: true,
-        rewrite: (path) => path.replace(new RegExp(`^/swss`), ""),
+        rewrite: (path) => path.replace(new RegExp(`^/fdkk`), "/fdkk"),
       },
     },
   },