1

src/views/emergency/archive.vue

@@ -31,9 +31,9 @@
               </el-table-column>
               <!-- <el-table-column prop="filePath" label="文件存储路径" header-align="center" align="center"></el-table-column> -->
               <el-table-column prop="description" label="档案描述" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="creator" label="创建人" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="creatorName" label="创建人" header-align="center" align="center"></el-table-column>
               <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="updater" label="更新人" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="updaterName" label="更新人" header-align="center" align="center"></el-table-column>
               <el-table-column prop="updateDate" label="更新时间" header-align="center" align="center"></el-table-column>
               <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
             <el-table-column label="操作" fixed="right" header-align="center" align="center" width="150">

src/views/emergency/attendance-add-or-update.vue

@@ -101,6 +101,7 @@ const init = (id?: number) => {
   // 重置表单数据
   if (dataFormRef.value) {
     dataFormRef.value.resetFields();
+    imageUrl.value = '';
   }
 
   if (id) {

src/views/emergency/attendance.vue

@@ -39,9 +39,9 @@
                 </template>
               </el-table-column>
               <!-- <el-table-column prop="photoPath" label="照片存储路径" header-align="center" align="center"></el-table-column> -->
-              <el-table-column prop="creator" label="创建人" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="creatorName" label="创建人" header-align="center" align="center"></el-table-column>
               <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="updater" label="更新人" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="updaterName" label="更新人" header-align="center" align="center"></el-table-column>
               <el-table-column prop="updateDate" label="更新时间" header-align="center" align="center"></el-table-column>
               <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
             <el-table-column label="操作" fixed="right" header-align="center" align="center" width="150">

src/views/emergency/contacts.vue

@@ -25,20 +25,20 @@
         <el-button v-if="state.hasPermission('emergency:contacts:export')" type="info" @click="state.exportHandle()">导出</el-button>
       </el-form-item>
     </el-form>
-    <el-table v-loading="state.dataListLoading" :data="state.dataList" border @selection-change="state.dataListSelectionChangeHandle" style="width: 100%">
+    <el-table v-loading="state.dataListLoading" :data="state.dataList" border @selection-change="state.dataListSelectionChangeHandle" @sort-change="state.dataListSortChangeHandle" style="width: 100%">
       <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
       <el-table-column prop="id" label="序号" header-align="center" align="center" width="70">
         <template v-slot="scope">{{ scope.$index+1 }}</template>
       </el-table-column>
         <el-table-column prop="name" label="联系人姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gender" label="性别" header-align="center" align="center">
+        <el-table-column prop="mobile" label="联系电话" sortable="custom"  header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gender" label="性别" sortable="custom" header-align="center" align="center">
           <template v-slot="scope">
             {{ state.getDictLabel("gender", scope.row.gender) }}
           </template>
         </el-table-column>
         <el-table-column prop="creatorName" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createDate" label="创建时间" sortable="custom" header-align="center" align="center"></el-table-column>
         <el-table-column prop="updaterName" label="更新人" header-align="center" align="center"></el-table-column>
         <el-table-column prop="updateDate" label="更新时间" header-align="center" align="center"></el-table-column>
         <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>

src/views/emergency/faultdevice.vue

@@ -96,7 +96,7 @@ const reviewHandle = (id?: string) => {
     type: "warning"
   })
   .then(() => {
-      baseService.put("/emergency/schedule/review", reviewData).then((res) => {
+      baseService.put("/emergency/faultdevice/review", reviewData).then((res) => {
         ElMessage.success({
           message: "审阅成功",
           duration: 500,

src/views/emergency/schedule.vue

@@ -1,48 +1,52 @@
 <template>
   <div class="mod-demo__schedule">
+    <div class="form-container">
     <el-form :inline="true" :model="state.dataForm" @keyup.enter="state.getDataList()">
       <el-form-item>
         <el-input v-model="state.dataForm.schedule_name" placeholder="排班表名称" clearable></el-input>
       </el-form-item>
-      <el-form-item>
+      <el-form-item >
         <el-date-picker
           v-model="state.dataForm.period_start"
           type="date"        
           placeholder="开始日期"
           value-format="YYYY-MM-DD" 
-          style="width: 100%;"
           clearable
         ></el-date-picker>
       </el-form-item>
-      <el-form-item>
+      <el-form-item >
         <el-date-picker
           v-model="state.dataForm.period_end"
           type="date"        
           placeholder="结束日期"
           value-format="YYYY-MM-DD" 
-          style="width: 100%;"
           clearable
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="state.dataForm.status" placeholder="排班确认状态" clearable>
+        <el-select v-model="state.dataForm.status" placeholder="排班确认状态"  clearable>
           <el-option :label="item.dictLabel" :value="item.dictValue" v-for="item in state.getDictByKey('scheduleStatus')"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
         <el-button @click="state.getDataList()">查询</el-button>
       </el-form-item>
+      <el-form-item>
       <el-form-item>
         <el-button v-if="state.hasPermission('emergency:schedule:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
       </el-form-item>
       <el-form-item>
         <el-button v-if="state.hasPermission('emergency:schedule:delete')" type="danger" @click="state.deleteHandle()">删除</el-button>
       </el-form-item>
-      <!-- 审阅 -->
        <el-form-item>
         <el-button v-if="state.hasPermission('emergency:schedule:review')" type="danger" @click="reviewHandle()">审阅</el-button>
       </el-form-item>
+      <el-form-item>
+        <el-button v-if="state.hasPermission('emergency:inspection:export')" type="info" @click="state.exportHandle()">导出</el-button>
+      </el-form-item>
+    </el-form-item>
     </el-form>
+  </div>
     <el-table v-loading="state.dataListLoading" :data="state.dataList" border @selection-change="state.dataListSelectionChangeHandle" style="width: 100%">
       <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
               <!-- <el-table-column prop="id" label="排班ID" header-align="center" align="center"></el-table-column> -->
@@ -58,9 +62,9 @@
                   {{ state.getDictLabel("scheduleStatus", scope.row.status) }}
                 </template>
               </el-table-column>
-              <el-table-column prop="creator" label="创建人" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="creatorName" label="创建人" header-align="center" align="center"></el-table-column>
               <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-              <el-table-column prop="updater" label="更新人" header-align="center" align="center"></el-table-column>
+              <el-table-column prop="updaterName" label="更新人" header-align="center" align="center"></el-table-column>
               <el-table-column prop="updateDate" label="更新时间" header-align="center" align="center"></el-table-column>
               <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
             <el-table-column label="操作" fixed="right" header-align="center" align="center" width="180">