巡检扫码

http/api.js

@@ -238,6 +238,13 @@ export function api_inspectionTask(data){
 }
 
 /**
+ * 获取巡检点列表
+ */
+export function api_inspectionNode(data){
+  return post("/simple/data/fetchDataList/inspectionNode", data);
+}
+
+/**
  * 获取巡检执行列表-数量
  */
 export function api_listCount(data){
@@ -279,6 +286,13 @@ export function api_addModel(data){
 }
 
 /**
+ * 巡检扫一扫
+ */
+export function api_scanNodeCode(data){
+  return post("/inspection/scanNodeCode", data);
+}
+
+/**
  * 报修端-公告
  */
 export function api_getNotice(data){

pages.json

@@ -248,6 +248,15 @@
      }
    },
    {
+     "path": "pages/inspection/inspectionScanning/inspectionScanning",
+     "style": {
+       "h5": {
+         "titleNView": false
+       },
+       "enablePullDownRefresh": true
+     }
+   },
+   {
      "path": "pages/inspection/inspectionValue/inspectionValue",
      "style": {
        "h5": {

pages/inspection/inspectionExecute/inspectionExecute.vue

@@ -40,6 +40,10 @@
     <view class="zanwu" v-else>
       <text class="newicon newicon-zanwu"></text>
     </view>
+    <view class="toolbar" @click="scanning()">
+      <text class="toolbar-icon newicon newicon-saoma"></text>
+      <text class="toolbar-sao">扫一扫</text>
+    </view>
     <InspectionListFilter v-if="dataInfo.isFilter" @cancelEmit="cancelFilter" @confirmEmit="conformFilter" :evt="dataInfo.evtFilter"></InspectionListFilter>
   </view>
 </template>
@@ -50,7 +54,7 @@
   import { ref, reactive, computed } from 'vue'
   import { onLoad, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
   import { SM } from "@/http/http.js"
-  import { api_getDictionary, api_inspectionTask, api_listCount, api_scanCode } from "@/http/api.js"
+  import { api_getDictionary, api_inspectionTask, api_listCount, api_scanCode, api_scanNodeCode } from "@/http/api.js"
   import { filterFormatDate } from '@/filters/filterFormatDate.js'
   import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
   import { computedStateStyle } from '@/filters/computedStateStyle.js'
@@ -81,7 +85,7 @@
 
   const assignFlag = ref(false);//指派权限
   const qiangdan = ref(false);//接单权限
-
+  
   // 转换协同人
   const computedSynergetic = computed(() => (synergetic) => {
     return (synergetic && synergetic.length) ? synergetic.map(v => v.name).join('，') : ''
@@ -101,6 +105,63 @@
       acceptDate: [],
     },//筛选框数据
   })
+  
+  // 扫一扫
+  function scanning(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    SM().then((ress1) => {
+      // ----------------------------------
+      let postData = {
+        queryTask: 'all',
+        code: ress1,
+        idx: 0,
+        sum: 1,
+        assignAccount: loginUserStore.loginUser.user.account,
+      };
+      api_scanNodeCode(postData).then((res) => {
+        if (res.status == 200) {
+          if(res.totalNum == 1){
+            let data = res.list[0];
+            let postData = {
+              code: ress1,
+              taskId: data.id,
+              account: loginUserStore.loginUser.user.account,
+            };
+            api_scanCode(postData).then((res) => {
+              uni.hideLoading();
+              if (res.status == 200) {
+                inspectionValueStore.setInspectionValueData(res.data);
+                uni.navigateTo({
+                  url: `/pages/inspection/inspectionValue/inspectionValue?inspectionExecuteId=${data.id}`
+                })
+              } else {
+                uni.showToast({
+                  icon: 'none',
+                  title: res.msg || '请求数据失败！'
+                });
+              }
+            });
+          }else{
+            uni.hideLoading();
+            uni.navigateTo({
+              url: `/pages/inspection/inspectionScanning/inspectionScanning?inspectionNodeCode=${res.data.code}&inspectionNodeName=${res.data.name}`
+            })
+          }
+        } else {
+          uni.hideLoading();
+          uni.showToast({
+            icon: 'none',
+            title: res.msg || '请求数据失败！'
+          });
+        }
+      });
+    }).catch(err=>{
+      uni.hideLoading();
+    });
+  }
 
   // 巡检项
   function toInspectionValue(data){
@@ -296,6 +357,31 @@
 </script>
 
 <style lang="scss" scoped>
+.toolbar {
+  position: fixed;
+  left: 0;
+  bottom: var(--window-bottom);
+  z-index: 99;
+  width: 100%;
+  height: 88rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-sizing: border-box;
+  border-radius: 4rpx;
+  background-color: #E5E8ED;
+
+  .toolbar-icon {
+    font-size: 52rpx;
+    margin-right: 16rpx;
+    color: #49B856;
+  }
+
+  .toolbar-sao {
+    font-size: 36rpx;
+    color: #333;
+  }
+}
 page{
   height: calc(100vh - var(--window-bottom));
 }
@@ -334,7 +420,7 @@ page{
     }
   }
   .body{
-    margin-bottom: var(--window-bottom);
+    margin-bottom: calc(var(--window-bottom) + 88rpx);
     margin-top: 88rpx;
     border-top: 6rpx solid #EBEBEB;
     .body_item{
@@ -395,10 +481,10 @@ page{
   }
   .zanwu{
     box-sizing: border-box;
-    margin-bottom: var(--window-bottom);
+    margin-bottom: calc(var(--window-bottom) + 88rpx);
     margin-top: 88rpx;
     border-top: 6rpx solid #EBEBEB;
-    height: calc(100vh - var(--window-bottom) - 88rpx);
+    height: calc(100vh - var(--window-bottom) - 176rpx);
     display: flex;
     justify-content: center;
     background-color: #F7F7F7;

pages/inspection/inspectionScanning/inspectionScanning.vue

@@ -0,0 +1,382 @@
+<template>
+  <view class="incidentList">
+    <view class="title">{{dataInfo.inspectionNodeName}}</view>
+    <view class="head">
+      <view class="tab" :class="{active: tab.id === dataInfo.tabActiveId}" v-for="tab in dataInfo.tabs" :key="tab.id" @click="clickTab(tab.id)">
+        {{tab.name}}<text v-if="tab.num !== ''">({{tab.num}})</text>
+      </view>
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <view class="body_item" v-for="data in dataInfo.list" :key="data.id">
+        <view class="body_item_head ellipsis-multiline">
+          <text class="sign" v-if="dataInfo.tabActiveId == 1" :class="{signRed: data.exception == 1}">{{data.exception == 1 ? '异常' : '正常'}}</text>{{ data.inspectionDTO?.inspectionFormDTO?.name }}-{{ data.inspectionNodeDTO?.name }}-{{ data.batchNo }}
+        </view>
+
+        <view class="body_item_content">
+          <view class="body_item_content_p" v-if="data.inspectionDTO">
+            <text class="name ellipsis">计划标题：{{data.inspectionDTO.name}}</text>
+          </view>
+          <view class="body_item_content_p" v-if="data.signType">
+            <text class="name ellipsis">签到方式：{{data.signType.name}}</text>
+          </view>
+          <view class="body_item_content_p" v-if="data.userDTO || data.groupDTO">
+            <text class="name ellipsis">执行人或组：{{ data.userDTO?.name || data.groupDTO?.groupName }}</text>
+          </view>
+          <view class="body_item_content_p" v-if="data.status || data.addTime">
+            <text class="name ellipsis">状态：{{ data.status?.name}}</text>
+            <text class="date">{{formatDate(data.addTime, 'yyyy-MM-dd HH:mm')}}</text>
+          </view>
+        </view>
+
+        <view class="body_item_foot">
+          <view class="btns pt0">
+            <button v-if="data.status.value === '1' && dataInfo.tabActiveId === 0" @click.stop="toInspectionValue(data)" type="default" class="primaryButton btn">执行</button>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view class="zanwu" v-else>
+      <text class="newicon newicon-zanwu"></text>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { startOfDay, endOfDay, format, add } from 'date-fns'
+  import { ref, reactive, computed } from 'vue'
+  import { onLoad, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
+  import { SM } from "@/http/http.js"
+  import { api_getDictionary, api_inspectionTask, api_listCount, api_scanCode, api_inspectionNode } from "@/http/api.js"
+  import { filterFormatDate } from '@/filters/filterFormatDate.js'
+  import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
+  import { computedStateStyle } from '@/filters/computedStateStyle.js'
+  import { computedCurrentLogOverTime } from '@/filters/computedCurrentLogOverTime.js'
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useIncidentNumStore } from '@/stores/incidentNum'
+  import { useInspectionListSearchStore } from '@/stores/inspectionListSearch'
+  import { useInspectionValueStore } from '@/stores/inspectionValue'
+  import { useSetTabbar } from '@/share/useSetTabbar.js'
+
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const incidentNumStore = useIncidentNumStore();
+  const inspectionListSearchStore = useInspectionListSearchStore();
+  const inspectionValueStore = useInspectionValueStore();
+  const { formatDate }  = filterFormatDate();
+  const { priorityStyle }  = computedPriorityStyle();
+  const { stateStyle }  = computedStateStyle();
+  const { currentLogOverTime }  = computedCurrentLogOverTime();
+  const { makePhoneCall }  = useMakePhoneCall();
+  const { setTabbar }  = useSetTabbar();
+
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 数据
+  const dataInfo = reactive({
+    tabs: [{id: 0, name: '巡检工单', value: 'all', num: ''}, {id: 1, name: '历史工单', value: '', num: ''}],
+    tabActiveId: 0,//当前选择的tab
+    list: [],//工单列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    inspectionNodeDTO: {},
+    inspectionNodeCode: '',
+    inspectionNodeName: '',
+  })
+  
+  // 巡检项
+  function toInspectionValue(data){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    // 'inspection|$|1bd0c704-0962-4ed4-b5a6-b5bda3d78231'
+    // 'inspection|$|bc9f61af-99c8-4c86-88f9-f29dd3fc43c0'
+		// 'inspection|$|92e7bb9a-5f58-42f6-991a-fcd67247e295'
+    SM().then((ress1) => {
+      let postData = {
+        code: ress1,
+        taskId: data.id,
+        account: loginUserStore.loginUser.user.account,
+      };
+      api_scanCode(postData).then((res) => {
+        uni.hideLoading();
+        if (res.status == 200) {
+          inspectionValueStore.setInspectionValueData(res.data);
+          uni.navigateTo({
+            url: `/pages/inspection/inspectionValue/inspectionValue?inspectionExecuteId=${data.id}`
+          })
+        } else {
+          uni.showToast({
+            icon: 'none',
+            title: res.msg || '请求数据失败！'
+          });
+        }
+      });
+    }).catch(err=>{
+      uni.hideLoading();
+    });
+  }
+
+  // 点击tab
+  function clickTab(tabId){
+    dataInfo.tabActiveId = tabId;
+    getList(0);
+  }
+
+  // 获取列表信息
+  function getList(idx){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    if(dataInfo.idx === 0){
+      dataInfo.list = [];
+    }
+    let tabActiveObj = dataInfo.tabs.find(v => v.id == dataInfo.tabActiveId);
+    let tabActiveObjIndex = dataInfo.tabs.findIndex(v => v.id == dataInfo.tabActiveId);
+    let postData = {
+        "idx": dataInfo.idx,
+        "sum": 10,
+        "inspectionTask": {
+          "queryTask": tabActiveObj.value || undefined,
+          "assignAccount": tabActiveObj.id == 0 ? loginUserStore.loginUser.user.account : undefined,
+          "inspectionNodeDTO":{
+            code: dataInfo.inspectionNodeCode,
+          }
+        }
+    }
+
+    api_inspectionTask(postData).then(res => {
+      uni.hideLoading();
+      uni.stopPullDownRefresh();
+      if(res.status == 200){
+        let list = res.list || [];
+        dataInfo.tabs[tabActiveObjIndex].num = res.totalNum;
+        if(list.length){
+          dataInfo.hasMore = true;
+          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+          dataInfo.inspectionNodeDTO = list[0].inspectionNodeDTO;
+        }else{
+          dataInfo.hasMore = false;
+          dataInfo.inspectionNodeDTO = {};
+        }
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+
+    getCount(tabActiveObj.id);
+  }
+
+  // 获取列表数量
+  function getCount(id){
+    dataInfo.tabs.forEach(v => {
+      if(v.id != id){
+        let tabActiveObj = v;
+        let postData = {
+            "idx": 0,
+            "sum": 1,
+            "inspectionTask": {
+              "queryTask": tabActiveObj.value || undefined,
+              "assignAccount": tabActiveObj.id == 0 ? loginUserStore.loginUser.user.account : undefined,
+              "inspectionNodeDTO":{
+                code: dataInfo.inspectionNodeCode,
+              }
+            }
+        }
+        api_inspectionTask(postData).then(res => {
+          if(res.status == 200){
+            v.num = res.totalNum;
+          }else{
+            uni.showToast({
+              icon: 'none',
+              title: res.msg || '请求数据失败！'
+            });
+          }
+        })
+      }
+    })
+  }
+  
+  onLoad((option) => {
+    dataInfo.inspectionNodeCode = option.inspectionNodeCode;
+    dataInfo.inspectionNodeName = option.inspectionNodeName;
+    getList(0);
+  })
+
+  onPullDownRefresh(() => {
+    getList(0)
+  })
+
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+.toolbar {
+  position: fixed;
+  left: 0;
+  bottom: var(--window-bottom);
+  z-index: 99;
+  width: 100%;
+  height: 88rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-sizing: border-box;
+  border-radius: 4rpx;
+  background-color: #E5E8ED;
+
+  .toolbar-icon {
+    font-size: 52rpx;
+    margin-right: 16rpx;
+    color: #49B856;
+  }
+
+  .toolbar-sao {
+    font-size: 36rpx;
+    color: #333;
+  }
+}
+.incidentList{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .title{
+    width: 100%;
+    height: 88rpx;
+    position: fixed;
+    z-index: 99;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: #EBEBEB;
+    font-weight: bold;
+    font-size: 32rpx;
+  }
+  .head{
+    height: 88rpx;
+    display: flex;
+    top: 88rpx;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    background-color: #fff;
+    font-size: 30rpx;
+    .tab{
+      flex: 1;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      border-bottom: 4rpx solid transparent;
+      &.active{
+        color: $uni-primary;
+        border-color: $uni-primary;
+      }
+    }
+    .filter{
+      width: 84rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .newicon-shaixuan{
+        font-size: 36rpx;
+        color: #2C2C2C;
+      }
+    }
+  }
+  .body{
+    margin-top: 176rpx;
+    border-top: 6rpx solid #EBEBEB;
+    .body_item{
+      border-bottom: 8rpx solid #EBEBEB;
+      .body_item_head{
+        word-break: break-all;
+        text-align: justify;
+        text-align: left;
+        margin: 24rpx;
+        font-size: 30rpx;
+        .sign{
+          margin-right: 16rpx;
+          font-weight: bold;
+          color: #49B856;
+          &.signRed{
+            color: #FF0000;
+          }
+        }
+      }
+      .body_item_content{
+        border-top: 1rpx solid #D8D8D8;
+        padding: 24rpx 24rpx 24rpx 48rpx;
+        .body_item_content_p{
+          color: #6A6A6A;
+          font-size: 26rpx;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-bottom: 24rpx;
+          &:last-of-type{
+            margin-bottom: 0;
+          }
+          .name{
+            flex: 1;
+          }
+          .status{
+            padding: 4rpx 10rpx;
+            border-radius: 20rpx;
+            background-color: #DBE8FE;
+            font-size: 22rpx;
+            color: #006CF9;
+          }
+          .icon_all{
+            .mic-filled,
+            .image-filled
+            {
+              margin-left: 16rpx;
+            }
+          }
+        }
+      }
+      .body_item_foot{
+        border-top: 1rpx solid #D8D8D8;
+        font-size: 26rpx;
+        padding: 24rpx;
+        .foot_info{
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .phone-filled{
+            margin-left: 5rpx;
+          }
+        }
+      }
+    }
+  }
+  .zanwu{
+    box-sizing: border-box;
+    margin-top: 176rpx;
+    border-top: 6rpx solid #EBEBEB;
+    height: calc(100vh - 88rpx);
+    display: flex;
+    justify-content: center;
+    background-color: #F7F7F7;
+    .newicon-zanwu{
+      font-size: 256rpx;
+      color: #D6D6D6;
+      margin-top: 140rpx;
+    }
+  }
+}
+</style>