附件bug fix

ui/src/views/pssr/airtight/index.vue

@@ -512,12 +512,23 @@
 </template>
 
 <script>
-import { listAirtight, getAirtight, delAirtight, addAirtight, updateAirtight, exportAirtight, importTemplate, handleConfirmAirtight, handleTurnDownAirtight } from "@/api/pssr/airtight";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addAirtight,
+  delAirtight,
+  exportAirtight,
+  getAirtight,
+  handleConfirmAirtight,
+  handleTurnDownAirtight,
+  importTemplate,
+  listAirtight,
+  updateAirtight
+} from "@/api/pssr/airtight";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 
 export default {

ui/src/views/pssr/analyzer/index.vue

@@ -483,12 +483,23 @@
 </template>
 
 <script>
-import { listAnalyzer, getAnalyzer, delAnalyzer, addAnalyzer, updateAnalyzer, exportAnalyzer, importTemplate, handleConfirmAnalyzer, handleTurnDownAnalyzer } from "@/api/pssr/analyzer";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addAnalyzer,
+  delAnalyzer,
+  exportAnalyzer,
+  getAnalyzer,
+  handleConfirmAnalyzer,
+  handleTurnDownAnalyzer,
+  importTemplate,
+  listAnalyzer,
+  updateAnalyzer
+} from "@/api/pssr/analyzer";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 
 export default {

ui/src/views/pssr/approve/index.vue

@@ -314,9 +314,17 @@
 </template>
 
 <script>
-import { listApprove, getApprove, delApprove, addApprove, updateApprove, exportApprove, importTemplate} from "@/api/pssr/approve";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addApprove,
+  delApprove,
+  exportApprove,
+  getApprove,
+  importTemplate,
+  listApprove,
+  updateApprove
+} from "@/api/pssr/approve";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 

ui/src/views/pssr/blind/index.vue

@@ -411,6 +411,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 
 export default {
   dicts: ['pssr_approve_status'],

ui/src/views/pssr/circuit/index.vue

@@ -524,9 +524,19 @@
 </template>
 
 <script>
-import { listCircuit, getCircuit, delCircuit, addCircuit, updateCircuit, exportCircuit, importTemplate, handleConfirmCircuit, handleTurnDownCircuit } from "@/api/pssr/circuit";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addCircuit,
+  delCircuit,
+  exportCircuit,
+  getCircuit,
+  handleConfirmCircuit,
+  handleTurnDownCircuit,
+  importTemplate,
+  listCircuit,
+  updateCircuit
+} from "@/api/pssr/circuit";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";

ui/src/views/pssr/cleaning/index.vue

@@ -2,22 +2,22 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <!--<el-form-item label="从表id" prop="subId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.subId"-->
-          <!--placeholder="请输入从表id"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
+      <!--<el-input-->
+      <!--v-model="queryParams.subId"-->
+      <!--placeholder="请输入从表id"-->
+      <!--clearable-->
+      <!--size="small"-->
+      <!--@keyup.enter.native="handleQuery"-->
+      <!--/>-->
       <!--</el-form-item>-->
       <!--<el-form-item label="审批id" prop="approveId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.approveId"-->
-          <!--placeholder="请输入审批id"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
+      <!--<el-input-->
+      <!--v-model="queryParams.approveId"-->
+      <!--placeholder="请输入审批id"-->
+      <!--clearable-->
+      <!--size="small"-->
+      <!--@keyup.enter.native="handleQuery"-->
+      <!--/>-->
       <!--</el-form-item>-->
       <el-form-item label="单元号" prop="unit">
         <el-input
@@ -28,24 +28,24 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="设备位号" prop="devNo">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.devNo"-->
-<!--          placeholder="请输入设备位号"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="编号" prop="serialNumber">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.serialNumber"-->
-<!--          placeholder="请输入编号"-->
-<!--          clearable-->
-<!--          size="small"-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="设备位号" prop="devNo">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.devNo"-->
+      <!--          placeholder="请输入设备位号"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="编号" prop="serialNumber">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.serialNumber"-->
+      <!--          placeholder="请输入编号"-->
+      <!--          clearable-->
+      <!--          size="small"-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item label="检查内容" prop="checkContent">
         <el-input
           v-model="queryParams.checkContent"
@@ -84,54 +84,54 @@
       </el-form-item>
       <el-form-item label="确认时间" prop="confirmationDate">
         <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.confirmationDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择确认时间">
+                        v-model="queryParams.confirmationDate"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择确认时间">
         </el-date-picker>
       </el-form-item>
       <!--<el-form-item label="创建人" prop="createrCode">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.createrCode"-->
-          <!--placeholder="请输入创建人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
+      <!--<el-input-->
+      <!--v-model="queryParams.createrCode"-->
+      <!--placeholder="请输入创建人"-->
+      <!--clearable-->
+      <!--size="small"-->
+      <!--@keyup.enter.native="handleQuery"-->
+      <!--/>-->
       <!--</el-form-item>-->
       <!--<el-form-item label="创建时间" prop="createdate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.createdate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择创建时间">-->
-        <!--</el-date-picker>-->
+      <!--<el-date-picker clearable size="small" style="width: 200px"-->
+      <!--v-model="queryParams.createdate"-->
+      <!--type="date"-->
+      <!--value-format="yyyy-MM-dd"-->
+      <!--placeholder="选择创建时间">-->
+      <!--</el-date-picker>-->
       <!--</el-form-item>-->
       <!--<el-form-item label="修改人" prop="updaterCode">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.updaterCode"-->
-          <!--placeholder="请输入修改人"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
+      <!--<el-input-->
+      <!--v-model="queryParams.updaterCode"-->
+      <!--placeholder="请输入修改人"-->
+      <!--clearable-->
+      <!--size="small"-->
+      <!--@keyup.enter.native="handleQuery"-->
+      <!--/>-->
       <!--</el-form-item>-->
       <!--<el-form-item label="修改时间" prop="updatedate">-->
-        <!--<el-date-picker clearable size="small" style="width: 200px"-->
-          <!--v-model="queryParams.updatedate"-->
-          <!--type="date"-->
-          <!--value-format="yyyy-MM-dd"-->
-          <!--placeholder="选择修改时间">-->
-        <!--</el-date-picker>-->
+      <!--<el-date-picker clearable size="small" style="width: 200px"-->
+      <!--v-model="queryParams.updatedate"-->
+      <!--type="date"-->
+      <!--value-format="yyyy-MM-dd"-->
+      <!--placeholder="选择修改时间">-->
+      <!--</el-date-picker>-->
       <!--</el-form-item>-->
       <!--<el-form-item label="部门编号" prop="deptId">-->
-        <!--<el-input-->
-          <!--v-model="queryParams.deptId"-->
-          <!--placeholder="请输入部门编号"-->
-          <!--clearable-->
-          <!--size="small"-->
-          <!--@keyup.enter.native="handleQuery"-->
-        <!--/>-->
+      <!--<el-input-->
+      <!--v-model="queryParams.deptId"-->
+      <!--placeholder="请输入部门编号"-->
+      <!--clearable-->
+      <!--size="small"-->
+      <!--@keyup.enter.native="handleQuery"-->
+      <!--/>-->
       <!--</el-form-item>-->
       <el-form-item label="备注" prop="remarks">
         <el-input
@@ -157,7 +157,8 @@
           @click="handleAdd"
           v-hasPermi="['pssr:cleaning:add']"
           v-if="isApprove==0"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -168,7 +169,8 @@
           @click="handleUpdate"
           v-hasPermi="['pssr:cleaning:edit']"
           v-if="isApprove==0"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -179,18 +181,20 @@
           @click="handleDelete"
           v-hasPermi="['pssr:cleaning:remove']"
           v-if="isApprove==0"
-        >删除</el-button>
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['pssr:cleaning:edit']"
+          v-if="isApprove==0"
+        >导入
+        </el-button>
       </el-col>
-        <el-col :span="1.5">
-            <el-button
-                    type="info"
-                    icon="el-icon-upload2"
-                    size="mini"
-                    @click="handleImport"
-                    v-hasPermi="['pssr:cleaning:edit']"
-                    v-if="isApprove==0"
-            >导入</el-button>
-        </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -199,7 +203,8 @@
           @click="handleExport"
           v-hasPermi="['pssr:cleaning:export']"
           v-if="isApprove==0"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -235,15 +240,16 @@
         >驳回
         </el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
       <H2>设备清洁度检查表</H2>填写要求：检查设备清洁度符合检查内容要求的在检查结果中打“✔”，不符合打“×”。<br>如果检查不符合，并联系相关责任人按照该条检查内容的要求进行整改。
     </div>
 
-    <el-table v-loading="loading" :data="cleaningList" @selection-change="handleSelectionChange" :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="cleaningList" @selection-change="handleSelectionChange" :height="clientHeight"
+              border>
+      <el-table-column type="selection" width="55" align="center"/>
       <!--<el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>-->
       <!--<el-table-column label="从表id" align="center" prop="subId" :show-overflow-tooltip="true"/>-->
       <!--<el-table-column label="审批id" align="center" prop="approveId" :show-overflow-tooltip="true"/>-->
@@ -277,19 +283,20 @@
       </el-table-column>
       <!--<el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>-->
       <!--<el-table-column label="创建时间" align="center" prop="createdate" width="100">-->
-        <!--<template slot-scope="scope">-->
-          <!--<span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>-->
-        <!--</template>-->
+      <!--<template slot-scope="scope">-->
+      <!--<span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>-->
+      <!--</template>-->
       <!--</el-table-column>-->
       <!--<el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>-->
       <!--<el-table-column label="修改时间" align="center" prop="updatedate" width="100">-->
-        <!--<template slot-scope="scope">-->
-          <!--<span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>-->
-        <!--</template>-->
+      <!--<template slot-scope="scope">-->
+      <!--<span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>-->
+      <!--</template>-->
       <!--</el-table-column>-->
       <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width" v-if="isApprove==0">
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width"
+                       v-if="isApprove==0">
         <template slot-scope="scope">
 
           <el-button
@@ -306,14 +313,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['pssr:cleaning:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['pssr:cleaning:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -330,25 +339,19 @@
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <!--<el-form-item label="从表id" prop="subId">-->
-          <!--<el-input v-model="form.subId" placeholder="请输入从表id" />-->
+        <!--<el-input v-model="form.subId" placeholder="请输入从表id" />-->
         <!--</el-form-item>-->
         <!--<el-form-item label="审批id" prop="approveId">-->
-          <!--<el-input v-model="form.approveId" placeholder="请输入审批id" />-->
+        <!--<el-input v-model="form.approveId" placeholder="请输入审批id" />-->
         <!--</el-form-item>-->
         <el-form-item label="单元号" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单元号" />
-        </el-form-item>
-        <el-form-item label="设备位号" prop="devNo">
-          <el-input v-model="form.devNo" placeholder="请输入设备位号" />
-        </el-form-item>
-        <el-form-item label="编号" prop="serialNumber">
-          <el-input v-model="form.serialNumber" placeholder="请输入编号" />
+          <el-input v-model="form.unit" placeholder="请输入单元号"/>
         </el-form-item>
         <el-form-item label="检查内容">
           <el-input type="textarea" v-model="form.checkContent" :min-height="192"/>
         </el-form-item>
         <el-form-item label="检查结果" prop="checkResult">
-          <el-input v-model="form.checkResult" placeholder="请输入检查结果" />
+          <el-input v-model="form.checkResult" placeholder="请输入检查结果"/>
         </el-form-item>
         <el-form-item label="确认人1" prop="confirm1">
           <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
@@ -370,82 +373,84 @@
         </el-form-item>
         <el-form-item label="确认时间" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
-            v-model="form.confirmationDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择确认时间">
+                          v-model="form.confirmationDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="选择确认时间">
           </el-date-picker>
         </el-form-item>
         <!--<el-form-item label="删除状态" prop="delFlag">-->
-          <!--<el-input v-model="form.delFlag" placeholder="请输入删除状态" />-->
+        <!--<el-input v-model="form.delFlag" placeholder="请输入删除状态" />-->
         <!--</el-form-item>-->
         <!--<el-form-item label="创建人" prop="createrCode">-->
-          <!--<el-input v-model="form.createrCode" placeholder="请输入创建人" />-->
+        <!--<el-input v-model="form.createrCode" placeholder="请输入创建人" />-->
         <!--</el-form-item>-->
         <!--<el-form-item label="创建时间" prop="createdate">-->
-          <!--<el-date-picker clearable size="small" style="width: 200px"-->
-            <!--v-model="form.createdate"-->
-            <!--type="date"-->
-            <!--value-format="yyyy-MM-dd"-->
-            <!--placeholder="选择创建时间">-->
-          <!--</el-date-picker>-->
+        <!--<el-date-picker clearable size="small" style="width: 200px"-->
+        <!--v-model="form.createdate"-->
+        <!--type="date"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--placeholder="选择创建时间">-->
+        <!--</el-date-picker>-->
         <!--</el-form-item>-->
         <!--<el-form-item label="修改人" prop="updaterCode">-->
-          <!--<el-input v-model="form.updaterCode" placeholder="请输入修改人" />-->
+        <!--<el-input v-model="form.updaterCode" placeholder="请输入修改人" />-->
         <!--</el-form-item>-->
         <!--<el-form-item label="修改时间" prop="updatedate">-->
-          <!--<el-date-picker clearable size="small" style="width: 200px"-->
-            <!--v-model="form.updatedate"-->
-            <!--type="date"-->
-            <!--value-format="yyyy-MM-dd"-->
-            <!--placeholder="选择修改时间">-->
-          <!--</el-date-picker>-->
+        <!--<el-date-picker clearable size="small" style="width: 200px"-->
+        <!--v-model="form.updatedate"-->
+        <!--type="date"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--placeholder="选择修改时间">-->
+        <!--</el-date-picker>-->
         <!--</el-form-item>-->
         <!--<el-form-item label="部门编号" prop="deptId">-->
-          <!--<el-input v-model="form.deptId" placeholder="请输入部门编号" />-->
+        <!--<el-input v-model="form.deptId" placeholder="请输入部门编号" />-->
         <!--</el-form-item>-->
         <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注" />
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
-          <!--<el-form-item label="归属部门" prop="deptId">-->
-              <!--<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />-->
-          <!--</el-form-item>-->
+        <!--<el-form-item label="归属部门" prop="deptId">-->
+        <!--<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />-->
+        <!--</el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-      <!-- 用户导入对话框 -->
-      <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-          <el-upload
-                  ref="upload"
-                  :limit="1"
-                  accept=".xlsx, .xls"
-                  :headers="upload.headers"
-                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
-                  :disabled="upload.isUploading"
-                  :on-progress="handleFileUploadProgress"
-                  :on-success="handleFileSuccess"
-                  :auto-upload="false"
-                  drag
-          >
-              <i class="el-icon-upload"></i>
-              <div class="el-upload__text">
-                  将文件拖到此处，或
-                  <em>点击上传</em>
-              </div>
-              <div class="el-upload__tip" slot="tip">
-                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
-              </div>
-              <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
-          </el-upload>
-          <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitFileForm">确 定</el-button>
-              <el-button @click="upload.open = false">取 消</el-button>
-          </div>
-      </el-dialog>
+    <!-- 用户导入对话框 -->
+    <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
+               append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div class="el-upload__tip" slot="tip">
+          <el-checkbox v-model="upload.updateSupport"/>
+          是否更新已经存在的用户数据
+          <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+        </div>
+        <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
 
     <!-- 附件对话框 -->
     <el-dialog v-dialogDrag :close-on-click-modal="false" :visible.sync="doc.open" append-to-body title="现场照片"
@@ -456,19 +461,28 @@
 </template>
 
 <script>
-import { listCleaning, getCleaning, delCleaning, addCleaning, updateCleaning, exportCleaning, importTemplate, handleConfirmCleaning, handleTurnDownCleaning } from "@/api/pssr/cleaning";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addCleaning,
+  delCleaning,
+  exportCleaning,
+  getCleaning,
+  handleConfirmCleaning,
+  handleTurnDownCleaning,
+  importTemplate,
+  listCleaning,
+  updateCleaning
+} from "@/api/pssr/cleaning";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import Editor from '@/components/Editor';
 import {listUserNoPage} from "@/api/system/user";
 import {doApprove} from "@/api/pssr/approve";
 
 export default {
-  dicts:['pssr_approve_status'],
+  dicts: ['pssr_approve_status'],
   name: "Cleaning",
-  components: { Treeselect },
+  components: {Treeselect},
   // components: { Editor },
   props: {
     subId: {
@@ -512,24 +526,24 @@ export default {
       title: "",
       // 部门树选项
       deptOptions: undefined,
-      clientHeight:300,
+      clientHeight: 300,
       // 是否显示弹出层
       open: false,
-        // 用户导入参数
-        upload: {
-            // 是否显示弹出层（用户导入）
-            open: false,
-            // 弹出层标题（用户导入）
-            title: "",
-            // 是否禁用上传
-            isUploading: false,
-            // 是否更新已经存在的用户数据
-            updateSupport: 0,
-            // 设置上传的请求头部
-            headers: { Authorization: "Bearer " + getToken() },
-            // 上传的地址
-            url: process.env.VUE_APP_BASE_API + "/pssr/cleaning/importData"
-        },
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/pssr/cleaning/importData"
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -561,16 +575,16 @@ export default {
     };
   },
   watch: {
-        // 根据名称筛选部门树
-        deptName(val) {
-            this.$refs.tree.filter(val);
-        }
-   },
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
   created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight - 350
-      })
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = document.body.clientHeight - 350
+    })
     this.getList();
     this.getTreeselect();
     listUserNoPage({}).then(res => {
@@ -587,12 +601,12 @@ export default {
         this.loading = false;
       });
     },
-     /** 查询部门下拉树结构 */
-     getTreeselect() {
-          treeselect().then(response => {
-              this.deptOptions = response.data;
-          });
-     },
+    /** 查询部门下拉树结构 */
+    getTreeselect() {
+      treeselect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -635,7 +649,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -678,102 +692,102 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm('是否确认删除?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delCleaning(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delCleaning(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有设备清洁数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCleaning(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        })
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportCleaning(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
     },
-      /** 导入按钮操作 */
-      handleImport() {
-          this.upload.title = "用户导入";
-          this.upload.open = true;
-      },
-      /** 下载模板操作 */
-      importTemplate() {
-          importTemplate().then(response => {
-              this.download(response.msg);
-          });
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-          this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-          this.upload.open = false;
-          this.upload.isUploading = false;
-          this.$refs.upload.clearFiles();
-          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
-          this.getList();
-      },
-      // 提交上传文件
-      submitFileForm() {
-          this.$refs.upload.submit();
-      },
-      /** 确认按钮操作*/
-      handleApprove() {
-        doApprove(this.subId).then(res => {
-          this.msgSuccess("已发起确认流程");
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      importTemplate().then(response => {
+        this.download(response.msg);
+      });
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert(response.msg, "导入结果", {dangerouslyUseHTMLString: true});
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    /** 确认按钮操作*/
+    handleApprove() {
+      doApprove(this.subId).then(res => {
+        this.msgSuccess("已发起确认流程");
         this.getList();
-        })
-      },
-      handleConfirmApprove() {
+      })
+    },
+    handleConfirmApprove() {
+      let data = {
+        ids: this.ids,
+        subId: this.subId,
+        taskType: this.isApprove
+      }
+      handleConfirmCleaning(data).then(res => {
+        this.msgSuccess("确认成功");
+        this.getList()
+        this.$emit('refreshHisList');
+      })
+    },
+    handleTurnDown(val) {
+      this.$prompt('请输入驳回原因', '提示', {
+        confirmButtonText: '确认驳回',
+        cancelButtonText: '取消',
+      }).then(({value}) => {
         let data = {
           ids: this.ids,
           subId: this.subId,
-          taskType: this.isApprove
+          remarks: value
         }
-        handleConfirmCleaning(data).then(res => {
-          this.msgSuccess("确认成功");
-          this.getList()
-          this.$emit('refreshHisList');
+        handleTurnDownCleaning(data).then(res => {
+          this.msgSuccess("驳回成功");
         })
-      },
-      handleTurnDown(val) {
-        this.$prompt('请输入驳回原因', '提示', {
-          confirmButtonText: '确认驳回',
-          cancelButtonText: '取消',
-        }).then(({value}) => {
-          let data = {
-            ids: this.ids,
-            subId: this.subId,
-            remarks: value
-          }
-          handleTurnDownCleaning(data).then(res => {
-            this.msgSuccess("驳回成功");
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '取消驳回'
-          });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消驳回'
         });
-      },
-      userFormat(userId) {
-        for (let item of this.userOptions) {
-          if (item.userId == userId) {
-            return item.nickName
-          }
+      });
+    },
+    userFormat(userId) {
+      for (let item of this.userOptions) {
+        if (item.userId == userId) {
+          return item.nickName
         }
-      },
+      }
+    },
   }
 };
 </script>

ui/src/views/pssr/file/index.vue

@@ -316,9 +316,9 @@
 </template>
 
 <script>
-import { listFile, getFile, delFile, addFile, updateFile, exportFile, importTemplate} from "@/api/pssr/file";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {addFile, delFile, exportFile, getFile, importTemplate, listFile, updateFile} from "@/api/pssr/file";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 

ui/src/views/pssr/frame/index.vue

@@ -613,6 +613,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 
 export default {

ui/src/views/pssr/franklinism/index.vue

@@ -459,13 +459,23 @@
 </template>
 
 <script>
-import { listFranklinism, getFranklinism, delFranklinism, addFranklinism, updateFranklinism, exportFranklinism, importTemplate, handleConfirmFranklinism, handleTurnDownFranklinism } from "@/api/pssr/franklinism";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addFranklinism,
+  delFranklinism,
+  exportFranklinism,
+  getFranklinism,
+  handleConfirmFranklinism,
+  handleTurnDownFranklinism,
+  importTemplate,
+  listFranklinism,
+  updateFranklinism
+} from "@/api/pssr/franklinism";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import Editor from '@/components/Editor';
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 
 export default {

ui/src/views/pssr/gasdetector/index.vue

@@ -477,12 +477,23 @@
 </template>
 
 <script>
-import { listGasdetector, getGasdetector, delGasdetector, addGasdetector, updateGasdetector, exportGasdetector, importTemplate, handleConfirmGasdetector, handleTurnDownGasdetector } from "@/api/pssr/gasdetector";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addGasdetector,
+  delGasdetector,
+  exportGasdetector,
+  getGasdetector,
+  handleConfirmGasdetector,
+  handleTurnDownGasdetector,
+  importTemplate,
+  listGasdetector,
+  updateGasdetector
+} from "@/api/pssr/gasdetector";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 
 export default {

ui/src/views/pssr/hygiene/index.vue

@@ -419,12 +419,21 @@
 </template>
 
 <script>
-import { listHygiene, getHygiene, delHygiene, addHygiene, updateHygiene, exportHygiene, importTemplate, handleConfirmHygiene, handleTurnDownHygiene } from "@/api/pssr/hygiene";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addHygiene,
+  delHygiene,
+  exportHygiene,
+  getHygiene,
+  handleConfirmHygiene,
+  handleTurnDownHygiene,
+  importTemplate,
+  listHygiene,
+  updateHygiene
+} from "@/api/pssr/hygiene";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import Editor from '@/components/Editor';
 import {doApprove} from "@/api/pssr/approve";
 import {listUserNoPage} from "@/api/system/user";
 
@@ -445,6 +454,17 @@ export default {
   },
   data() {
     return {
+      doc: {
+        file: "",
+        // 是否显示弹出层（报告附件）
+        open: false,
+        fileList: [],
+        queryParams: {
+          itemId: null,
+          subId: this.subId,
+          forShort: 'xcws'
+        },
+      },
       userOptions: [],
       // 遮罩层
       loading: true,

ui/src/views/pssr/instrumentCalibration/index.vue

@@ -490,12 +490,23 @@
 </template>
 
 <script>
-import { listInstrumentCalibration, getInstrumentCalibration, delInstrumentCalibration, addInstrumentCalibration, updateInstrumentCalibration, exportInstrumentCalibration, importTemplate, handleConfirmInstrumentCalibration, handleTurnDownInstrumentCalibration } from "@/api/pssr/instrumentCalibration";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addInstrumentCalibration,
+  delInstrumentCalibration,
+  exportInstrumentCalibration,
+  getInstrumentCalibration,
+  handleConfirmInstrumentCalibration,
+  handleTurnDownInstrumentCalibration,
+  importTemplate,
+  listInstrumentCalibration,
+  updateInstrumentCalibration
+} from "@/api/pssr/instrumentCalibration";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 
 export default {

ui/src/views/pssr/laboratory/index.vue

@@ -465,9 +465,19 @@
 </template>
 
 <script>
-import { listLaboratory, getLaboratory, delLaboratory, addLaboratory, updateLaboratory, exportLaboratory, importTemplate, handleConfirmLaboratory, handleTurnDownLaboratory } from "@/api/pssr/laboratory";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addLaboratory,
+  delLaboratory,
+  exportLaboratory,
+  getLaboratory,
+  handleConfirmLaboratory,
+  handleTurnDownLaboratory,
+  importTemplate,
+  listLaboratory,
+  updateLaboratory
+} from "@/api/pssr/laboratory";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";

ui/src/views/pssr/lighting/index.vue

@@ -464,13 +464,23 @@
 </template>
 
 <script>
-import { listLighting, getLighting, delLighting, addLighting, updateLighting, exportLighting, importTemplate, handleConfirmLighting, handleTurnDownLighting } from "@/api/pssr/lighting";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addLighting,
+  delLighting,
+  exportLighting,
+  getLighting,
+  handleConfirmLighting,
+  handleTurnDownLighting,
+  importTemplate,
+  listLighting,
+  updateLighting
+} from "@/api/pssr/lighting";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import Editor from '@/components/Editor';
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 
 export default {

ui/src/views/pssr/lock/index.vue

@@ -358,9 +358,9 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {listLockPid} from "@/api/apply/lock";
-import {listFile} from "@/api/pssr/file";
 
 export default {
   dicts: ['pssr_approve_status'],

ui/src/views/pssr/material/index.vue

@@ -325,7 +325,9 @@ import {
   addMaterial,
   delMaterial,
   exportMaterial,
-  getMaterial, handleConfirmMaterial, handleTurnDownMaterial,
+  getMaterial,
+  handleConfirmMaterial,
+  handleTurnDownMaterial,
   importTemplate,
   listMaterial,
   updateMaterial,
@@ -337,6 +339,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 
 export default {
   dicts: ['pssr_approve_status'],

ui/src/views/pssr/materialRaw/index.vue

@@ -366,6 +366,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 
 export default {
   dicts: ['pssr_approve_status'],

ui/src/views/pssr/measure/index.vue

@@ -298,7 +298,9 @@ import {
   addMeasure,
   delMeasure,
   exportMeasure,
-  getMeasure, handleConfirmMeasure, handleTurnDownMeasure,
+  getMeasure,
+  handleConfirmMeasure,
+  handleTurnDownMeasure,
   importTemplate,
   listMeasure,
   updateMeasure
@@ -308,6 +310,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 
 export default {

ui/src/views/pssr/moc/index.vue

@@ -337,6 +337,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 
 export default {
@@ -362,7 +363,7 @@ export default {
         queryParams: {
           itemId: null,
           subId: this.subId,
-          forShort: 'moc'
+          forShort: 'sjbg'
         },
       },
       userOptions: [],

ui/src/views/pssr/motor/index.vue

@@ -476,12 +476,23 @@
 </template>
 
 <script>
-import { listMotor, getMotor, delMotor, addMotor, updateMotor, exportMotor, importTemplate, handleConfirmMotor, handleTurnDownMotor } from "@/api/pssr/motor";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addMotor,
+  delMotor,
+  exportMotor,
+  getMotor,
+  handleConfirmMotor,
+  handleTurnDownMotor,
+  importTemplate,
+  listMotor,
+  updateMotor
+} from "@/api/pssr/motor";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 
 export default {

ui/src/views/pssr/nitrogen/index.vue

@@ -308,6 +308,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 
 export default {
   dicts: ['pssr_approve_status'],

ui/src/views/pssr/overhaulExchanger/index.vue

@@ -377,7 +377,8 @@ import {
   delOverhaulExchanger,
   exportOverhaulExchanger,
   getOverhaulExchanger,
-  handleConfirmApprove, handleTurnDownExchanger,
+  handleConfirmApprove,
+  handleTurnDownExchanger,
   importTemplate,
   listOverhaulExchanger,
   updateOverhaulExchanger

ui/src/views/pssr/overhaulFilter/index.vue

@@ -383,7 +383,8 @@ import {
   delOverhaulFilter,
   exportOverhaulFilter,
   getOverhaulFilter,
-  handleConfirmApprove, handleTurnDownFilter,
+  handleConfirmApprove,
+  handleTurnDownFilter,
   importTemplate,
   listOverhaulFilter,
   updateOverhaulFilter

ui/src/views/pssr/overhaulPipe/index.vue

@@ -265,7 +265,8 @@ import {
   delOverhaulPipe,
   exportOverhaulPipe,
   getOverhaulPipe,
-  handleConfirmApprove, handleTurnDownPipe,
+  handleConfirmApprove,
+  handleTurnDownPipe,
   importTemplate,
   listOverhaulPipe,
   updateOverhaulPipe

ui/src/views/pssr/overhaulPump/index.vue

@@ -277,7 +277,8 @@ import {
   delOverhaulPump,
   exportOverhaulPump,
   getOverhaulPump,
-  handleConfirmApprove, handleTurnDownPump,
+  handleConfirmApprove,
+  handleTurnDownPump,
   importTemplate,
   listOverhaulPump,
   updateOverhaulPump

ui/src/views/pssr/overhaulTower/index.vue

@@ -360,7 +360,8 @@ import {
   delOverhaulTower,
   exportOverhaulTower,
   getOverhaulTower,
-  handleConfirmApprove, handleTurnDownTower,
+  handleConfirmApprove,
+  handleTurnDownTower,
   importTemplate,
   listOverhaulTower,
   updateOverhaulTower

ui/src/views/pssr/overhaulValve/index.vue

@@ -379,7 +379,8 @@ import {
   delOverhaulValve,
   exportOverhaulValve,
   getOverhaulValve,
-  handleConfirmApprove, handleTurnDownValve,
+  handleConfirmApprove,
+  handleTurnDownValve,
   importTemplate,
   listOverhaulValve,
   updateOverhaulValve

ui/src/views/pssr/pipe/index.vue

@@ -388,6 +388,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 
 export default {
   dicts: ['pssr_approve_status'],

ui/src/views/pssr/power/index.vue

@@ -441,12 +441,21 @@
 </template>
 
 <script>
-import { listPower, getPower, delPower, addPower, updatePower, exportPower, importTemplate, handleConfirmPower, handleTurnDownPower } from "@/api/pssr/power";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addPower,
+  delPower,
+  exportPower,
+  getPower,
+  handleConfirmPower,
+  handleTurnDownPower,
+  importTemplate,
+  listPower,
+  updatePower
+} from "@/api/pssr/power";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import Editor from '@/components/Editor';
 import {listUserNoPage} from "@/api/system/user";
 import {doApprove} from "@/api/pssr/approve";
 

ui/src/views/pssr/protection/index.vue

@@ -258,7 +258,9 @@ import {
   addProtection,
   delProtection,
   exportProtection,
-  getProtection, handleConfirmProtection, handleTurnDownProtection,
+  getProtection,
+  handleConfirmProtection,
+  handleTurnDownProtection,
   importTemplate,
   listProtection,
   updateProtection
@@ -268,6 +270,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 
 export default {

ui/src/views/pssr/pssrModel/index.vue

@@ -208,7 +208,6 @@ import {
   delPssrModel,
   exportPssrModel,
   getPssrModel,
-  importTemplate,
   listPssrModel,
   updatePssrModel
 } from "@/api/pssr/pssrModel";

ui/src/views/pssr/public/index.vue

@@ -221,7 +221,7 @@
     </el-row>
 
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
-      <H2>公用工程系统投用确认清单</H2><br>填写要求：公用工程系统投用符合检查内容要求的，在检查结果中打“✔”，不符合打“×”。<br>
+      <H2>公用工程系统投用确认清单</H2><br>填写要求：根据检查内容和检查要求，填写相应的检查情况，检查情况符合检查要求的，在检查结果中打“✔”，表示投用或具备投用条件，不符合打“×”，表示没投用或不具备投用条件。<br>
       如果检查不符合，并联系相关责任人按照该条检查内容的要求进行整改。如不能立即整改的，请立即汇报相关负责人并采取临时应对措施。
     </div>
 
@@ -424,12 +424,21 @@
 </template>
 
 <script>
-import { listPublic, getPublic, delPublic, addPublic, updatePublic, exportPublic, importTemplate, handleConfirmPublic, handleTurnDownPublic } from "@/api/pssr/public";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addPublic,
+  delPublic,
+  exportPublic,
+  getPublic,
+  handleConfirmPublic,
+  handleTurnDownPublic,
+  importTemplate,
+  listPublic,
+  updatePublic
+} from "@/api/pssr/public";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import Editor from '@/components/Editor';
 import {listUserNoPage} from "@/api/system/user";
 import {doApprove} from "@/api/pssr/approve";
 

ui/src/views/pssr/pumpCleaning/index.vue

@@ -292,11 +292,11 @@ import {
   delPumpCleaning,
   exportPumpCleaning,
   getPumpCleaning,
+  handleConfirmPumpCleaning,
+  handleTurnDownPumpCleaning,
   importTemplate,
   listPumpCleaning,
-  updatePumpCleaning,
-  handleConfirmPumpCleaning,
-  handleTurnDownPumpCleaning
+  updatePumpCleaning
 } from "@/api/pssr/pumpCleaning";
 import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";

ui/src/views/pssr/region/index.vue

@@ -206,15 +206,7 @@
 </template>
 
 <script>
-import {
-  addRegion,
-  delRegion,
-  exportRegion,
-  getRegion,
-  importTemplate,
-  listRegion,
-  updateRegion
-} from "@/api/pssr/region";
+import {addRegion, delRegion, exportRegion, getRegion, listRegion, updateRegion} from "@/api/pssr/region";
 import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";

ui/src/views/pssr/safetyBleed/index.vue

@@ -329,6 +329,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {handleConfirmBleed, handleTurnDownBleed} from "@/api/pssr/safety";
 import {doApprove} from "@/api/pssr/approve";
 

ui/src/views/pssr/safetyBreath/index.vue

@@ -329,6 +329,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {handleConfirmBreath, handleTurnDownBreath} from "@/api/pssr/safety";
 

ui/src/views/pssr/safetyBrust/index.vue

@@ -347,6 +347,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 import {handleConfirmBrust, handleTurnDownBrust} from "@/api/pssr/safety";
 

ui/src/views/pssr/safetyFlamearrester/index.vue

@@ -323,6 +323,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {handleconfirmFlamearrester, handleturnDownFlamearrester} from "@/api/pssr/safety";
 import {doApprove} from "@/api/pssr/approve";
 

ui/src/views/pssr/safetyValve/index.vue

@@ -332,6 +332,7 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {handleconfirmValve, handleturnDownValve} from "@/api/pssr/safety";
 import {doApprove} from "@/api/pssr/approve";
 

ui/src/views/pssr/subcontent/index.vue

@@ -166,7 +166,8 @@ import {
   addSubcontent,
   delSubcontent,
   exportSubcontent,
-  getSubcontent, handleTurnDownSubcontent,
+  getSubcontent,
+  handleTurnDownSubcontent,
   importTemplate,
   listSubcontent,
   updateSubcontent
@@ -176,7 +177,6 @@ import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listUserNoPage} from "@/api/system/user";
-import {handleTurnDownPumpCleaning} from "@/api/pssr/pumpCleaning";
 
 export default {
   dicts: ['pssr_approve_status'],

ui/src/views/pssr/torchvoc/index.vue

@@ -436,13 +436,23 @@
 </template>
 
 <script>
-import { listTorchvoc, getTorchvoc, delTorchvoc, addTorchvoc, updateTorchvoc, exportTorchvoc, importTemplate, handleConfirmTorchvoc, handleTurnDownTorchvoc } from "@/api/pssr/torchvoc";
-import { treeselect } from "@/api/system/dept";
-import { getToken } from "@/utils/auth";
+import {
+  addTorchvoc,
+  delTorchvoc,
+  exportTorchvoc,
+  getTorchvoc,
+  handleConfirmTorchvoc,
+  handleTurnDownTorchvoc,
+  importTemplate,
+  listTorchvoc,
+  updateTorchvoc
+} from "@/api/pssr/torchvoc";
+import {treeselect} from "@/api/system/dept";
+import {getToken} from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import Editor from '@/components/Editor';
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 import {doApprove} from "@/api/pssr/approve";
 
 export default {

ui/src/views/pssr/vessel/index.vue

@@ -398,6 +398,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {doApprove} from "@/api/pssr/approve";
 import {listUserNoPage} from "@/api/system/user";
+import {listFile} from "@/api/pssr/file";
 
 export default {
   name: "Vessel",