Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

src/components/header.vue

@@ -66,7 +66,7 @@ export default {
         color: white;
         font-size: 16px;
         margin: auto;
-        font-weight: 600;
+        font-weight: none;
         font-family: 'Microsoft YaHei';
     }
     .header .iconColorRight{

src/views/Category.vue

@@ -116,7 +116,7 @@ export default {
       }
       .icon-left {
         font-size: 25px;
-        font-weight: bold;
+        font-weight: none;
       }
       .header-search {
         display: flex;
@@ -190,7 +190,7 @@ export default {
             .catogory-title {
               width: 100%;
               font-size: 17px;
-              font-weight: 500;
+              font-weight: none;
               padding: 20px 0;
             }
             .product-item {

src/views/Home.vue

@@ -223,7 +223,7 @@ export default {
               padding: 0 10px;
               color: @primary;
               font-size: 20px;
-              font-weight: bold;
+              font-weight: none;
               border-right: 1px solid #666;
           }
           .icon-search {
@@ -274,7 +274,7 @@ export default {
       text-align: center;
       color: @primary;
       font-size: 16px;
-      font-weight: 500;
+      font-weight: none;
     }
     .good-box {
       display: flex;

src/views/Login2.vue

@@ -115,7 +115,7 @@ export default {
     margin-top: 20px;
     color: #fafbfe;
     font-size: 18px;
-    font-weight: bold;
+    font-weight: none;
   }
   .con {
     width: 345px;
@@ -128,7 +128,7 @@ export default {
     .hello {
       color: #004fb1;
       font-size: 20px;
-      font-weight: bold;
+      font-weight: none;
     }
     .welcome {
       margin: 15px 0;

src/views/ProductList.vue

@@ -162,7 +162,7 @@ export default {
       }
       .icon-left {
         font-size: 25px;
-        font-weight: bold;
+        font-weight: none;
       }
       .header-search {
         display: flex;

src/views/danger/addDanger/addDanger.vue

@@ -10,7 +10,7 @@
     >
       <van-field
         v-if="isShowreturnCause"
-        v-model="returnCause"
+        v-model.lazy="returnCause"
         readonly
         rows="1"
         autosize
@@ -24,10 +24,10 @@
         clickable
         name="proId"
         :value="projectName"
-        label="所属工程名称"
+        label="所属项目"
         placeholder="请选择"
         @click="showProjectName = true"
-        :rules="[{ required: true, message: '所属工程名称不能为空' }]"
+        :rules="[{ required: true, message: '所属项目不能为空' }]"
       />
       <van-popup v-model="showProjectName" position="bottom">
         <van-picker
@@ -258,7 +258,7 @@
 
       <div style="margin: 16px 16px 0">
         <van-button round block type="info" native-type="submit"
-          >保存</van-button
+          >上报</van-button
         >
       </div>
     </van-form>
@@ -395,6 +395,7 @@ export default {
  
   methods: {
     onSubmit(values) {
+
       let formdata = new FormData();
       formdata.append("proId", this.projectId);
       formdata.append("hdRange", values.hdRange);
@@ -410,12 +411,19 @@ export default {
       formdata.append("hdExpirationTime", values.hdExpirationTime);
       formdata.append("rectificationUser", values.rectificationUser);
       // 放图片路径 因为formdat存数组会自动变成字符串所以次用这种追加字段的方式
+      
+      // return false;
       values.hdPicture1.forEach((item) => {
         formdata.append("hdPicture1[]", item.file);
       });
       values.hdVideo1.forEach((item) => {
         formdata.append("hdVideo1[]", item.file);
       });
+      // console.log(formdata)
+      // for (var [a, b] of formdata.entries()) {
+      //     console.log(a, b);
+      // } 
+      // return false;
       this.$toast.loading({
         message: "提交中...",
         forbidClick: true,
@@ -474,8 +482,28 @@ export default {
       dangerReturnEcho(`/hdreport/edit/${this.taskId}`)
         .then((res) => {
           this.$toast.clear();
+          
            // 对数据进行赋值
           this.returnCause = res.data.reason;
+          let msg = res.data.hdReport
+          console.log(msg)
+          this.projectId=msg.proId
+          this.projectName = msg.hdProjectName
+          this.range = msg.hdRange
+          this.type = msg.hdType
+          this.dangerName = msg.hdProjectName
+          this.dangerNum = msg.hdProjectId
+          this.dangerLevel = msg.hdLev
+          this.findTime = msg.hdDiscoveryTime
+          this.source = msg.dangerId
+          this.location = msg.hdPosition
+          this.describe = msg.hdDescribe
+          this.expireTime = msg.hdExpirationTime
+          this.recPeople = msg.rectificationUser
+          this.uploaderImg = msg.hdPictureList||[]
+          this.uploaderVideo = msg.hdVideoList||[]
+
+
         })
         .catch(() => {
           this.$toast.clear();
@@ -483,7 +511,7 @@ export default {
         });
     },
 
-    // 所属工程名称
+    // 所属项目
     onConProjectName(value) {
       if(!value){
         this.showProjectName = false;

src/views/danger/changeDanger/changeInfo.vue

@@ -23,10 +23,10 @@
         <van-col span="5">隐患类型:</van-col>
         <van-col span="19">{{ item.hdType }}</van-col>
       </van-row>
-      <van-row gutter="">
+      <!-- <van-row gutter="">
         <van-col span="5">发现时间:</van-col>
         <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-      </van-row>
+      </van-row> -->
       <van-row gutter="">
         <van-col span="5">超期标识:</van-col>
         <van-col span="19">{{ item.dueDate | formatTime }}</van-col>
@@ -245,7 +245,7 @@ export default {
   bottom: 0.32rem;
   right: 15px;
   color: #2a80f7;
-  font-weight: bolder;
+  font-weight: none;
   z-index: 99;
 }
 </style>

src/views/danger/changeDanger/index.vue

@@ -33,10 +33,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
             <van-row gutter="">
               <van-col span="5">适用范围:</van-col>
               <van-col span="19">{{ item.hdRange }}</van-col>
@@ -105,10 +105,10 @@
               <van-col span="5">隐患类型:</van-col>
               <van-col span="19">{{ item.hdType }}</van-col>
             </van-row>
-            <van-row gutter="">
+            <!-- <van-row gutter="">
               <van-col span="5">发现时间:</van-col>
               <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-            </van-row>
+            </van-row> -->
             <van-row gutter="">
               <van-col span="5">超期标识:</van-col>
               <van-col span="19">{{ item.dueDate | formatTime }}</van-col>

src/views/danger/confirmeDanger/confirmeDanger.vue

@@ -23,10 +23,10 @@
         <van-col span="5">隐患类型:</van-col>
         <van-col span="19">{{ item.hdType }}</van-col>
       </van-row>
-      <van-row gutter="">
+      <!-- <van-row gutter="">
         <van-col span="5">发现时间:</van-col>
         <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-      </van-row>
+      </van-row> -->
       <!-- 详情 -->
       <div class="detail">详情</div>
     </van-cell-group>
@@ -329,7 +329,7 @@ export default {
   bottom: 0.32rem;
   right: 15px;
   color: #2a80f7;
-  font-weight: bolder;
+  font-weight: none;
   z-index: 99;
 }
 </style>

src/views/danger/confirmeDanger/index.vue

@@ -22,10 +22,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">适用范围:</van-col>
           <van-col span="19">{{ item.hdRange }}</van-col>

src/views/danger/delayApproval/index.vue

@@ -24,10 +24,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
    <!-- *接口对接4 END -->
 
         <!-- 长按显示遮罩层 -->

src/views/danger/insertDanger/list.vue

@@ -27,10 +27,10 @@
           <van-col span="5">隐患类型:</van-col>
           <van-col span="19">{{ item.hdType }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <!-- <van-row gutter="">
           <van-col span="5">状态:</van-col>
           <van-col span="19">{{ item.taskName }}</van-col>

src/views/danger/majorDanger/index.vue

@@ -24,10 +24,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
    <!-- *接口对接4 END -->
 
         <!-- 长按显示遮罩层 -->

src/views/danger/majorDanger/majorSurvey.vue

@@ -21,10 +21,10 @@
           <van-col span="7">隐患级别:</van-col>
           <van-col span="17">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="7">发现时间:</van-col>
           <van-col span="17">{{ item.startDate }}</van-col>
-        </van-row>
+        </van-row> -->
         <!-- 详情 -->
       <div class="detail">详情</div>
       </van-cell-group>
@@ -42,13 +42,13 @@
             @change="selectResult"
           >
             <van-radio name="1">同意</van-radio>
-            <van-radio name="0">退回</van-radio>
+            <van-radio name="0">重新认定隐患级别</van-radio>
           </van-radio-group>
         </template>
       </van-field>
 
       <!-- 同意时的选项 -->
-      <div class="agree" v-if="radio == 1">
+      <!-- <div class="agree" v-if="radio == 1">
         <van-field
           v-model="agreeOpinion"
           label="审批意见"
@@ -57,12 +57,13 @@
           type="textarea"
           placeholder="请输入"
         />
-      </div>
+      </div> -->
 
       <!-- 退回是的选项 -->
-      <div class="disagree" v-else>
+      <div class="disagree">
         <van-field
         readonly
+        v-if="radio==0"
         clickable
         name="thinkHdLev"
         :value="thinkLevel"
@@ -75,6 +76,7 @@
         <van-picker
           show-toolbar
           value-key="projectName"
+          :default-index="0"
           :columns="columnsThinkLevel"
           @confirm="onConThinkLevel"
           @cancel="showThinkLevel = false"
@@ -123,6 +125,7 @@ export default {
       agreeOpinion: "",
       disagreeOpinion: "",
       thinkLevel:'重大隐患', //因为隐患级别
+      thinkHdLev:'重大隐患',
       showThinkLevel: false,
       columnsThinkLevel:["重大隐患","一般隐患A","一般隐患B","一般隐患C",]
 
@@ -142,7 +145,7 @@ export default {
       }
     });
   },
-   created() {},
+  created() {},
   methods: {
     selectResult(val) {
       this.radio = val;
@@ -175,10 +178,11 @@ export default {
         });
     },
 
-    // 所属工程名称
+    // 所属项目
     onConThinkLevel(value) {
       this.thinkLevel = value;
       this.showProjectName = false;
+      this.showThinkLevel = false;
     },
      // 详情
     goDetail(taskId) {
@@ -224,7 +228,7 @@ export default {
   bottom: 0.32rem;
   right: 15px;
   color: #2a80f7;
-  font-weight: bolder;
+  font-weight: none;
   z-index: 99;
 }
 </style>

src/views/danger/managerDanger/index.vue

@@ -24,10 +24,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
    <!-- *接口对接4 END -->
 
         <!-- 长按显示遮罩层 -->

src/views/danger/managerDanger/managerSurvey.vue

@@ -19,10 +19,10 @@
         <van-col span="7">隐患级别:</van-col>
         <van-col span="17">{{ item.hdLev }}</van-col>
       </van-row>
-      <van-row gutter="">
+      <!-- <van-row gutter="">
         <van-col span="7">隐患发现时间:</van-col>
         <van-col span="17">{{ item.createTime }}</van-col>
-      </van-row>
+      </van-row> -->
       <!-- 详情 -->
       <div class="detail">详情</div>
     </van-cell-group>
@@ -153,7 +153,7 @@ export default {
   bottom: 0.32rem;
   right: 15px;
   color: #2a80f7;
-  font-weight: bolder;
+  font-weight: none;
   z-index: 99;
 }
 </style>

src/views/danger/reportReturn/index.vue

@@ -22,10 +22,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">适用范围:</van-col>
           <van-col span="19">{{ item.hdRange }}</van-col>

src/views/danger/reviewDanger/index.vue

@@ -22,10 +22,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">适用范围:</van-col>
           <van-col span="19">{{ item.hdRange }}</van-col>

src/views/danger/reviewDanger/reviewAdd.vue

@@ -23,10 +23,10 @@
           <van-col span="5">隐患类型:</van-col>
           <van-col span="19">{{ item.hdType }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">超期标识:</van-col>
           <van-col span="19">{{ item | formatTime }}</van-col>
@@ -236,7 +236,7 @@ export default {
   bottom: 0.32rem;
   right: 15px;
   color: #2a80f7;
-  font-weight: bolder;
+  font-weight: none;
   z-index: 99;
 }
 </style>

src/views/danger/standBook/index.vue

@@ -22,10 +22,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">适用范围:</van-col>
           <van-col span="19">{{ item.hdRange }}</van-col>

src/views/danger/standBook/normalDetail.vue

@@ -8,7 +8,7 @@
         <van-cell-group inset>
           <van-row gutter="">
             <van-col span="7"
-              ><span class="field-title">所属工程名称:</span></van-col
+              ><span class="field-title">所属项目:</span></van-col
             >
             <van-col span="17">{{ hdReport.proId }}</van-col>
           </van-row>
@@ -35,7 +35,7 @@
           <div v-show="reportOpen">
             <van-row gutter="">
               <van-col span="7"
-                ><span class="field-title">试用范围:</span></van-col
+                ><span class="field-title">适用范围:</span></van-col
               >
               <van-col span="17">{{ hdReport.hdRange }}</van-col>
             </van-row>
@@ -122,54 +122,61 @@
           {{ reportOpenText }}
         </div>
       </div>
-
-      <div class="confirm-wrap" v-if="hdConfirm">
+      <!-- {{hdConfirm}} -->
+      <div class="journal-wrap" v-if="hdConfirm.length > 0">
         <p>隐患认定</p>
         <van-cell-group inset>
-          <van-row gutter="">
-            <van-col span="7"
-              ><span class="field-title">隐患整改人:</span></van-col
-            >
-            <van-col span="17">{{ hdConfirm.rectificationUser }}</van-col>
-          </van-row>
-          <van-row gutter="">
-            <van-col span="7"
-              ><span class="field-title">隐患复查人:</span></van-col
-            >
-            <van-col span="17">{{ hdConfirm.rectificationReview }}</van-col>
-          </van-row>
-          <van-row gutter="">
-            <van-col span="7"
-              ><span class="field-title">整改截止时间:</span></van-col
-            >
-            <van-col span="17">{{ hdConfirm.endTime }}</van-col>
-          </van-row>
-          <van-row gutter="">
-            <van-col span="7"><span class="field-title">意见:</span></van-col>
-            <van-col span="17">{{ hdConfirm.confirmOpinion }}</van-col>
-          </van-row>
-
-          <!-- <div v-show="confirmOpen">hdMajorApproveList
-            <van-row gutter="">
-              <van-col span="7"
-                ><span class="field-title">隐患确认信息:</span></van-col
-              >
-              <van-col span="17">{{ hdConfirm.confirmOpinion }}</van-col>
-            </van-row>
-          </div> -->
+          <van-steps direction="vertical" :active="99999">
+            <van-step v-for="(item, index) in hdConfirm" :key="index">
+              <div class="step-wrap">
+                <van-row>
+                  <van-col span="24"
+                    ><div class="info-title">隐患认定</div></van-col
+                  >
+                </van-row>
+                <van-row gutter="">
+                  <van-col span="7"
+                    ><span class="field-title">隐患整改人:</span></van-col
+                  >
+                  <van-col span="17">{{ item.rectificationUser }}</van-col>
+                </van-row>
+                <van-row gutter="">
+                  <van-col span="7"
+                    ><span class="field-title">隐患复查人:</span></van-col
+                  >
+                  <van-col span="17">{{ item.rectificationReview }}</van-col>
+                </van-row>
+                <van-row gutter="">
+                  <van-col span="8"
+                    ><span class="field-title">整改截止时间:</span></van-col
+                  >
+                  <van-col span="16">{{ item.endTime }}</van-col>
+                </van-row>
+                <van-row gutter="">
+                  <van-col span="4"
+                    ><span class="field-title">意见:</span></van-col
+                  >
+                  <van-col span="20">{{ item.confirmOpinion }}</van-col>
+                </van-row>
+                <van-row gutter="">
+                  <van-col span="8"
+                    ><span class="field-title">隐患确认信息:</span></van-col
+                  >
+                  <van-col span="16">{{item.confirmResult==0?'退回':'通过'}}</van-col>
+                </van-row>
+                
+              </div>
+            </van-step>
+          </van-steps>
         </van-cell-group>
-        <!-- <div class="more" @click="confirmReverse">
+        <div class="more" @click="confirmReverse">
           {{ confirmOpenText }}
-        </div> -->
+        </div>
       </div>
-
       <div class="journal-wrap" v-if="hdMajorApproveList.length > 0">
         <p>审批信息</p>
         <van-cell-group inset>
-          <van-steps
-            direction="vertical"
-            :active="99999"
-          >
+          <van-steps direction="vertical" :active="99999">
             <van-step v-for="(item, index) in hdMajorApproveList" :key="index">
               <div class="step-wrap">
                 <van-row>
@@ -187,7 +194,9 @@
                   <van-col span="5"
                     ><span class="field-title">结果：</span></van-col
                   >
-                  <van-col span="19">{{ item.isResult == 1 ? "通过" : "退回"}}</van-col>
+                  <van-col span="19">{{
+                    item.isResult == 1 ? "通过" : "退回"
+                  }}</van-col>
                 </van-row>
                 <van-row>
                   <van-col span="5"
@@ -205,26 +214,35 @@
                   <van-col span="9"
                     ><span class="field-title">认定隐患级别：</span></van-col
                   >
-                  <van-col span="10
-                  ">{{ item.thinkHdLev }}</van-col>
+                  <van-col
+                    span="10
+                  "
+                    >{{ item.thinkHdLev }}</van-col
+                  >
                 </van-row>
                 <van-row v-if="item.details">
                   <van-col span="8"
                     ><span class="field-title">审批意见：</span></van-col
                   >
-                  <van-col span="16
-                  ">{{ item.details }}</van-col>
+                  <van-col
+                    span="16
+                  "
+                    >{{ item.details }}</van-col
+                  >
                 </van-row>
               </div>
             </van-step>
           </van-steps>
         </van-cell-group>
         <!-- 展开 -->
-        <div class="more" @click="majorReverse" v-show="hdMajorApproveList.length > 0">
+        <div
+          class="more"
+          @click="majorReverse"
+          v-show="hdMajorApproveList.length > 0"
+        >
           {{ majorOpenText }}
         </div>
       </div>
-
       <div class="change-wrap" v-if="hdRectificationList.length > 0">
         <p>隐患整改</p>
         <van-cell-group
@@ -327,7 +345,9 @@
               <div class="step-wrap">
                 <van-row>
                   <van-col span="24"
-                    ><div class="info-title">{{item.createTime}}</div></van-col
+                    ><div class="info-title">
+                      {{ item.createTime }}
+                    </div></van-col
                   >
                 </van-row>
                 <van-row>
@@ -354,11 +374,10 @@
                   >
                   <van-col span="19">{{ item.deptName }}</van-col>
                 </van-row>
-               
               </div>
             </van-step>
           </van-steps>
-          <div style="text-align: center;" v-if="hdLogList.length == 0">
+          <div style="text-align: center" v-if="hdLogList.length == 0">
             暂无数据
           </div>
         </van-cell-group>
@@ -411,7 +430,7 @@
             </van-step>
           </van-steps>
 
-          <div style="text-align: center;" v-if="instructionsList.length == 0">
+          <div style="text-align: center" v-if="instructionsList.length == 0">
             暂无数据
           </div>
         </van-cell-group>
@@ -433,7 +452,7 @@ import LHeader from "@/components/header.vue";
 import { standBookDetail } from "@/service/danger";
 export default {
   components: {
-    LHeader
+    LHeader,
   },
   data() {
     return {
@@ -451,7 +470,7 @@ export default {
       majorOpenText: "展开 ▼",
 
       hdReport: "",
-      hdConfirm: "",
+      hdConfirm: [],
       hdMajorApproveList: [], // 重大隐患审批
       beifenhdMajorList: [],
       hdRectificationList: [],
@@ -459,18 +478,17 @@ export default {
       hdLogList: [],
       beifenhdLogList: [],
       instructionsList: [],
-      beifeninstructionsList: []
+      beifeninstructionsList: [],
     };
   },
   created() {
-    if(this.$route.params.detailTitle){
-      this.text=this.$route.params.detailTitle
+    if (this.$route.params.detailTitle) {
+      this.text = this.$route.params.detailTitle;
     }
     this.id = this.$route.params.id;
     if (this.id) {
       this.postDetail();
     }
-    
   },
   methods: {
     // 请求台账信息
@@ -479,13 +497,14 @@ export default {
         message: "加载中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0
+        duration: 0,
       });
       standBookDetail(`/hdreport/hdDetailsApp/${this.id}`)
-        .then(res => {
+        .then((res) => {
           this.$toast.clear();
           this.hdReport = res.data.hdReport;
-          this.hdConfirm = res.data.hdConfirm;
+          this.hdLogListAll = res.data.hdConfirm;
+          this.hdConfirm = this.hdLogListAll.slice(-1);
           this.hdRectificationList = res.data.hdRectificationList;
           this.hdReviewList = res.data.hdReviewList;
           this.beifenhdMajorList = res.data.hdMajorApproveList;
@@ -514,22 +533,26 @@ export default {
     confirmReverse() {
       this.confirmOpen = !this.confirmOpen;
       if (this.confirmOpen) {
+        //   显示所有数据
         this.confirmOpenText = "收起 ▲";
+        // 显示所有数据
+        this.hdConfirm = this.hdLogListAll;
       } else {
         this.confirmOpenText = "展开 ▼";
+        // 只显示第一个数据
+        this.hdConfirm = this.hdLogListAll.slice(-1);
       }
     },
-
     // 重大隐患信息显示或隐藏
     majorReverse() {
-      this. majorOpen = !this. majorOpen;
-      if (this. majorOpen) {
+      this.majorOpen = !this.majorOpen;
+      if (this.majorOpen) {
         //   显示所有数据
-        this. majorOpenText = "收起 ▲";
+        this.majorOpenText = "收起 ▲";
         // 显示所有数据
         this.hdMajorApproveList = this.beifenhdMajorList;
       } else {
-        this. majorOpenText = "展开 ▼";
+        this.majorOpenText = "展开 ▼";
         // 只显示第一个数据
         this.hdMajorApproveList = this.beifenhdMajorList.slice(-1);
       }
@@ -561,8 +584,8 @@ export default {
         this.superviseOpenText = "展开 ▼";
         this.instructionsList = this.beifeninstructionsList.slice(-1);
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="less" scoped>
@@ -575,7 +598,7 @@ export default {
   }
   p {
     font-size: 0.4rem;
-    font-weight: 600;
+    font-weight: none;
     padding-left: 0.16rem;
     margin: 0.186667rem 0;
     color: #7f7f7f;
@@ -602,18 +625,18 @@ export default {
   }
   .info-title {
     color: #2980f7;
-    font-weight: bolder;
+    font-weight: none;
   }
   .field-title {
     color: black;
-    font-weight: bolder;
+    font-weight: none;
   }
   .more {
     position: absolute;
     bottom: 0.32rem;
     right: 15px;
     color: #2a80f7;
-    font-weight: bolder;
+    font-weight: none;
     z-index: 99;
   }
   .detail_pic {

src/views/danger/superviseDanger/index.vue

@@ -23,10 +23,10 @@
           <van-col span="5">隐患级别:</van-col>
           <van-col span="19">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <!-- *接口对接4 END -->
 
         <!-- 长按显示遮罩层 -->

src/views/danger/superviseDanger/superSurvey.vue

@@ -19,10 +19,10 @@
           <van-col span="7">隐患级别:</van-col>
           <van-col span="17">{{ item.hdLev }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="7">隐患发现时间:</van-col>
           <van-col span="17">{{ item.createTime }}</van-col>
-        </van-row>
+        </van-row> -->
         <!-- *接口对接4 END -->
         <!-- 详情 -->
       <div class="detail">详情</div>
@@ -153,7 +153,7 @@ export default {
   bottom: 0.32rem;
   right: 15px;
   color: #2a80f7;
-  font-weight: bolder;
+  font-weight: none;
   z-index: 99;
 }
 </style>

src/views/messageCenter/index.vue

@@ -69,7 +69,7 @@ export default {
   font-size: 17px;
   line-height: 1.333333rem;
   color: white;
-  font-weight: 600;
+  font-weight: none;
   text-align: center;
 }
 .con {

src/views/my/index.vue

@@ -104,7 +104,7 @@ export default {
   font-size: 17px;
   line-height: 50px;
   color: white;
-  font-weight: 600;
+  font-weight: none;
   text-align: center;
 }
 .con {
@@ -118,7 +118,7 @@ export default {
     justify-content: space-between;
     .user-name {
       font-size: 17px;
-      font-weight: bold;
+      font-weight: none;
     }
 
     .tag-wrap {
@@ -139,7 +139,7 @@ export default {
       span {
         margin-left: 0.2666rem;
         font-size: 15px;
-        font-weight: bold;
+        font-weight: none;
       }
     }
   }
@@ -156,7 +156,7 @@ export default {
   border-radius: 5px;
   button {
     font-size: 15px;
-    font-weight: bold;
+    font-weight: none;
   }
 }
 .van-cell-group--inset {

src/views/notice/noticeList/sign/index.vue

@@ -86,6 +86,6 @@ export default {
     }
     .page-footer p{
         font-size: 0.3rem;
-        font-weight: bolder;
+        font-weight: none;
     }
 </style>
\ No newline at end of file

src/views/risk/riskAccount/index.vue

@@ -24,10 +24,10 @@
           <van-col span="5">风险级别:</van-col>
           <van-col span="19">{{ item.riskLevel }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.startDate }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">风险源:</van-col>
           <van-col span="19">{{ item.riskSource }}</van-col>

src/views/risk/riskAccount/riskBigDetail.vue

@@ -8,7 +8,7 @@
         <van-cell-group inset >
           <van-row gutter="">
             <van-col span="7"
-              ><span class="field-title">所属工程名称:</span></van-col
+              ><span class="field-title">所属项目:</span></van-col
             >
             <van-col span="17">{{ riskMain.pId }}</van-col>
           </van-row>
@@ -316,7 +316,7 @@ export default {
   }
   p {
     font-size: 0.4rem;
-    font-weight: 600;
+    font-weight: none;
     padding-left: 0.16rem;
     margin: 0.186667rem 0;
     color: #7f7f7f;
@@ -340,18 +340,18 @@ export default {
   }
   .info-title {
     color: #2980f7;
-    font-weight: bolder;
+    font-weight: none;
   }
   .field-title {
     color: black;
-    font-weight: bolder;
+    font-weight: none;
   }
   .more {
     position: absolute;
     bottom: 0.32rem;
     right: 15px;
     color: #2a80f7;
-    font-weight: bolder;
+    font-weight: none;
     z-index: 99;
   }
 }

src/views/risk/riskAdd/index.vue

@@ -25,10 +25,10 @@
         clickable
         name="projectName"
         :value="projectName"
-        label="所属工程名称"
+        label="所属项目"
         placeholder="请选择"
         @click="showProjectName = true"
-        :rules="[{ required: true, message: '所属工程名称不能为空' }]"
+        :rules="[{ required: true, message: '所属项目不能为空' }]"
       />
       <van-popup v-model="showProjectName" position="bottom">
         <van-picker
@@ -544,7 +544,7 @@ export default {
         });
     },
 
-    // 所属工程名称
+    // 所属项目
     onConProjectName(value) {
       if (!value) {
         this.showProjectName = false;

src/views/risk/riskConfirme/index.vue

@@ -23,10 +23,10 @@
           <van-col span="5">风险级别:</van-col>
           <van-col span="19">{{ item.riskLevel }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.startDate }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">风险源:</van-col>
           <van-col span="19">{{ item.riskSource }}</van-col>

src/views/risk/riskConfirme/riskAffirm.vue

@@ -209,7 +209,7 @@ export default {
   bottom: 0.32rem;
   right: 15px;
   color: #2a80f7;
-  font-weight: bolder;
+  font-weight: none;
   z-index: 99;
 }
 </style>

src/views/risk/riskReturn/index.vue

@@ -22,10 +22,10 @@
           <van-col span="5">风险级别:</van-col>
           <van-col span="19">{{ item.riskLevel }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <!-- <van-row gutter="">
           <van-col span="5">发现时间:</van-col>
           <van-col span="19">{{ item.startDate }}</van-col>
-        </van-row>
+        </van-row> -->
         <van-row gutter="">
           <van-col span="5">风险源:</van-col>
           <van-col span="19">{{ item.riskSource }}</van-col>

src/views/saveWorkbench/index.vue

@@ -362,7 +362,7 @@ export default {
   font-size: 17px;
   line-height: 50px;
   color: white;
-  font-weight: 600;
+  font-weight: none;
   text-align: center;
 }
 .con {