bill 1 年之前
父節點
當前提交
318431720b

+ 41 - 9
src/app/fire/view/dispatch/editFire.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-form ref="form" label-width="94px" class="camera-from">
+  <el-form ref="form" label-width="106px" class="camera-from">
     <div class="def-select-map" ref="mapEl"></div>
     <div class="el-form-item">
       <el-col :span="12">
@@ -57,8 +57,12 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="勘验人员" class="mandatory" placeholder="请输入勘验人员">
-          <el-input v-model="bindFire.organizerUsers" maxlength="50" />
+        <el-form-item label="勘验人员" class="mandatory">
+          <el-input
+            v-model="bindFire.organizerUsers"
+            maxlength="50"
+            placeholder="请输入勘验人员"
+          />
         </el-form-item>
       </el-col>
     </div>
@@ -73,11 +77,11 @@
         </el-form-item>
       </el-col> -->
       <el-col :span="12">
-        <el-form-item label="单位、职务">
+        <el-form-item label="勘验人职务">
           <el-input
             v-model="bindFire.field4"
             maxlength="50"
-            placeholder="请输入勘验人单位、职务"
+            placeholder="请输入勘验人勘验人职务"
           />
         </el-form-item>
       </el-col>
@@ -145,13 +149,25 @@
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item label="勘验日期" class="mandatory" placeholder="请选择勘验日期">
+        <el-form-item
+          label="勘验起止时间"
+          class="mandatory"
+          placeholder="请选择勘验起止时间"
+        >
           <el-date-picker
+            v-model="f8"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            :disabled-date="(date) => date.getTime() > new Date().getTime()"
+          />
+          <!-- <el-date-picker
             type="date"
             v-model="f8"
             style="width: 100%"
             :disabled-date="(date) => date.getTime() > new Date().getTime()"
-          />
+          /> -->
         </el-form-item>
       </el-col>
     </div>
@@ -186,7 +202,20 @@ const projectSite = genCascaderValue(bindFire, "projectSite");
 const accidentDate = ref(
   bindFire.value.accidentDate ? new Date(bindFire.value.accidentDate) : new Date()
 );
-const f8 = ref(bindFire.value.field8 ? new Date(bindFire.value.field8) : new Date());
+
+const f8s = [new Date(), new Date()];
+if (bindFire.value.field8) {
+  const s = bindFire.value.field8.split("至");
+  console.log(s);
+  if (s.length > 1) {
+    f8s[0] = new Date(s[0]);
+    f8s[1] = new Date(s[1]);
+  } else {
+    f8s[0] = new Date(s[0]);
+  }
+}
+
+const f8 = ref(f8s);
 const keyword = ref(bindFire.value.projectAddress || "");
 const resultEl = ref<HTMLDivElement>();
 const searchAMap = ref<any>();
@@ -272,7 +301,10 @@ defineExpose<QuiskExpose>({
     }
 
     bindFire.value.accidentDate = dateFormat(accidentDate.value, "yyyy-MM-dd");
-    bindFire.value.field8 = dateFormat(f8.value, "yyyy-MM-dd");
+    bindFire.value.field8 =
+      dateFormat(f8.value[0], "yyyy-MM-dd") +
+      "至" +
+      dateFormat(f8.value[1], "yyyy-MM-dd");
     bindFire.value.projectSiteCode = getCode(place, bindFire.value.projectSite);
     bindFire.value.id
       ? await setFire(bindFire.value)

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

@@ -136,7 +136,7 @@
         </el-tooltip>
         <p class="tip" v-else>{{ row.field3 }}</p>
       </el-table-column>
-      <el-table-column label="勘验人单位、职务" prop="field4" v-slot:default="{ row }">
+      <el-table-column label="勘验人勘验人职务" prop="field4" v-slot:default="{ row }">
         <el-tooltip
           class="item"
           effect="dark"
@@ -151,7 +151,7 @@
 
       <el-table-column label="勘验单位" prop="organizerDeptName"></el-table-column>
       <el-table-column label="事故日期" prop="accidentDate"></el-table-column>
-      <el-table-column label="勘验日期" prop="field8"></el-table-column>
+      <el-table-column label="勘验起止时间" prop="field8"></el-table-column>
       <el-table-column label="火灾原因" prop="fireReason" v-slot:default="{ row }">
         <el-tooltip
           class="item"

+ 1 - 1
src/store/scene.ts

@@ -200,7 +200,7 @@ export const downQuoteSceneHash = async (scene: QuoteScene) => {
     params: { num: scene.num, ingoreRes: true },
     responseType: "text",
   })) as any;
-  await downHash(res, scene.sceneName);
+  await downHash(res, scene.title);
 };
 
 export type QueryDownloadQuoteSceneParams = PaggingReq<{

+ 8 - 30
src/view/case/caseFile.vue

@@ -1,10 +1,5 @@
 <template>
-  <com-head
-    :options="options"
-    v-model="currentTypeId"
-    notContent
-    v-if="options.length"
-  />
+  <com-head :options="options" v-model="currentTypeId" notContent v-if="options.length" />
 
   <div class="body-layer">
     <template v-if="currentTypeId === 2">
@@ -13,7 +8,7 @@
     <template v-else-if="currentTypeId === 3">
       <Records :caseId="caseId" :title="caseInfoData.caseTitle" />
     </template>
-    <template v-else-if="currentTypeId === 5">
+    <template v-else-if="currentTypeId === 4">
       <Manifest :caseId="caseId" :title="caseInfoData.caseTitle" />
     </template>
     <template v-else>
@@ -28,27 +23,17 @@
               创建{{ BoardTypeDesc[BoardType.scene] }}
             </el-button>
           </template>
-          <el-button type="primary" @click="addCaseFileHandler">
-            上传
-          </el-button>
+          <el-button type="primary" @click="addCaseFileHandler"> 上传 </el-button>
         </div>
       </div>
 
-      <el-table
-        :data="files"
-        tooltip-effect="dark"
-        style="width: 100%"
-        size="large"
-      >
+      <el-table :data="files" tooltip-effect="dark" style="width: 100%" size="large">
         <el-table-column label="序号" width="70" v-slot:default="{ $index }">
           <div style="text-align: center">
             {{ $index + 1 }}
           </div>
         </el-table-column>
-        <el-table-column
-          label="名称"
-          v-slot:default="{ row }: { row: CaseFile }"
-        >
+        <el-table-column label="名称" v-slot:default="{ row }: { row: CaseFile }">
           <span v-if="!inputCaseTitles.includes(row)">
             {{ row.filesTitle }}
             <el-icon class="edit-title" @click="inputCaseTitles.push(row)">
@@ -72,10 +57,7 @@
           </template>
         </el-table-column>
         <el-table-column label="创建时间" prop="createTime"></el-table-column>
-        <el-table-column
-          label="操作"
-          v-slot:default="{ row }: { row: CaseFile }"
-        >
+        <el-table-column label="操作" v-slot:default="{ row }: { row: CaseFile }">
           <span class="oper-span" @click="query(row)"> 查看 </span>
           <span
             class="oper-span"
@@ -129,9 +111,7 @@ const updateFileTitle = async (caseFile: CaseFile) => {
     return ElMessage.error("卷宗标题不能为空!");
   }
   await updateCaseInfo(caseFile);
-  inputCaseTitles.value = inputCaseTitles.value.filter(
-    (item) => item !== caseFile
-  );
+  inputCaseTitles.value = inputCaseTitles.value.filter((item) => item !== caseFile);
 };
 
 const currentTypeId = ref<number>();
@@ -154,9 +134,7 @@ const refresh = async () => {
 watchEffect(() => caseId.value && currentTypeId.value && refresh());
 
 const query = (file: CaseFile) => {
-  const ext = file.filesUrl
-    .substring(file.filesUrl.lastIndexOf("."))
-    .toLocaleLowerCase();
+  const ext = file.filesUrl.substring(file.filesUrl.lastIndexOf(".")).toLocaleLowerCase();
   if ([".raw", ".dcm"].includes(ext)) {
     window.open(
       `/xfile-viewer/index.html?file=${file.filesUrl}&name=${file.filesTitle}&time=` +

+ 1 - 1
src/view/case/records/index.vue

@@ -128,7 +128,7 @@
         />
       </div>
       <div class="line">
-        <span>勘验人员姓名、单位、职务(含技术职务):</span>
+        <span>勘验人员姓名、勘验人职务(含技术职务):</span>
         <el-input
           class="input"
           type="tel"