我的上报

src/views/danger/changeDanger/changeInfo.vue

@@ -65,25 +65,84 @@
         :rules="[{ required: true, message: '隐患整改详情描述不能为空' }]"
       />
 
-      <van-field name="uploader" label="整改照片" :rules="[{ required: true, message: '整改照片不能为空' }]">
+      <van-field
+        name="uploader"
+        label="整改照片"
+        :rules="[{ required: true, message: '整改照片不能为空' }]"
+      >
         <template #input>
-          <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderImg" />
+          <van-uploader
+            multiple
+            :max-count="5"
+            upload-text="最多上传五个"
+            v-model="uploaderImg"
+          >
+            <template slot="default">
+              <!-- 11111111111 -->
+              <div
+                style="
+                  width: 2.13333rem;
+                  height: 2.13333rem;
+                  background: #f7f8fa;
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  flex-direction: column;
+                "
+              >
+                <img
+                  src="@/assets/upload/pic.png"
+                  alt=""
+                  style="width: 0.64rem; height: 0.64rem"
+                />
+                <span class="van-uploader__upload-text">最多上传五个</span>
+              </div>
+            </template>
+          </van-uploader>
         </template>
       </van-field>
 
       <van-field name="uploader2" label="整改视频">
         <template #input>
-          <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderVideo" accept="video/*" />
+          <van-uploader
+            multiple
+            :max-count="5"
+            upload-text="最多上传五个"
+            v-model="uploaderVideo"
+            accept="video/*"
+          >
+            <template slot="default">
+              <!-- 11111111111 -->
+              <div
+                style="
+                  width: 2.13333rem;
+                  height: 2.13333rem;
+                  background: #f7f8fa;
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  flex-direction: column;
+                "
+              >
+                <img
+                  src="@/assets/upload/video.png"
+                  alt=""
+                  style="width: 0.64rem; height: 0.64rem"
+                />
+                <span class="van-uploader__upload-text">最多上传五个</span>
+              </div>
+            </template>
+          </van-uploader>
         </template>
       </van-field>
 
-      <div style="margin: 16px;">
+      <div style="margin: 16px">
         <van-button round block type="info" native-type="submit"
           >保存</van-button
         >
       </div>
     </van-form>
-    <div style="margin:10px 16px 0px;padding-bottom:16px">
+    <div style="margin: 10px 16px 0px; padding-bottom: 16px">
       <van-button round block type="warning" @click.native="cancel"
         >取消</van-button
       >
@@ -93,12 +152,12 @@
 
 <script>
 import LHeader from "@/components/header.vue";
-import {getFun,postFun} from "@/service/table.js";
+import { getFun, postFun } from "@/service/table.js";
 import { dangerRectReturn, dangerRectAdd } from "@/service/danger";
 export default {
   name: "change-info",
   components: {
-    LHeader
+    LHeader,
   },
   data() {
     return {
@@ -110,13 +169,13 @@ export default {
       isShowreturnCause: false,
       value: "",
       uploaderImg: [], //图像上传
-      uploaderVideo: [] //视频上传
+      uploaderVideo: [], //视频上传
     };
   },
   beforeRouteEnter(to, from, next) {
-    next(vm => {
+    next((vm) => {
       if (from.name === "change-danger") {
-        vm.messageList = []
+        vm.messageList = [];
         let paramsData = to.params.data;
         vm.taskId = paramsData.taskId;
         vm.taskName = paramsData.taskName;
@@ -127,9 +186,8 @@ export default {
           vm.getRectReturn();
         }
         // 清空数据
-         vm.value="",
-         vm.uploaderImg=[]; //图像上传
-         vm.uploaderVideo=[] //视频上传
+        (vm.value = ""), (vm.uploaderImg = []); //图像上传
+        vm.uploaderVideo = []; //视频上传
       }
     });
   },
@@ -141,15 +199,15 @@ export default {
         message: "提交中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0
+        duration: 0,
       });
       let formdata = new FormData();
       formdata.append("details", this.value);
       // 放图片路径 因为formdat存数组会自动变成字符串所以次用这种追加字段的方式
-      values.uploader.forEach(item => {
+      values.uploader.forEach((item) => {
         formdata.append("rePicture1[]", item.file);
       });
-      values.uploader2.forEach(item => {
+      values.uploader2.forEach((item) => {
         formdata.append("reVideo1[]", item.file);
       });
       // 判断保存的url
@@ -158,11 +216,11 @@ export default {
         url = `/rectification/add2/${this.taskId}`;
       }
       dangerRectAdd(url, formdata)
-        .then(res => {
+        .then((res) => {
           this.$toast.clear();
           this.$toast.success({
             message: "提交成功",
-            duration: 2000
+            duration: 2000,
           });
           history.go(-1);
         })
@@ -177,10 +235,10 @@ export default {
         message: "加载中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0
+        duration: 0,
       });
       dangerRectReturn(`/rectification/addReturn/${this.taskId}`)
-        .then(res => {
+        .then((res) => {
           this.$toast.clear();
           this.returnCause = res.data.reason;
         })
@@ -194,17 +252,17 @@ export default {
       this.$router.push({
         name: "normal-detail",
         params: {
-          id: taskId
-        }
+          id: taskId,
+        },
       });
     },
 
     cancel() {
       this.$router.go(-1);
-    }
+    },
   },
   filters: {
-    formatTime: function(val) {
+    formatTime: function (val) {
       if (new Date(val).getTime() <= new Date().getTime()) {
         return "超期";
       } else if (
@@ -215,8 +273,8 @@ export default {
       } else {
         return "正常";
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="less" scoped>

src/views/danger/changeDanger/index.vue

@@ -72,10 +72,10 @@
                   >详情</van-button
                 >
                 <van-button round type="info" @click="goConfirm(item)"
-                  >确认</van-button
+                  >隐患整改</van-button
                 >
                 <van-button round type="info" @click="goDelay(item)"
-                  >延期</van-button
+                  >申请延期</van-button
                 >
                 <!-- <van-button round type="warning " @click="goClose(item)"
                   >关闭</van-button
@@ -148,10 +148,10 @@
                   >详情</van-button
                 >
                 <van-button round type="info" @click="goConfirm(item)"
-                  >确认</van-button
+                  >隐患整改</van-button
                 >
                 <van-button round type="info" @click="goDelay(item)"
-                  >延期</van-button
+                  >申请延期</van-button
                 >
                 <!-- <van-button round type="warning" @click="goClose(item)"
                   >关闭</van-button

src/views/danger/insertDanger/list.vue

@@ -22,6 +22,10 @@
         :key="index"
         @click="touchstart(index, item)"
       >
+        <van-row gutter="">
+          <van-col span="6">隐患编号：</van-col>
+          <van-col span="18">{{ item.id }}</van-col>
+        </van-row>
         <van-row gutter="">
           <van-col span="6">所属项目：</van-col>
           <van-col span="18">{{ item.proId }}</van-col>

src/views/danger/reviewDanger/reviewAdd.vue

@@ -45,7 +45,7 @@
       :scroll-to-error="true"
       validate-trigger="onSubmit"
     >
-      <van-field name="radio" label="隐患复查结果">
+      <van-field name="radio" label="复查结果">
         <template #input>
           <van-radio-group
             v-model="radio"
@@ -62,7 +62,7 @@
       <div class="agree" v-if="radio == 1">
         <van-field
           v-model="detail"
-          label="详情描述"
+          label="复查结论"
           name="reviewDetails"
           rows="3"
           type="textarea"
@@ -71,7 +71,7 @@
         />
         <van-field
           name="uploader"
-          label="隐患复查照片"
+          label="复查照片"
         >
           <template #input>
             <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderImg" />

src/views/danger/standBook/normalDetail.vue

@@ -194,7 +194,7 @@
                 </van-row>
                 <van-row>
                   <van-col span="6"
-                    ><span class="field-title">审批人：</span></van-col
+                    ><span class="field-title">操作人：</span></van-col
                   >
                   <van-col span="18">{{ item.userName }}</van-col>
                 </van-row>
@@ -360,7 +360,7 @@
                 </van-row>
                 <van-row>
                   <van-col span="6"
-                    ><span class="field-title">审批人：</span></van-col
+                    ><span class="field-title">操作人：</span></van-col
                   >
                   <van-col span="18">{{ item.userName }}</van-col>
                 </van-row>
@@ -412,7 +412,7 @@
                 </van-row>
                 <van-row>
                   <van-col span="6"
-                    ><span class="field-title">审批人：</span></van-col
+                    ><span class="field-title">操作人：</span></van-col
                   >
                   <van-col span="18">{{ item.userName }}</van-col>
                 </van-row>

src/views/risk/riskAccount/riskBigDetail.vue

@@ -168,7 +168,7 @@
                 </van-row>
                 <van-row>
                   <van-col span="6"
-                    ><span class="field-title">审批人：</span></van-col
+                    ><span class="field-title">操作人：</span></van-col
                   >
                   <van-col span="18">{{item.userName}}</van-col>
                 </van-row>