巡检优化

src/views/Inspection.vue

@@ -4,7 +4,7 @@
       <div class="demo">
         <div class="header">巡检列表</div>
         <div class="seatchHeader">
-          <div class="search fl">
+          <!-- <div class="search fl">
             <input
               class="searchInp"
               type="text"
@@ -13,7 +13,19 @@
               @input="searchData()"
             />
           </div>
-          <button class="selectBtn fr" @click="showPicker">筛选</button>
+          <button class="selectBtn fr" @click="showPicker">筛选</button> -->
+          <cube-select
+          class="stateSearch"
+          v-model="searchType"
+          :options="searchsType"
+          @change="stateChange()"
+        ></cube-select>
+        <cube-select
+          class="stateSearch"
+          v-model="searchType1"
+          :options="searchsType1"
+          @change="stateChange()"
+        ></cube-select>
         </div>
         <div class="scroll-list-wrap">
           <cube-scroll
@@ -23,12 +35,6 @@
             @pulling-down="onPullingDown"
             @pulling-up="onPullingUp"
           >
-            <!-- <cube-select
-              class="fr"
-              v-model="stateValue"
-              :options="stateData"
-              @change="stateChange()"
-            ></cube-select>-->
             <div class="conentBox">
               <div
                 class="conent"
@@ -57,6 +63,10 @@
                       item.inspection.title
                     }}</span>
                   </p>
+                  <p>
+                    <span class="fl">巡检范围：</span>
+                    <span class="grayFont overflowEllipsis2">{{item.online?"线上巡检-":(item.online===false?"线下巡检-":"")}}{{item.inspectionType.type}}</span>
+                  </p>
                 </div>
                 <div class="bottom">
                   <i
@@ -122,7 +132,6 @@ import LoadIng from "./../views/loading.vue";
 export default {
   data() {
     return {
-      //   items: _foods,
       loginUser: JSON.parse(localStorage.getItem("loginUser")),
       menu: JSON.parse(localStorage.getItem("menu")),
       valConfig: JSON.parse(localStorage.getItem("valConfig")) - 0, //报修主体
@@ -138,7 +147,8 @@ export default {
       customPullDown: true,
       wushuju: false,
       title: "", //搜索内容
-      stateData: [
+      searchType: "todo",
+      searchsType: [
         {
           text: "全部",
           value: "all"
@@ -152,7 +162,13 @@ export default {
           value: "done"
         }
       ],
-      stateValue: "todo",
+      searchType1: "all",
+      searchsType1: [
+        {
+          text: "全部",
+          value: "all"
+        }
+      ],
       sum: 10,
       idx: 0,
       stateClass: "",
@@ -196,6 +212,25 @@ export default {
     }
   },
   methods: {
+    // 获取巡检范围
+    getInspectionType(){
+      const postData = {"idx":0, "sum":1000, inspectionType: {hierarchy: 1}};
+      this.$http
+        .post("service/bpm/data/fetchDataList/inspectionType",postData)
+        .then((res) => {
+          if(res.data.status == 200){
+            this.searchsType1 = this.searchsType1.concat(res.data.list.map(v => ({text:v.type, value: v.id})));
+            console.log('searchsType1=>', this.searchsType1)
+          }
+        })
+    },
+    stateChange() {
+      this.loadShow = true;
+      this.items = [];
+      this.idx = 0;
+      this.sum = 10;
+      this.getData();
+    },
     // 查看详情
     toDetail(item) {
       console.log(item);
@@ -286,14 +321,14 @@ export default {
       console.log(this.$route.params.state)
       if (this.$route.params.state) {
         console.log(this.$route.params.state);
-        this.stateValue = this.$route.params.state;
+        this.searchType = this.$route.params.state;
       }
     },
     showPicker() {
       if (!this.picker) {
         this.picker = this.$createPicker({
           title: "",
-          data: [this.stateData],
+          data: [this.searchsType],
           selectedIndex: [1],
           onSelect: this.selectHandle,
           onCancel: this.cancelHandle
@@ -304,7 +339,7 @@ export default {
     selectHandle(selectedVal, selectedIndex, selectedText) {
       console.log(selectedVal, selectedIndex, selectedText);
 
-      this.stateValue = selectedVal[0];
+      this.searchType = selectedVal[0];
       this.items = [];
       this.getData();
     },
@@ -317,7 +352,7 @@ export default {
     },
     // 获取列表
     getData() {
-      console.log(this.stateValue);
+      console.log(this.searchType);
       var that = this;
       // that.items.length=0;
       if (that.searching) {
@@ -332,14 +367,15 @@ export default {
           //   title: that.title,
           //   executeUser: { id: that.loginUser.id }
           // }
-          typeSearch: that.title
+          typeSearch: that.title,
+          inspectionTypeId: that.searchType1 === 'all' ? undefined :that.searchType1,
           // processUser:{
           //   id:that.loginUser.id
           // }
         },
-        searchType: that.stateValue
+        searchType: that.searchType
       };
-      if (that.stateValue === "todo") {
+      if (that.searchType === "todo") {
         // 待处理添加筛选条件
         console.log(postData, "2022年5月30日");
         postData.candidateGroups = that.loginUser.group
@@ -424,6 +460,7 @@ export default {
   },
   created() {
     this.getParamsState();
+    this.getInspectionType();
     this.getData(this.idx, this.sum);
   }
 };
@@ -439,6 +476,15 @@ export default {
   padding-top: 1.76rem;
 }
 
+.cube-select {
+  height: 0.88rem;
+  line-height: 0.88rem;
+  padding: 0 0.24rem;
+  font-size: 0.36rem;
+  color: #333333;
+  border-bottom: 0.08rem solid #e5e5e5;
+}
+
 .foods-wrapper {
   .food-item {
     display: flex;
@@ -640,14 +686,17 @@ export default {
     z-index: 6;
   }
   .seatchHeader {
+    display: flex;
     width: 100%;
     background-color: #eee;
-    padding: 0.16rem;
     overflow: hidden;
     position: fixed;
     top: 0.88rem;
     z-index: 6;
     box-sizing: border-box;
+    .stateSearch{
+      flex: 1;
+    }
     .search {
       width: 5.74rem;
       height: 0.56rem;