fix: 1

package.json

@@ -5,8 +5,8 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "vue-tsc --noEmit && npm run build-quisk",
-    "build-quisk": "vite build ./ fire && vite build ./ criminal && vite build ./ xmfire",
+    "build": "npm run build-quisk",
+    "build-quisk": "vite build ./ fire ",
     "preview": "vite preview"
   },
   "dependencies": {
@@ -36,4 +36,4 @@
     "vite": "^4.4.5",
     "vue-tsc": "^1.8.5"
   }
-}
+}

src/app/fire/store/fire.ts

@@ -24,6 +24,7 @@ export type Fire = {
   createTime: string;
   creatorDeptId: string;
   caseId: number;
+  mapShow: boolean;
   creatorId: string;
   creatorName: string;
   deptId: string;
@@ -37,6 +38,7 @@ export type Fire = {
   organizerUsers: string;
   projectAddress: string;
   latAndLong: string;
+  latlng: string;
   projectName: string;
   projectSite: string;
   projectSiteCode: string;
@@ -61,8 +63,7 @@ type FirePaggingParams = PaggingReq<Fire & { queryType: FirePaggingRoute }>;
 export const getFirePagging = async (params: FirePaggingParams) =>
   (await axios.get(getFireList, { params })).data as PaggingRes<Fire>;
 
-export const addFire = async (fire: Omit<Fire, "id">) =>
-  axios.post(insertFire, fire);
+export const addFire = async (fire: Omit<Fire, "id">) => axios.post(insertFire, fire);
 
 export const setFire = async (fire: Fire) => await axios.post(updateFire, fire);
 
@@ -84,13 +85,8 @@ export type FireLeaveMsg = {
   createTime: number;
 };
 
-export const getFireLeaveMsgPagging = async (
-  params: PaggingReq<{ projectId: string }>
-) =>
-  (await axios.get(getMessageList, { params }))
-    .data as PaggingRes<FireLeaveMsg>;
+export const getFireLeaveMsgPagging = async (params: PaggingReq<{ projectId: string }>) =>
+  (await axios.get(getMessageList, { params })).data as PaggingRes<FireLeaveMsg>;
 
-export const addFireLeaveMsg = (params: {
-  content: string;
-  projectId: string;
-}) => axios.post(insertMessage, params);
+export const addFireLeaveMsg = (params: { content: string; projectId: string }) =>
+  axios.post(insertMessage, params);

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

@@ -99,15 +99,9 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <!-- <el-form-item label="火灾原因" class="mandatory">
-          <el-cascader
-            style="width: 100%"
-            v-model="fireReason"
-            placeholder="火灾原因："
-            :options="reason"
-            :props="{ expandTrigger: 'hover' }"
-          />
-        </el-form-item> -->
+        <el-form-item label="大屏显示" class="mandatory">
+          <el-switch v-model="bindFire.mapShow" :disabled="!bindFire.latlng" />
+        </el-form-item>
       </el-col>
     </div>
   </el-form>
@@ -177,6 +171,7 @@ watchEffect(async (onCleanup) => {
     keyword.value = bindFire.value.projectAddress;
     console.log(e.data);
     bindFire.value.latAndLong = `${e.data.location.lat},${e.data.location.lng}`;
+    bindFire.value.latlng = `${e.data.location.lat},${e.data.location.lng}`;
     info.value = {
       lat: e.data.lat,
       lng: e.data.lng,
@@ -219,10 +214,11 @@ defineExpose<QuiskExpose>({
     } else if (!accidentDate) {
       ElMessage.error("勘验日期不能为空！");
       throw "勘验日期不能为空！";
-    } else if (!bindFire.value.fireReason || !bindFire.value.fireReason.trim()) {
-      ElMessage.error("火灾原因不能为空！");
-      throw "火灾原因不能为空！";
     }
+    // else if (!bindFire.value.fireReason || !bindFire.value.fireReason.trim()) {
+    //   ElMessage.error("火灾原因不能为空！");
+    //   throw "火灾原因不能为空！";
+    // }
 
     bindFire.value.accidentDate = dateFormat(accidentDate.value, "yyyy-MM-dd");
     bindFire.value.projectSiteCode = getCode(place, bindFire.value.projectSite);

src/request/config.ts

@@ -10,6 +10,7 @@ import {
   getModelSceneList,
   getRoleList,
   getSceneList,
+  getSysSetting,
   insertCaseFile,
   saveCaseFileInfo,
   sendUserMsg,
@@ -28,6 +29,7 @@ export const notLoginUrls = [
   userLogin,
   getCode,
   sendUserMsg,
+  getSysSetting,
   userReg,
   updatePsw,
   getCompanyList,