修改了搜索切换tab不带参数的bug

src/views/danger/addDanger/addDanger.vue

@@ -3,7 +3,11 @@
         <LHeader :text="text"></LHeader>
         <!-- 视屏 -->
         <div v-if="videoUrl">
-        <custom-player :videoUrl="videoUrl" :videoImg="videoImg" @close="videoUrl=''"/>
+            <custom-player
+                :videoUrl="videoUrl"
+                :videoImg="videoImg"
+                @close="videoUrl = ''"
+            />
         </div>
         <van-form
             @submit="onSubmit"
@@ -86,7 +90,11 @@
                 :rules="[{ required: true, message: '隐患类型不能为空' }]"
                 :class="{ gray: isShowreturnCause }"
             />
-      <van-popup v-model="showType" position="bottom" v-if="!isShowreturnCause">
+            <van-popup
+                v-model="showType"
+                position="bottom"
+                v-if="!isShowreturnCause"
+            >
                 <van-picker
                     show-toolbar
                     value-key="hdType"
@@ -187,28 +195,6 @@
                     @cancel="showSource = false"
                 />
             </van-popup>
-
-      <!-- <van-field
-        readonly
-        clickable
-        name="dangerSource"
-        :value="source1"
-        label=" "
-        @click="showSource1 = true"
-        placeholder="请选择"
-        :rules="[{ required: true, message: '风险源不能为空' }]"
-      />
-      
-      <van-popup v-model="showSource1" position="bottom">
-        <van-picker
-          show-toolbar
-          value-key="riskSource"
-          :columns="columnsSource1"
-          @confirm="onConSource1"
-          @cancel="showSource1 = false"
-        />
-      </van-popup> -->
-
             <van-field
                 v-model="source1"
                 readonly
@@ -244,7 +230,7 @@
             <van-field name="hdPicture1" label="隐患照片">
                 <template #input>
                     <van-uploader
-            @delete="deleteFile(...arguments,'uploaderImg')"
+                        @delete="deleteFile(...arguments, 'uploaderImg')"
                         multiple
                         :max-count="5"
                         upload-text="最多上传五个"
@@ -268,7 +254,9 @@
                                     alt=""
                                     style="width: 0.64rem; height: 0.64rem"
                                 />
-                <span class="van-uploader__upload-text">最多上传五个</span>
+                                <span class="van-uploader__upload-text"
+                                    >最多上传五个</span
+                                >
                             </div>
                         </template>
                     </van-uploader>
@@ -279,7 +267,7 @@
                 <template #input>
                     <van-uploader
                         multiple
-             @delete="deleteFile(...arguments,'uploaderVideo')"
+                        @delete="deleteFile(...arguments, 'uploaderVideo')"
                         :max-count="5"
                         upload-text="最多上传五个"
                         v-model="uploaderVideo"
@@ -304,7 +292,9 @@
                                     alt=""
                                     style="width: 0.64rem; height: 0.64rem"
                                 />
-                <span class="van-uploader__upload-text">最多上传五个</span>
+                                <span class="van-uploader__upload-text"
+                                    >最多上传五个</span
+                                >
                             </div>
                         </template>
                     </van-uploader>
@@ -367,7 +357,7 @@
 import LHeader from "@/components/header.vue";
 import { getFun, postFun } from "@/service/table.js";
 import { timestampToTime } from "@/utils/format";
-import customPlayer from "@/components/video"
+import customPlayer from "@/components/video";
 import {
     getFormList,
     postHdTyp,
@@ -382,11 +372,12 @@ export default {
     name: "add-danger",
     components: {
         LHeader,
-    customPlayer
+        customPlayer,
     },
     activated() {
         this.taskId =
-    this.$route.params.taskId || localStorage.getItem("dangerAddTaskId");
+            this.$route.params.taskId ||
+            localStorage.getItem("dangerAddTaskId");
         console.log(this.taskId);
         if (this.taskId) {
             this.isShowreturnCause = true;
@@ -452,7 +443,7 @@ export default {
     data() {
         return {
             // 视频预览地址
-      videoUrl:'',
+            videoUrl: "",
 
             id: 0,
             text: "新增隐患",
@@ -497,29 +488,29 @@ export default {
 
     methods: {
         // 点击预览图
-    clickPre(e){
-      console.log(e)
-      if(e.filePath){
-        this.videoUrl=e.filePath;
-      }else{
-        this.videoUrl=e.content;
+        clickPre(e) {
+            console.log(e);
+            if (e.filePath) {
+                this.videoUrl = e.filePath;
+            } else {
+                this.videoUrl = e.content;
             }
         },
-    async deleteFile(val,detail,key){
+        async deleteFile(val, detail, key) {
             // console.log(val,detail)
-      if(val.fileId){
-        let formdata= new FormData();
-        formdata.append('key',val['fileId'])
-        let res = await postFun('/mobile/remove',formdata);
-        if(res){
+            if (val.fileId) {
+                let formdata = new FormData();
+                formdata.append("key", val["fileId"]);
+                let res = await postFun("/mobile/remove", formdata);
+                if (res) {
                     console.log(res);
                     this.$toast({
-            title:'提示',
-            message:'删除成功!'
-          })
+                        title: "提示",
+                        message: "删除成功!",
+                    });
                 } else {
-          console.log('删除失败');
-          this[key].splice(detail.index,0,val)
+                    console.log("删除失败");
+                    this[key].splice(detail.index, 0, val);
                 }
             }
         },
@@ -568,8 +559,11 @@ export default {
             formdata.append("dangerSource", values.dangerSource);
             formdata.append("hdPosition", values.hdPosition);
             formdata.append("hdDescribe", values.hdDescribe);
-      formdata.append("hdExpirationTime", values.hdExpirationTime||'');
-      formdata.append("rectificationUser", values.rectificationUser||'');
+            formdata.append("hdExpirationTime", values.hdExpirationTime || "");
+            formdata.append(
+                "rectificationUser",
+                values.rectificationUser || ""
+            );
             console.log(values.hdPicture1, "这是要上传的文件");
             // 放图片路径 因为formdat存数组会自动变成字符串所以次用这种追加字段的方式
             values.hdPicture1.forEach((item) => {
@@ -655,30 +649,38 @@ export default {
                     this.dangerName = msg.hdProjectName;
                     this.dangerNum = msg.hdProjectId;
                     this.dangerLevel = this.dangerType(msg.hdLev);
-          this.source1 = this.source1 ? this.source1 : msg.dangerSource;
+                    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 = (res.data.imgsysFiles || []).map((item) => {
+                    this.uploaderImg = (res.data.imgsysFiles || []).map(
+                        (item) => {
                             return {
                                 ...item,
                                 url: item.filePath,
                             };
-          });
+                        }
+                    );
                     console.log(this.uploaderImg);
-          this.uploaderVideo = (res.data.videosysFiles || []).map((item) => {
+                    this.uploaderVideo = (res.data.videosysFiles || []).map(
+                        (item) => {
                             return {
                                 ...item,
                                 url: item.filePath,
                             };
-          });
+                        }
+                    );
 
-          postHdShowPeople(`/hdreport/showPeople/${msg.proId}`).then((res) => {
+                    postHdShowPeople(`/hdreport/showPeople/${msg.proId}`).then(
+                        (res) => {
                             this.columnsRecPeople = res.data;
-          });
+                        }
+                    );
                 })
                 .catch((err) => {
                     console.log(err);
@@ -697,9 +699,11 @@ export default {
             this.projectName = value.projectName;
             this.showProjectName = false;
             // 这里请求隐患整改人接口
-      postHdShowPeople(`/hdreport/showPeople/${this.projectId}`).then((res) => {
+            postHdShowPeople(`/hdreport/showPeople/${this.projectId}`).then(
+                (res) => {
                     this.columnsRecPeople = res.data;
-      });
+                }
+            );
         },
         // 适用范围
         onConRange(value) {
@@ -773,11 +777,6 @@ export default {
                 this.columnsSource1 = res.data;
             });
         },
-    // 风险源第二个字段
-    // onConSource1(value) {
-    //   this.source1 = value.riskSource;
-    //   this.showSource1 = false;
-    // },
         goSelectTwo() {
             if (this.source) {
                 // 跳转到多选页面

src/views/danger/changeDanger/index.vue

@@ -19,13 +19,13 @@
         <van-tabs
             v-model="active"
             @change="
-                postList();
+                postList(searchValue);
                 showIndex = null;
             "
             color="#2980f7"
             animated
             :sticky="true"
-            offset-top="3rem"
+            offset-top="2.93rem"
         >
             <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
                 <!-- 内容列表 -->

src/views/danger/confirmeDanger/index.vue

@@ -17,13 +17,13 @@
         <van-tabs
             v-model="active"
             @change="
-                postList();
+                postList(searchValue);
                 showIndex = null;
             "
             color="#2980f7"
             animated
             :sticky="true"
-            offset-top="3rem"
+            offset-top="2.93rem"
         >
             <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
                 <!-- 内容列表 -->
@@ -36,7 +36,9 @@
                     >
                         <van-row gutter="">
                             <van-col span="7">隐患单编号：</van-col>
-                            <van-col span="17">{{ item.businessId||item.id }}</van-col>
+                            <van-col span="17">{{
+                                item.businessId || item.id
+                            }}</van-col>
                         </van-row>
                         <van-row gutter="">
                             <van-col span="7">所属项目：</van-col>
@@ -75,7 +77,7 @@
                                 >
                                 <van-button
                                     round
-                                    v-if="active==0"
+                                    v-if="active == 0"
                                     type="info"
                                     @click="goConfirm(item)"
                                     >确认</van-button
@@ -149,10 +151,10 @@ export default {
             });
             let formdata = new FormData();
             formdata.append("select", select);
-            postFun(this.tabs[this.active]['api'], formdata)
+            postFun(this.tabs[this.active]["api"], formdata)
                 .then((res) => {
                     this.$toast.clear();
-                    this.messageList = res.data||res.rows;
+                    this.messageList = res.data || res.rows;
                     // 判断有无数据返回
                     if (this.messageList.length == 0) {
                         this.isHaveNews = true;
@@ -176,7 +178,7 @@ export default {
             this.$router.push({
                 name: "normal-detail",
                 params: {
-                    id: data.taskId||data.id,
+                    id: data.taskId || data.id,
                 },
             });
             this.showIndex = null;
@@ -229,7 +231,7 @@ export default {
         }
     }
 }
-/deep/.van-tab__pane{
+/deep/.van-tab__pane {
     min-height: 8rem;
 }
 </style>

src/views/danger/delayApproval/index.vue

@@ -20,13 +20,13 @@
         <van-tabs
             v-model="active"
             @change="
-                getList();
+                getList(searchValue);
                 showIndex = null;
             "
             color="#2980f7"
             animated
             :sticky="true"
-            offset-top="3rem"
+            offset-top="2.93rem"
         >
             <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
                 <div

src/views/danger/majorDanger/index.vue

@@ -20,13 +20,13 @@
         <van-tabs
             v-model="active"
             @change="
-                getList();
+                getList(searchValue);
                 showIndex = null;
             "
             color="#2980f7"
             animated
             :sticky="true"
-            offset-top="3rem"
+            offset-top="2.93rem"
         >
             <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
                 <div class="con-list" @touchmove="showIndex = null">

src/views/danger/reviewDanger/index.vue

@@ -19,13 +19,13 @@
         <van-tabs
             v-model="active"
             @change="
-                postList();
+                postList(searchValue);
                 showIndex = null;
             "
             color="#2980f7"
             animated
             :sticky="true"
-            offset-top="3rem"
+            offset-top="2.93rem"
         >
             <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
                 <div class="con-list" @touchmove="showIndex = null">

src/views/danger/standBook/index.vue

@@ -18,14 +18,14 @@
         <!-- tab标签 -->
         <van-tabs
             v-model="active"
-            @change="postList"
+            @change="postList(searchValue);showIndex=null"
             color="#2980f7"
             animated
             :sticky="true"
-            offset-top="3rem"
+            offset-top="2.93rem"
         >
             <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title"  :sticky="true"
-            offset-top="3rem">
+            offset-top="2.93rem">
                 <div v-show="key == active">
                     <div class="con-list" @touchmove="showIndex = null">
                         <van-cell-group

src/views/danger/standBook/normalDetail.vue

@@ -29,14 +29,6 @@
                         >
                         <van-col span="18">{{ hdReport.proId }}</van-col>
                     </van-row>
-                    <van-row gutter="">
-                        <van-col span="6"
-                            ><span class="field-title"
-                                >隐患级别：</span
-                            ></van-col
-                        >
-                        <van-col span="18">{{ hdReport.hdLev }}</van-col>
-                    </van-row>
                     <van-row gutter="">
                         <van-col span="6"
                             ><span class="field-title"
@@ -53,7 +45,7 @@
                         >
                         <van-col span="18">{{ hdReport.hdType }}</van-col>
                     </van-row>
-                    <!-- hdProjectId -->
+
                     <van-row gutter="">
                         <van-col span="6"
                             ><span class="field-title"
@@ -62,8 +54,14 @@
                         >
                         <van-col span="18">{{ hdReport.hdProjectId }}</van-col>
                     </van-row>
-                    <!-- 隐藏的字段 -->
-                    <div v-show="reportOpen">
+                    <van-row gutter="">
+                        <van-col span="6"
+                            ><span class="field-title"
+                                >隐患级别：</span
+                            ></van-col
+                        >
+                        <van-col span="18">{{ hdReport.hdLev }}</van-col>
+                    </van-row>
                     <van-row gutter="">
                         <van-col span="6"
                             ><span class="field-title"
@@ -74,6 +72,11 @@
                             hdReport.hdProjectName
                         }}</van-col>
                     </van-row>
+
+                    <!-- hdProjectId -->
+
+                    <!-- 隐藏的字段 -->
+                    <div v-show="reportOpen">
                         <van-row gutter="">
                             <van-col span="6"
                                 ><span class="field-title"
@@ -84,7 +87,6 @@
                                 hdReport.hdDiscoveryTime
                             }}</van-col>
                         </van-row>
-
                         <van-row gutter="">
                             <van-col span="6"
                                 ><span class="field-title"
@@ -103,6 +105,7 @@
                             >
                             <van-col span="18">{{ hdReport.dangerId }}</van-col>
                         </van-row>
+
                         <van-row gutter="">
                             <van-col span="6"
                                 ><span class="field-title"
@@ -123,6 +126,7 @@
                                 hdReport.hdDescribe
                             }}</van-col>
                         </van-row>
+
                         <van-row gutter="" v-if="hdReport.hdPictureList">
                             <van-col span="6"
                                 ><span class="field-title"
@@ -138,6 +142,7 @@
                                     :key="index"
                                 >
                                     <van-image
+                                        radius="6px"
                                         width="100"
                                         height="100"
                                         :src="item.filePath"
@@ -146,6 +151,7 @@
                                 </div>
                             </van-col>
                         </van-row>
+
                         <van-row gutter="">
                             <van-col span="6"
                                 ><span class="field-title"
@@ -164,8 +170,9 @@
                                     <van-icon
                                         name="play"
                                         size="1rem"
+                                        color="#fff"
                                         style="
-                                            border: solid 3px black;
+                                            border: solid 3px #fff;
                                             position: absolute;
                                             top: 50%;
                                             left: 50%;
@@ -215,7 +222,6 @@
                             v-for="(item, index) in hdConfirm"
                             :key="index"
                         >
-
                             <div class="step-wrap">
                                 <van-row>
                                     <van-col span="24"
@@ -412,6 +418,7 @@
                                 :key="index"
                             >
                                 <van-image
+                                    radius="0.16rem"
                                     width="100"
                                     height="100"
                                     :src="itemTwo.filePath"
@@ -431,7 +438,20 @@
                                 class="detail_video"
                                 v-for="(itemTwo, index) in item.hdVideoList"
                                 :key="index"
+                                 style="position: relative"
                             >
+                                <van-icon
+                                        name="play"
+                                        size="1rem"
+                                        color="#fff"
+                                        style="
+                                            border: solid 3px #fff;
+                                            position: absolute;
+                                            top: 50%;
+                                            left: 50%;
+                                            transform: translate(-50%, -50%);
+                                        "
+                                    />
                                 <video
                                     :src="itemTwo.filePath"
                                     @click="videoUrl = itemTwo.filePath"
@@ -490,6 +510,7 @@
                                 :key="index"
                             >
                                 <van-image
+                                    radius="0.16rem"
                                     width="100"
                                     height="100"
                                     :src="itemTwo.filePath"
@@ -876,19 +897,22 @@ export default {
         z-index: 99;
     }
     .detail_pic {
-        margin-right: 0.266667rem;
+        margin: 0 0.266667rem 0.266667rem 0;
         float: left;
+        border-radius: 6px;
+        overflow: hidden;
+        box-shadow: rgba(50, 50, 93, 0.25) 0px 13px 27px -5px, rgba(0, 0, 0, 0.3) 0px 8px 16px -8px;
     }
     .detail_video {
         width: 2.666667rem;
         height: 2.666667rem;
-        margin-right: 0.266667rem;
+        margin:0 0.266667rem 0.266667rem 0;
         float: left;
         overflow: hidden;
-        // video {
-        //   width: 2.666667rem;
-        //   height: 2.666667rem;
-        // }
+        box-shadow: rgba(50, 50, 93, 0.25) 0px 13px 27px -5px, rgba(0, 0, 0, 0.3) 0px 8px 16px -8px;
+        border-radius: 6px;
+        overflow: hidden;
+       
     }
 }
 

src/views/risk/riskAccount/index.vue

@@ -19,13 +19,13 @@
         <van-tabs
             v-model="active"
             @change="
-                getList();
+                getList(searchValue);
                 showIndex = null;
             "
             color="#2980f7"
             animated
             :sticky="true"
-            offset-top="3rem"
+            offset-top="2.93rem"
         >
             <van-tab
                 v-for="(item, key) in tabs"

src/views/risk/riskConfirme/index.vue

@@ -19,13 +19,13 @@
     <van-tabs
       v-model="active"
       @change="
-        postList();
+        postList(searchValue);
         showIndex = null;
       "
       color="#2980f7"
       animated
       :sticky="true"
-      offset-top="3rem"
+      offset-top="2.93rem"
     >
       <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
         <!-- 内容列表 -->