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

src/views/danger/confirmeDanger/confirmeDanger.vue

@@ -233,8 +233,8 @@ export default {
       let formdata = new FormData();
       formdata.append("confirmResult", this.radio);
       formdata.append("endTime", values.endTime);
-      formdata.append("rectificationUser", this.rectId);
-      formdata.append("rectificationReview", this.reviewId);
+      formdata.append("rectificationUser", this.rectificationUser);
+      formdata.append("rectificationReview", this.rectificationReview);
       formdata.append("confirmOpinion", values.confirmOpinion);
       this.$toast.loading({
         message: "提交中...",

src/views/danger/reviewDanger/reviewAdd.vue

@@ -157,9 +157,11 @@ export default {
       formdata.append('reviewResult', this.radio)
       formdata.append('reviewDetails', values.reviewDetails)
       // 放图片路径 因为formdat存数组会自动变成字符串所以次用这种追加字段的方式
-      values.uploader.forEach(item => {
-        formdata.append("reviewPicture1[]", item.file);
-      });
+      if (values.uploader) {
+        values.uploader.forEach(item => {
+          formdata.append("reviewPicture1[]", item.file);
+        });
+      }
 
       dangerReviewAdd(`/review/add1/${this.taskId}`,formdata)
         .then(res => {

src/views/messageCenter/messageNews/index.vue

@@ -33,7 +33,7 @@
           :key="index"
           @click="touchstart(index, item)"
         >
-        <!--@touchend.prevent="touchend(index)"  长按备份-->
+          <!--@touchend.prevent="touchend(index)"  长按备份-->
           <div class="messgae-title">{{ item.noticeTitle }}</div>
           <div class="message-content">
             {{ item.upcomingUserName }},您好！您有一条来自{{
@@ -46,15 +46,19 @@
           <van-overlay :show="showIndex == index">
             <div class="wrapper" @click.stop>
               <van-button round type="primary" @click="goDetail(item)"
-              >详情</van-button
-            >
-             <!-- @touchstart="goDetail(item)" 长按备份-->
-            <van-button round type="info" @click="goConfirm(item)"
-              >整改</van-button
-            >
-            <van-button round type="warning" @click="read(item)" v-if="item.status == '未读'"
-              >已读</van-button
-            >
+                >详情</van-button
+              >
+              <!-- @touchstart="goDetail(item)" 长按备份-->
+              <van-button round type="info" @click="goConfirm(item)"
+                >整改</van-button
+              >
+              <van-button
+                round
+                type="warning"
+                @click="read(item)"
+                v-if="item.status == '未读'"
+                >已读</van-button
+              >
             </div>
           </van-overlay>
         </van-cell-group>
@@ -112,9 +116,7 @@ export default {
     },
 
     // 搜索事件
-    onSearch(val) {
-      console.log(val);
-    },
+    onSearch(val) {},
 
     // 封装全部 已读 和 未读的方法
     selectCategory(data) {
@@ -129,7 +131,6 @@ export default {
 
     // 点击消息条目时的点击事件 变成已读
     read(data) {
-      console.log("触发了点击事件");
       // 判断showIndex是否等于null 如果不等于则先将showIndex改为null
       this.showIndex = null;
       if (data.status == "未读") {
@@ -156,7 +157,7 @@ export default {
           // 向父组件发送消息条数
           this.$emit("messageLength", res.total);
           // 给消息列表赋值
-          this.messageList = res.rows
+          this.messageList = res.rows;
         }
       });
     },
@@ -219,12 +220,10 @@ export default {
 
     // 详情
     goDetail(data) {
-      console.log(data);
       this.showIndex = null;
     },
     // 整改
     goConfirm(data) {
-      console.log(123);
       this.showIndex = null;
     }
   }