修改了隐患等级全局过滤。

src/main.js

@@ -20,6 +20,8 @@ import { Divider, Popup, Overlay, Loading, Dialog, ContactCard, Form, AddressEdi
 Step, Steps  } from 'vant'
 import 'lib-flexible/flexible'
 import vueEsign from 'vue-esign'
+// 全局过滤器
+import filters from "@/utils/filters.js"
 Vue.use(vueEsign)
 Vue.prototype.util = util
 Vue.use(Divider).use(Popup).use(Overlay).use(Loading).use(Dialog).use(Toast).use(ContactCard).use(Form).use(AddressEdit).use(AddressList).use(Field).use(CellGroup).use(Cell).use(SwipeCell).use(Icon).use(Stepper).use(Card).use(Button).use(Swipe).use(SwipeItem).use(PullRefresh).use(List).use(Tab).use(Tabs).use(GoodsAction).use(GoodsActionIcon).use(GoodsActionButton).use(SubmitBar).use(Checkbox).use(CheckboxGroup).use(Search).use(Picker).use(Uploader).use(Notify)
@@ -43,3 +45,8 @@ Array.prototype.remove = function(val) {
     this.splice(index, 1);
   }
 }
+
+// 注册全局过滤器
+Object.keys(filters).forEach(key=>{
+  Vue.filter(key,filters[key])
+})

src/service/danger.js

@@ -292,6 +292,14 @@ export function myHDList(data){
     })
 }
 
+export function deal(url,data){
+    return request({
+        url,
+        method:'post',
+        data
+    })
+}
+
 
 
 

src/utils/filters.js

+// 隐患级别
+const dangerText = function(danger) {
+    // 严重隐患 = A
+
+    // 较大隐患 = B
+
+    // 危险隐患 = C
+
+    // 重大隐患 = S
+    switch(danger){
+        case 'A':
+            return '严重隐患'
+        case 'B':
+            return '较大隐患'
+        case 'C':
+            return '危险隐患'
+        case 'S':
+            return '重大隐患'
+        default:
+            return danger
+    }
+}
+export default{
+    dangerText
+}
\ No newline at end of file

src/views/danger/addDanger/addDanger.vue

 <template>
   <div>
     <LHeader :text="text"></LHeader>
-
     <van-form
       @submit="onSubmit"
       :scroll-to-error="true"
@@ -18,7 +17,6 @@
         type="textarea"
       />
 
-
       <van-field
         readonly
         clickable
@@ -123,7 +121,10 @@
         :value="findTime"
         label="隐患发现时间"
         placeholder="点击选择日期"
-        @click="showFindTime = true; currentDate = new Date()"
+        @click="
+          showFindTime = true;
+          currentDate = new Date();
+        "
         :rules="[{ required: true, message: '隐患发现时间不能为空' }]"
       />
       <van-popup v-model="showFindTime" position="bottom">
@@ -210,13 +211,24 @@
 
       <van-field name="hdPicture1" label="隐患照片">
         <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>
       </van-field>
 
       <van-field name="hdVideo1" 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>
       </van-field>
       <van-field
@@ -226,7 +238,10 @@
         :value="expireTime"
         label="隐患到期时间"
         placeholder="点击选择日期"
-        @click="showExpireTime = true; currentDate = new Date()"
+        @click="
+          showExpireTime = true;
+          currentDate = new Date();
+        "
       />
       <van-popup v-model="showExpireTime" position="bottom">
         <van-datetime-picker
@@ -255,7 +270,6 @@
           @cancel="showRecPeople = false"
         />
       </van-popup>
-
       <div style="margin: 16px 16px 0">
         <van-button round block type="info" native-type="submit"
           >上报</van-button
@@ -272,7 +286,7 @@
 
 <script>
 import LHeader from "@/components/header.vue";
-import {getFun,postFun} from "@/service/table.js";
+import { getFun, postFun } from "@/service/table.js";
 import { timestampToTime } from "@/utils/format";
 import {
   getFormList,
@@ -289,9 +303,10 @@ export default {
   components: {
     LHeader,
   },
-  activated(){
-    this.taskId = this.$route.params.taskId || localStorage.getItem('dangerAddTaskId');
-    console.log(this.taskId );
+  activated() {
+    this.taskId =
+      this.$route.params.taskId || localStorage.getItem("dangerAddTaskId");
+    console.log(this.taskId);
     if (this.taskId) {
       this.isShowreturnCause = true;
       this.text = "隐患上报退回";
@@ -301,16 +316,17 @@ export default {
   },
 
   mounted() {
-    this.$bus.$on("sourceAyy", res => {
+    this.$bus.$on("sourceAyy", (res) => {
+      setTimeout(() => {
         this.source1 = res.join(",");
         // 销毁一下监听事件 不然会越加越多
-      this.$bus.$off('riskLevelBus')
+        this.$bus.$off("riskLevelBus");
+      });
     });
   },
   beforeRouteLeave(to, from, next) {
     if (to.name != "choose-people") {
-      this.text = "新增隐患",
-      this.projectId = ""; // 所属工程
+      (this.text = "新增隐患"), (this.projectId = ""); // 所属工程
       this.taskId = "";
       this.projectName = "";
       this.showProjectName = false;
@@ -345,9 +361,9 @@ export default {
       this.columnsRecPeople = [];
       this.isShowreturnCause = false;
       this.returnCause = ""; // 退回原因
-      this.currentDate = new Date()
+      this.currentDate = new Date();
       // 清空 localStorage
-      localStorage.removeItem('dangerAddTaskId')
+      localStorage.removeItem("dangerAddTaskId");
     }
     next();
   },
@@ -390,20 +406,50 @@ export default {
       columnsRecPeople: [],
       isShowreturnCause: false,
       returnCause: "", // 退回原因
-      currentDate : new Date()
+      currentDate: new Date(),
     };
   },
 
   methods: {
-    onSubmit(values) {
+    dangerType(danger) {
+      // 严重隐患 = A
+
+      // 较大隐患 = B
+
+      // 危险隐患 = C
+
+      // 重大隐患 = S
+      switch (danger) {
+        case "A":
+          return "严重隐患";
+        case "B":
+          return "较大隐患";
+        case "C":
+          return "危险隐患";
+        case "S":
+          return "重大隐患";
+        case "严重隐患":
+          return "A";
+        case "较大隐患":
+          return "B";
+        case "危险隐患":
+          return "C";
+        case "重大隐患":
+          return "S";
+        default:
+          return danger;
+      }
+    },
 
+    onSubmit(values) {
       let formdata = new FormData();
       formdata.append("proId", this.projectId);
+      // formdata.append("projectName", this.projectName);
       formdata.append("hdRange", values.hdRange);
       formdata.append("hdType", values.hdType);
       formdata.append("hdProjectName", values.hdProjectName);
       formdata.append("hdProjectId", values.hdProjectId);
-      formdata.append("hdLev", values.hdLev);
+      formdata.append("hdLev", this.dangerType(values.hdLev));
       formdata.append("hdDiscoveryTime", values.hdDiscoveryTime);
       formdata.append("dangerId", values.dangerId);
       formdata.append("dangerSource", values.dangerSource);
@@ -411,20 +457,14 @@ export default {
       formdata.append("hdDescribe", values.hdDescribe);
       formdata.append("hdExpirationTime", values.hdExpirationTime);
       formdata.append("rectificationUser", values.rectificationUser);
-      // 放图片路径 因为formdat存数组会自动变成字符串所以次用这种追加字段的方式
 
-      // return false;
+      // 放图片路径 因为formdat存数组会自动变成字符串所以次用这种追加字段的方式
       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,
@@ -483,28 +523,39 @@ 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||[]
-
-
+          let msg = res.data.hdReport;
+          msg.hdPictureList=msg.hdPictureList||[];
+          msg.hdVideoList=msg.hdVideoList||[];
+          this.projectId = msg.proId;
+          this.projectName = res.data.projectInformations.filter(
+            (item) => item.id == msg.proId
+          )[0]["projectName"];
+          this.range = msg.hdRange;
+          this.type = msg.hdType;
+          this.dangerName = msg.hdProjectName;
+          this.dangerNum = msg.hdProjectId;
+          this.dangerLevel = this.dangerType(msg.hdLev);
+          this.source1 = this.source1 ? this.source1 : msg.dangerSource;
+          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.map(item=>{
+            return {
+              ...item,
+              url:item.filePath
+            }
+          })
+          this.uploaderVideo =  msg.hdVideoList.map(item=>{
+            return {
+              ...item,
+              url:item.filePath
+            }
+          })
         })
         .catch(() => {
           this.$toast.clear();
@@ -514,9 +565,9 @@ export default {
 
     // 所属项目
     onConProjectName(value) {
-      if(!value){
+      if (!value) {
         this.showProjectName = false;
-        return
+        return;
       }
       this.projectId = value.id;
       this.projectName = value.projectName;
@@ -528,9 +579,9 @@ export default {
     },
     // 适用范围
     onConRange(value) {
-      if(!value){
+      if (!value) {
         this.showRange = false;
-        return
+        return;
       }
       this.range = value.hdRange;
       this.showRange = false;
@@ -545,9 +596,9 @@ export default {
     },
     // 隐患类型
     onConType(value) {
-      if(!value){
+      if (!value) {
         this.showType = false;
-        return
+        return;
       }
       this.type = value.hdType;
       this.showType = false;
@@ -563,9 +614,9 @@ export default {
     },
     // 隐患项目名称
     onConDangerName(value) {
-      if(!value){
+      if (!value) {
         this.showDangerName = false;
-        return
+        return;
       }
       this.dangerName = value.hdName;
       this.showDangerName = false;
@@ -574,7 +625,7 @@ export default {
         `/hdreport/showHdInventories/${this.range}/${this.type}/${this.dangerName}`
       ).then((res) => {
         this.dangerNum = res.data[0].hdId;
-        this.dangerLevel = res.data[0].hdLev;
+        this.dangerLevel = this.dangerType(res.data[0].hdLev);
       });
     },
     // 隐患发现时间
@@ -585,9 +636,9 @@ export default {
     },
     // 风险源
     onConSource(value) {
-      if(!value){
+      if (!value) {
         this.showSource = false;
-        return
+        return;
       }
       this.source = value.factor;
       this.showSource = false;
@@ -599,10 +650,10 @@ export default {
       });
     },
     // 风险源第二个字段
-    onConSource1(value) {
-      this.source1 = value.riskSource;
-      this.showSource1 = false;
-    },
+    // onConSource1(value) {
+    //   this.source1 = value.riskSource;
+    //   this.showSource1 = false;
+    // },
     goSelectTwo() {
       if (this.source) {
         // 跳转到多选页面
@@ -624,9 +675,9 @@ export default {
     },
     // 隐患整改人
     onConRecPeople(value) {
-      if(!value){
+      if (!value) {
         this.showRecPeople = false;
-        return
+        return;
       }
       this.recPeople = value.userName;
       this.showRecPeople = false;

src/views/danger/changeDanger/changeInfo.vue

@@ -13,7 +13,7 @@
       </van-row>
       <van-row gutter="">
         <van-col span="6">隐患级别：</van-col>
-        <van-col span="18">{{ item.hdLev }}</van-col>
+        <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
       </van-row>
       <van-row gutter="">
         <van-col span="6">适用范围：</van-col>

src/views/danger/changeDanger/index.vue

@@ -42,7 +42,7 @@
             </van-row>
             <van-row gutter="">
               <van-col span="6">隐患级别：</van-col>
-              <van-col span="18">{{ item.hdLev }}</van-col>
+              <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
             </van-row>
             <!-- <van-row gutter="">
           <van-col span="6">发现时间：</van-col>
@@ -109,7 +109,7 @@
             </van-row>
             <van-row gutter="">
               <van-col span="6">隐患级别：</van-col>
-              <van-col span="18">{{ item.hdLev }}</van-col>
+              <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
             </van-row>
             <van-row gutter="">
               <van-col span="6">适用范围：</van-col>

src/views/danger/confirmeDanger/confirmeDanger.vue

@@ -13,7 +13,7 @@
       </van-row>
       <van-row gutter="">
         <van-col span="6">隐患级别：</van-col>
-        <van-col span="18">{{ item.hdLev }}</van-col>
+        <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
       </van-row>
       <van-row gutter="">
         <van-col span="6">适用范围：</van-col>
@@ -234,10 +234,10 @@ export default {
       }
       let formdata = new FormData();
       formdata.append("confirmResult", this.radio);
-      formdata.append("endTime", values.endTime);
-      formdata.append("rectificationUser", values.rectificationUser);
-      formdata.append("rectificationReview", values.rectificationReview);
-      formdata.append("confirmOpinion", values.confirmOpinion);
+      formdata.append("endTime", values.endTime?values.endTime:'');
+      formdata.append("rectificationUser", values.rectificationUser?values.rectificationUser:'');
+      formdata.append("rectificationReview", values.rectificationReview?values.rectificationReview:'');
+      formdata.append("confirmOpinion", values.confirmOpinion?values.confirmOpinion:'');
       this.$toast.loading({
         message: "提交中...",
         forbidClick: true,

src/views/danger/confirmeDanger/index.vue

@@ -31,7 +31,7 @@
         </van-row>
         <van-row gutter="">
           <van-col span="6">隐患级别：</van-col>
-          <van-col span="18">{{ item.hdLev }}</van-col>
+          <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
         </van-row>
         <!-- <van-row gutter="">
           <van-col span="6">发现时间：</van-col>

src/views/danger/delayApproval/index.vue

@@ -32,7 +32,7 @@
         </van-row>
         <van-row gutter="">
           <van-col span="6">隐患级别：</van-col>
-          <van-col span="18">{{ item.hdLev }}</van-col>
+          <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
         </van-row>
         <!-- <van-row gutter="">
           <van-col span="6">发现时间：</van-col>
@@ -135,9 +135,11 @@ export default {
     // 详情
     goDetail(data) {
       this.$router.push({
-        name: "risk-big-detail",
+        name: "normal-detail",
         params: {
           id: data.businessId,
+          api:'/delayApply/deal/',
+          method:'get'
         },
       });
       this.showIndex = null;

src/views/danger/insertDanger/list.vue

@@ -28,7 +28,7 @@
         </van-row>
         <van-row gutter="">
           <van-col span="6">隐患级别：</van-col>
-          <van-col span="18">{{ item.hdLev }}</van-col>
+          <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
         </van-row>
         <van-row gutter="">
           <van-col span="6">适用范围：</van-col>

src/views/danger/majorDanger/index.vue

@@ -32,7 +32,7 @@
         </van-row>
         <van-row gutter="">
           <van-col span="6">隐患级别：</van-col>
-          <van-col span="18">{{ item.hdLev }}</van-col>
+          <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
         </van-row>
         <!-- <van-row gutter="">
           <van-col span="6">发现时间：</van-col>

src/views/danger/majorDanger/majorSurvey.vue

@@ -19,7 +19,7 @@
         </van-row>
         <van-row gutter="">
           <van-col span="7">隐患级别：</van-col>
-          <van-col span="17">{{ item.hdLev }}</van-col>
+          <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
         </van-row>
         <!-- <van-row gutter="">
           <van-col span="7">发现时间：</van-col>
@@ -67,8 +67,8 @@
         clickable
         name="thinkHdLev"
         :value="thinkLevel"
-        label="认定隐患级别"
-        placeholder="重大隐患"
+        label="认定的隐患级别"
+        placeholder="请选择认定隐患级别"
         @click="showThinkLevel = true"
         :rules="[{ required: true, message: '认定隐患级别不能为空' }]"
       />
@@ -125,8 +125,8 @@ export default {
       text: "重大隐患审批",
       agreeOpinion: "",
       disagreeOpinion: "",
-      thinkLevel:'建议为严重隐患', //因为隐患级别
-      thinkHdLev:'建议为严重隐患',
+      thinkLevel:'', //因为隐患级别
+      thinkHdLev:'',
       showThinkLevel: false,
       columnsThinkLevel:["建议为严重隐患","建议为较大隐患","建议为危险隐患",]
 
@@ -162,7 +162,7 @@ export default {
       let formdata = new FormData()
       formdata.append('isResult', values.isResult)
       formdata.append('details', values.details)
-      formdata.append('thinkHdLev',values.isResult==1?'建议为严重隐患':values.thinkHdLev)
+      formdata.append('thinkHdLev',values.isResult==1?'':values.thinkHdLev)
       formdata.append('taskId', this.taskId)
       majorAdd(`/majorapprove/add`,formdata)
         .then(res => {

src/views/danger/managerDanger/index.vue

@@ -32,7 +32,7 @@
         </van-row>
         <van-row gutter="">
           <van-col span="6">隐患级别：</van-col>
-          <van-col span="18">{{ item.hdLev }}</van-col>
+          <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
         </van-row>
         <!-- <van-row gutter="">
           <van-col span="6">发现时间：</van-col>

src/views/danger/managerDanger/managerSurvey.vue

@@ -17,7 +17,7 @@
       </van-row>
       <van-row gutter="">
         <van-col span="7">隐患级别：</van-col>
-        <van-col span="17">{{ item.hdLev }}</van-col>
+        <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
       </van-row>
       <!-- <van-row gutter="">
         <van-col span="7">隐患发现时间：</van-col>

src/views/danger/reportReturn/index.vue

@@ -31,7 +31,7 @@
         </van-row>
         <van-row gutter="">
           <van-col span="6">隐患级别：</van-col>
-          <van-col span="18">{{ item.hdLev }}</van-col>
+          <van-col span="18">{{ item.hdLev | dangerText}}</van-col>
         </van-row>
         <!-- <van-row gutter="">
           <van-col span="6">发现时间：</van-col>

src/views/danger/reviewDanger/index.vue

@@ -31,7 +31,7 @@
         </van-row>
         <van-row gutter="">
           <van-col span="6">隐患级别：</van-col>
-          <van-col span="18">{{ item.hdLev }}</van-col>
+          <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
         </van-row>
         <!-- <van-row gutter="">
           <van-col span="6">发现时间：</van-col>

src/views/danger/reviewDanger/reviewAdd.vue

@@ -13,7 +13,7 @@
         </van-row>
         <van-row gutter="">
           <van-col span="6">隐患级别：</van-col>
-          <van-col span="18">{{ item.hdLev }}</van-col>
+          <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
         </van-row>
         <van-row gutter="">
           <van-col span="6">适用范围：</van-col>

src/views/danger/standBook/index.vue

@@ -31,7 +31,7 @@
         </van-row>
         <van-row gutter="">
           <van-col span="6">隐患级别：</van-col>
-          <van-col span="18">{{ item.hdLev }}</van-col>
+          <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
         </van-row>
         <!-- <van-row gutter="">
           <van-col span="6">发现时间：</van-col>

src/views/danger/standBook/normalDetail.vue

@@ -134,19 +134,19 @@
                     ><div class="info-title">隐患认定</div></van-col
                   >
                 </van-row>
-                <van-row gutter="">
+                <van-row gutter="" v-if="item.rectificationUser">
                   <van-col span="7"
                     ><span class="field-title">隐患整改人：</span></van-col
                   >
-                  <van-col span="17">{{ item.rectificationUser }}</van-col>
+                  <van-col span="17">{{ item.rectificationUser}}</van-col>
                 </van-row>
-                <van-row gutter="">
+                <van-row gutter="" v-if="item.rectificationReview">
                   <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-row gutter="" v-if="item.endTime">
                   <van-col span="8"
                     ><span class="field-title">整改截止时间：</span></van-col
                   >
@@ -450,7 +450,7 @@
 <script>
 import LHeader from "@/components/header.vue";
 import {getFun,postFun} from "@/service/table.js";
-import { standBookDetail } from "@/service/danger";
+import { standBookDetail,deal } from "@/service/danger";
 export default {
   components: {
     LHeader,
@@ -500,7 +500,7 @@ export default {
         loadingType: "spinner",
         duration: 0,
       });
-      standBookDetail(`/hdreport/hdDetailsApp/${this.id}`)
+      (this.$route.params.method=='get'?getFun:postFun)(`${this.$route.params.api?this.$route.params.api:'/hdreport/hdDetailsApp/'}${this.id}`)
         .then((res) => {
           this.$toast.clear();
           this.hdReport = res.data.hdReport;
@@ -515,7 +515,8 @@ export default {
           this.beifeninstructionsList = res.data.instructionsList;
           this.instructionsList = this.beifeninstructionsList.slice(-1);
         })
-        .catch(() => {
+        .catch((err) => {
+          console.log(err)
           this.$toast.clear();
           this.$toast.fail("加载失败,请稍后再试");
         });

src/views/danger/superviseDanger/index.vue

@@ -32,7 +32,7 @@
         </van-row>
         <van-row gutter="">
           <van-col span="6">隐患级别：</van-col>
-          <van-col span="18">{{ item.hdLev }}</van-col>
+          <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
         </van-row>
         <!-- <van-row gutter="">
           <van-col span="6">发现时间：</van-col>

src/views/danger/superviseDanger/superSurvey.vue

@@ -17,7 +17,7 @@
         </van-row>
         <van-row gutter="">
           <van-col span="7">隐患级别：</van-col>
-          <van-col span="17">{{ item.hdLev }}</van-col>
+          <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
         </van-row>
         <!-- <van-row gutter="">
           <van-col span="7">隐患发现时间：</van-col>

src/views/messageCenter/messageNews/index.vue

@@ -15,16 +15,16 @@
 
       <!-- 搜索 -->
       <div class="search-wrap">
-        <!-- <van-search
+        <van-search
           v-model="searchVal"
           show-action
-          placeholder="请输入检查名称"
+          placeholder="请输入消息内容"
           @search="onSearch"
         >
           <template #action>
             <div @click="onSearch">搜索</div>
           </template>
-        </van-search> -->
+        </van-search>
         <!-- <van-search v-model="searchVal" placeholder="搜索" @search="onSearch" /> -->
       </div>
       <!-- 内容列表 -->
@@ -42,9 +42,10 @@
           :key="index"
           @click="touchstart(index, item)"
         >
-        
           <!--@touchend.prevent="touchend(index)"  长按备份-->
-          <div class="messgae-title"><span>{{ item.noticeTitle }}</span> <span>{{item.sendTime}}</span> </div>
+          <div class="messgae-title">
+            <span>{{ item.noticeTitle }}</span> <span>{{ item.sendTime }}</span>
+          </div>
           <div class="message-content">
             {{ item.upcomingUserName }},您好！您有一条来自{{
               item.createUserName
@@ -54,7 +55,7 @@
           <!-- 长按显示遮罩层 -->
 
           <van-overlay :show="showIndex == index" v-if="item.status == '未读'">
-            <div class="wrapper" @click.stop ="showIndex = null">
+            <div class="wrapper" @click.stop="showIndex = null">
               <!-- <van-button round type="primary" @click="goDetail(item)"
                 >查看</van-button
               > -->
@@ -84,16 +85,16 @@ export default {
       messageCategory: [
         {
           key: "0",
-          category: "未读"
+          category: "未读",
         },
         {
           key: "1",
-          category: "已读"
+          category: "已读",
         },
         {
           key: "2",
-          category: "全部"
-        }
+          category: "全部",
+        },
       ],
       activeIndex: 0,
       activeVal: "未读",
@@ -104,7 +105,7 @@ export default {
       // finished: false // 列表数据全部加载完成
 
       Loop: "", // 定时器
-      showIndex: null // 是否显示遮罩层
+      showIndex: null, // 是否显示遮罩层
     };
   },
   created() {
@@ -123,21 +124,25 @@ export default {
 
     // 搜索事件
     onSearch(val) {
-      // console.log(this.searchVal);
-      // if(this.showIndex==2){
-        
-      // }else{
-
-      // }
+      this.selectCategory(this.activeVal, this.searchVal);
     },
 
     // 封装全部 已读 和 未读的方法
-    selectCategory(data) {
+    selectCategory(data, val = "") {
       if (data == "全部") {
+        if (val) {
+          let formData = new FormData();
+          formData.append("noticeContent", val);
+          this.getMessageList(formData);
+        } else {
           this.getMessageList();
+        }
       } else {
         let formData = new FormData();
         formData.append("status", data);
+        if (val) {
+          formData.append("noticeContent", val);
+        }
         this.getMessageList(formData);
       }
     },
@@ -149,7 +154,7 @@ export default {
       if (data.status == "未读") {
         let formData = new FormData();
         formData.append("ids", data.pid);
-        noticeRemove("/mobile/noticeRemove", formData).then(res => {
+        noticeRemove("/mobile/noticeRemove", formData).then((res) => {
           if (res.code == 0) {
             // 如果请求接口成功 则重新请求一下未读消息的条数
             this.unRead();
@@ -165,7 +170,7 @@ export default {
     unRead() {
       let formData = new FormData();
       formData.append("status", "未读");
-      postMessgaelist("/mobile/notice", formData).then(res => {
+      postMessgaelist("/mobile/notice", formData).then((res) => {
         if (res.code == 0) {
           // 向父组件发送消息条数
           this.$emit("messageLength", res.total);
@@ -177,7 +182,7 @@ export default {
 
     // 请求消息接口方法
     getMessageList(data) {
-      postMessgaelist("/mobile/notice", data).then(res => {
+      postMessgaelist("/mobile/notice", data).then((res) => {
         this.messageList = res.rows;
       });
     },
@@ -235,8 +240,7 @@ export default {
     goDetail(data) {
       this.showIndex = null;
     },
-   
-  }
+  },
 };
 </script>
 <style lang="less" scoped>
@@ -276,14 +280,14 @@ export default {
   }
   //  内容
   .con-list {
-    margin-top: .266667rem;
+    margin-top: 0.266667rem;
     .van-cell-group--inset {
       margin: 0;
       margin-bottom: 10px;
       padding: 10px;
       font-size: 13px;
       position: relative;
-      .messgae-title{
+      .messgae-title {
         display: flex;
         justify-content: space-between;
         align-items: center;

src/views/messageCenter/noticeInfo/index.vue

@@ -18,7 +18,7 @@
 
       <!-- 搜索 -->
       <div class="search-wrap">
-        <van-search
+        <!-- <van-search
           v-model="searchVal"
           show-action
           placeholder="请输入检查名称"
@@ -27,7 +27,7 @@
           <template #action>
             <div @click="onSearch">搜索</div>
           </template>
-        </van-search>
+        </van-search> -->
         <!-- <van-search
           v-model="searchVal"
           placeholder="搜索"

src/views/messageCenter/waitEvent/index.vue

@@ -18,7 +18,7 @@
 
       <!-- 搜索 -->
       <div class="search-wrap">
-        <!-- <van-search
+        <van-search
           v-model="searchVal"
           show-action
           placeholder="请输入检查名称"
@@ -27,8 +27,7 @@
           <template #action>
             <div @click="onSearch">搜索</div>
           </template>
-        </van-search> -->
-        <!-- <van-search v-model="searchVal" placeholder="搜索" @search="onSearch" /> -->
+        </van-search>
       </div>
 
       <!-- 内容列表 -->