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

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/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>
@@ -60,6 +60,10 @@
               <van-col span="6">超期标识：</van-col>
               <van-col span="18">{{ item.dueDate | formatTime }}</van-col>
             </van-row>
+            <van-row gutter="">
+              <van-col span="6">状态：</van-col>
+              <van-col span="18">{{ item.taskName }}</van-col>
+            </van-row>
 
             <!-- 长按显示遮罩层 -->
             <van-overlay :show="showIndex == index">
@@ -103,13 +107,17 @@
             :key="index"
             @click="touchstart(index, item)"
           >
+            <van-row gutter="">
+              <van-col span="6">隐患编号：</van-col>
+              <van-col span="18">{{ item.businessId }}</van-col>
+            </van-row>
             <van-row gutter="">
               <van-col span="6">所属项目：</van-col>
               <van-col span="18">{{ item.proId }}</van-col>
             </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,7 +135,7 @@ export default {
     // 详情
     goDetail(data) {
       this.$router.push({
-        name: "risk-big-detail",
+        name: "normal-detail",
         params: {
           id: data.businessId,
         },

src/views/danger/delayApproval/ratifyInfo.vue

@@ -12,8 +12,8 @@
         readonly
         name="applyDate"
         label="延期时间"
-        placeholder="请输入"
-        :rules="[{ required: true, message: '延期时间不能为空' }]"
+        placeholder="空"
+        
       />
 
       <van-field
@@ -24,6 +24,7 @@
         rows="1"
         autosize
         type="textarea"
+        placeholder="空"
       />
 
       <van-field name="isAgree" label="延期是否通过">
@@ -79,7 +80,7 @@ export default {
       delayTime: "", // 延迟时间
       showDelayTime: false,
       delayApply: "", // 延迟理由
-      isAgree: 1, // 延期是否通过
+      isAgree: '1', // 延期是否通过
       opinion: "", //理由或者意见
       applyDate: "", //延期时间
       applyReason: "", //延期理由
@@ -98,8 +99,9 @@ export default {
       loadingType: "spinner",
       duration: 0,
     });
+    // console.log(this.isAgree)
     let formdata = new FormData();
-    formdata.append("examineResult", values.examineResult);
+    formdata.append("examineResult", this.isAgree*1);
     formdata.append("examineReason", values.examineReason);
     formdata.append("taskId", this.taskId);
     delayEdit(`/delayApply/edit`, formdata)

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

@@ -9,15 +9,15 @@
     >
       <van-row gutter="">
         <van-col span="7">隐患编号：</van-col>
-        <van-col span="17">{{ item.hdProjectId }}</van-col>
+        <van-col span="17">{{ item.pid }}</van-col>
       </van-row>
       <van-row gutter="">
-        <van-col span="7">隐患项目名称：</van-col>
+        <van-col span="7">所属项目：</van-col>
         <van-col span="17">{{ item.projectName }}</van-col>
       </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
@@ -53,8 +54,8 @@
 
           <!-- 长按显示遮罩层 -->
 
-          <van-overlay :show="showIndex == index"  v-if="item.status == '未读'">
-            <div class="wrapper" @click.stop ="showIndex = null">
+          <van-overlay :show="showIndex == index" v-if="item.status == '未读'">
+            <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 == "全部") {
-        this.getMessageList();
+        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>
 
       <!-- 内容列表 -->