App.vue

@@ -10,6 +10,7 @@
 		onHide: function() {
 			uni.setStorageSync('repairData','')
 			uni.setStorageSync('rapidRepNext','')
+			uni.removeStorageSync('pollingCode')
 			console.log('App Hide')
 		}
 	}

http/api.js

@@ -245,6 +245,13 @@ export function api_inspectionNode(data){
 }
 
 /**
+ * 修改巡检点
+ */
+export function api_inspectionNodeEdit(data){
+  return post("/data/updData/inspectionNode", data);
+}
+
+/**
  * 获取巡检执行列表-数量
  */
 export function api_listCount(data){

pages.json

@@ -299,6 +299,24 @@
 	     },
 	     "enablePullDownRefresh": true
 	   }
+	 },
+	 {
+	   "path": "pages/setPolling/setPolling",
+	   "style": {
+	     "h5": {
+	       "titleNView": false
+	     },
+	     "enablePullDownRefresh": true
+	   }
+	 },
+	 {
+	   "path": "pages/setPolling/selectPolling",
+	   "style": {
+	     "h5": {
+	       "titleNView": false
+	     },
+	     "enablePullDownRefresh": true
+	   }
 	 }
   ],
   "globalStyle": {

pages/buildIncident/buildIncident.vue

@@ -267,7 +267,7 @@
   }
 
   // 获取故障来源列表
-  function getSources(){
+  function getSources(sourceValue){
     uni.showLoading({
       title: "加载中",
       mask: true,
@@ -284,9 +284,13 @@
         value: v.id,
         key: v.value,
       }));
-      let discover = dataInfo.sourceList.find(v => v.key === 'leader');
-      if(discover){
-        incidentData.source = discover.value;
+      if(sourceValue){
+        incidentData.source = sourceValue;
+      }else{
+        let discover = dataInfo.sourceList.find(v => v.key === 'leader');
+        if(discover){
+          incidentData.source = discover.value;
+        }
       }
     })
   }
@@ -440,7 +444,20 @@
 
   onLoad((option) => {
     handlerStore.clearHandlerData();
-    if(incidentBuildStore.incidentBuild.data){
+    if(option.type == 'inspection'){
+      Object.assign(
+        incidentData,
+        incidentBuildStore.incidentBuild.data,
+        {
+          priority: incidentBuildStore.incidentBuild.data.priority ? incidentBuildStore.incidentBuild.data.priority.id : (incidentBuildStore.incidentBuild.data.category ? (incidentBuildStore.incidentBuild.data.category.priority ? incidentBuildStore.incidentBuild.data.category.priority.id : undefined) : undefined),
+          description: incidentBuildStore.incidentBuild.data.description || (incidentBuildStore.incidentBuild.data.category ? incidentBuildStore.incidentBuild.data.category.mutiCategory : undefined),
+        },
+      );
+    	if(incidentData.category && incidentData.category.id && !incidentBuildStore.incidentBuild.data.priority){
+    		getPriorityData()
+    	}
+      getSources(incidentBuildStore.incidentBuild.data.source);
+    }else if(incidentBuildStore.incidentBuild.data){
       Object.assign(
         incidentData,
         incidentBuildStore.incidentBuild.data,
@@ -460,9 +477,9 @@
 			if(incidentData.category && incidentData.category.id){
 				getPriorityData()
 			}
+      getSources();
     }
     getBranchs();
-    getSources();
     getPrioritys();
   })
 </script>

pages/inspection/inspectionExecute/inspectionExecute.vue

@@ -11,7 +11,7 @@
     <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">
-          {{ data.inspectionDTO?.inspectionFormDTO?.name }}-{{ data.inspectionNodeDTO?.name }}-{{ data.batchNo }}
+          <text class="sign" v-if="data.status.value == 2" :class="{signRed: data.exception == 1}">{{data.exception == 1 ? '异常' : '正常'}}</text>{{ data.inspectionDTO?.inspectionFormDTO?.name }}-{{ data.inspectionNodeDTO?.name }}-{{ data.batchNo }}
         </view>
 
         <view class="body_item_content">
@@ -33,6 +33,7 @@
         <view class="body_item_foot">
           <view class="btns pt0">
             <button v-if="data.status.value === '1'" @click.stop="toInspectionValue(data)" type="default" class="primaryButton btn">执行</button>
+            <button v-if="data.status.value === '2' && data.exception == 1 && !data.incidentId && data.inspectionDTO.inspectionFormDTO.showOrder == 1" @click.stop="toBuildIncident(data)" type="default" class="primaryButton btn">生成维修单</button>
           </view>
         </view>
       </view>
@@ -54,7 +55,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, api_scanNodeCode } from "@/http/api.js"
+  import { api_getDictionary, api_inspectionTask, api_listCount, api_scanCode, api_scanNodeCode, api_listAttachment } from "@/http/api.js"
   import { filterFormatDate } from '@/filters/filterFormatDate.js'
   import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
   import { computedStateStyle } from '@/filters/computedStateStyle.js'
@@ -67,6 +68,7 @@
   import { useInspectionListSearchStore } from '@/stores/inspectionListSearch'
   import { useInspectionValueStore } from '@/stores/inspectionValue'
   import { useSetTabbar } from '@/share/useSetTabbar.js'
+  import { useIncidentBuildStore } from '@/stores/incidentBuild'
 
   useSetTitle();
   const loginUserStore = useLoginUserStore();
@@ -79,6 +81,7 @@
   const { currentLogOverTime }  = computedCurrentLogOverTime();
   const { makePhoneCall }  = useMakePhoneCall();
   const { setTabbar }  = useSetTabbar();
+  const incidentBuildStore = useIncidentBuildStore();
 
   // 主题颜色
   const primaryColor = ref(defaultColor)
@@ -90,6 +93,9 @@
   const computedSynergetic = computed(() => (synergetic) => {
     return (synergetic && synergetic.length) ? synergetic.map(v => v.name).join('，') : ''
   })
+  
+  // 故障来源列表
+  const defaultSourceValue = ref();
 
   // 数据
   const dataInfo = reactive({
@@ -162,6 +168,64 @@
       uni.hideLoading();
     });
   }
+  
+  // 获取故障来源列表
+  function getSources(){
+    let postData = {
+      "key": 'incident_source',
+      "type": "list",
+    };
+    api_getDictionary(postData).then(res => {
+      res = res || [];
+      let discover = res.find(v => v.value === 'inspection');
+      if(discover){
+        defaultSourceValue.value = discover.id;
+      }
+    })
+  }
+  
+  // 新建事件
+  async function toBuildIncident(res){
+  	incidentBuildStore.clearIncidentBuildData();
+   let imgObj = res.inspectionFormValuesList.find(v => v.inspectionFormItemDTO.type.value == 7);
+   let repairImgList = [];
+   if(imgObj){
+     let result = await api_listAttachment('inspection', res.id);
+     result.data = result.data || [];
+     result.data = result.data.filter(v => v.recordId == imgObj.itemId);
+     result.data = result.data.map(v => ({
+       url: location.origin + "/file" + v.relativeFilePath,
+       path: location.origin + "/file" + v.relativeFilePath,
+       size: v.size,
+       name: v.name,
+       extname: v.suffix,
+     }))
+     repairImgList = result.data;
+   }
+   
+   console.log(repairImgList, 'repairImgList')
+   
+   let incidentData = {
+     place: res.inspectionNodeDTO.floorDTO,
+     houseNumber: res.inspectionNodeDTO.address,
+     source: defaultSourceValue.value,
+     description: res.inspectionFormValuesList.filter(v => v.exception == 1).map(v => `${v.name}填写值为${v.valuex}`).join('；'),
+     requester: loginUserStore.loginUser.user,
+     branch: loginUserStore.loginUser.user.currentHospital.parent ? loginUserStore.loginUser.user.currentHospital.parent.id : loginUserStore.loginUser.user.currentHospital.id,
+     contacts: loginUserStore.loginUser.user.name,
+     contactsInformation: loginUserStore.loginUser.user.phone,
+     category: res.inspectionDTO.inspectionFormDTO.categoryDTO,
+     department: res.inspectionDTO.inspectionFormDTO.repairDeptDTO,
+     priority: res.inspectionDTO.inspectionFormDTO.priorityDTO,
+     repairImgList,
+     inspectionTaskId: res.id,
+   }
+   console.log(incidentData, 'incidentData')
+   incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
+   uni.navigateTo({
+     url: `/pages/buildIncident/buildIncident?type=inspection`
+   })
+  }
 
   // 巡检项
   function toInspectionValue(data){
@@ -334,6 +398,7 @@
   }
 
   onLoad((option) => {
+    getSources();
     for(let i = 0; i<7; i++){
     	setTabbar(i)
     }
@@ -431,6 +496,14 @@ page{
         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;

pages/inspection/inspectionScanning/inspectionScanning.vue

@@ -9,7 +9,7 @@
     <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 }}
+          <text class="sign" v-if="data.status.value == 2" :class="{signRed: data.exception == 1}">{{data.exception == 1 ? '异常' : '正常'}}</text>{{ data.inspectionDTO?.inspectionFormDTO?.name }}-{{ data.inspectionNodeDTO?.name }}-{{ data.batchNo }}
         </view>
 
         <view class="body_item_content">
@@ -31,6 +31,7 @@
         <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>
+            <button v-if="data.status.value === '2' && data.exception == 1 && !data.incidentId && data.inspectionDTO.inspectionFormDTO.showOrder == 1" @click.stop="toBuildIncident(data)" type="default" class="primaryButton btn">生成维修单</button>
           </view>
         </view>
       </view>
@@ -46,7 +47,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, api_inspectionNode } from "@/http/api.js"
+  import { api_getDictionary, api_inspectionTask, api_listCount, api_scanCode, api_inspectionNode, api_listAttachment } from "@/http/api.js"
   import { filterFormatDate } from '@/filters/filterFormatDate.js'
   import { computedPriorityStyle } from '@/filters/computedPriorityStyle.js'
   import { computedStateStyle } from '@/filters/computedStateStyle.js'
@@ -59,6 +60,7 @@
   import { useInspectionListSearchStore } from '@/stores/inspectionListSearch'
   import { useInspectionValueStore } from '@/stores/inspectionValue'
   import { useSetTabbar } from '@/share/useSetTabbar.js'
+  import { useIncidentBuildStore } from '@/stores/incidentBuild'
 
   useSetTitle();
   const loginUserStore = useLoginUserStore();
@@ -71,10 +73,14 @@
   const { currentLogOverTime }  = computedCurrentLogOverTime();
   const { makePhoneCall }  = useMakePhoneCall();
   const { setTabbar }  = useSetTabbar();
+  const incidentBuildStore = useIncidentBuildStore();
 
   // 主题颜色
   const primaryColor = ref(defaultColor)
   
+  // 故障来源列表
+  const defaultSourceValue = ref();
+  
   // 数据
   const dataInfo = reactive({
     tabs: [{id: 0, name: '巡检工单', value: 'todo', num: ''}, {id: 1, name: '历史工单', value: '', num: ''}],
@@ -88,6 +94,64 @@
     inspectionNodeName: '',
   })
   
+  // 获取故障来源列表
+  function getSources(){
+    let postData = {
+      "key": 'incident_source',
+      "type": "list",
+    };
+    api_getDictionary(postData).then(res => {
+      res = res || [];
+      let discover = res.find(v => v.value === 'inspection');
+      if(discover){
+        defaultSourceValue.value = discover.id;
+      }
+    })
+  }
+  
+  // 新建事件
+  async function toBuildIncident(res){
+  	incidentBuildStore.clearIncidentBuildData();
+   let imgObj = res.inspectionFormValuesList.find(v => v.inspectionFormItemDTO.type.value == 7);
+   let repairImgList = [];
+   if(imgObj){
+     let result = await api_listAttachment('inspection', res.id);
+     result.data = result.data || [];
+     result.data = result.data.filter(v => v.recordId == imgObj.itemId);
+     result.data = result.data.map(v => ({
+       url: location.origin + "/file" + v.relativeFilePath,
+       path: location.origin + "/file" + v.relativeFilePath,
+       size: v.size,
+       name: v.name,
+       extname: v.suffix,
+     }))
+     repairImgList = result.data;
+   }
+   
+   console.log(repairImgList, 'repairImgList')
+   
+   let incidentData = {
+     place: res.inspectionNodeDTO.floorDTO,
+     houseNumber: res.inspectionNodeDTO.address,
+     source: defaultSourceValue.value,
+     description: res.inspectionFormValuesList.filter(v => v.exception == 1).map(v => `${v.name}填写值为${v.valuex}`).join('；'),
+     requester: loginUserStore.loginUser.user,
+     branch: loginUserStore.loginUser.user.currentHospital.parent ? loginUserStore.loginUser.user.currentHospital.parent.id : loginUserStore.loginUser.user.currentHospital.id,
+     contacts: loginUserStore.loginUser.user.name,
+     contactsInformation: loginUserStore.loginUser.user.phone,
+     category: res.inspectionDTO.inspectionFormDTO.categoryDTO,
+     department: res.inspectionDTO.inspectionFormDTO.repairDeptDTO,
+     priority: res.inspectionDTO.inspectionFormDTO.priorityDTO,
+     repairImgList,
+     inspectionTaskId: res.id,
+   }
+   console.log(incidentData, 'incidentData')
+   incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
+   uni.navigateTo({
+     url: `/pages/buildIncident/buildIncident?type=inspection`
+   })
+  }
+  
   // 巡检项
   function toInspectionValue(data){
     uni.showLoading({
@@ -206,6 +270,7 @@
   }
   
   onLoad((option) => {
+    getSources();
     dataInfo.inspectionNodeCode = option.inspectionNodeCode;
     dataInfo.inspectionNodeNewCode = option.inspectionNodeNewCode;
     dataInfo.inspectionNodeName = option.inspectionNodeName;

pages/inspection/inspectionValue/inspectionValue.vue

@@ -72,7 +72,7 @@
   import DsFilePicker from '@/components/DsFilePicker.vue';
   import { ref, reactive, nextTick } from 'vue'
   import { onLoad } from '@dcloudio/uni-app'
-  import { api_addModel } from "@/http/api.js"
+  import { api_addModel, api_getDictionary } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
@@ -80,17 +80,22 @@
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useInspectionValueStore } from '@/stores/inspectionValue'
   import { forIn } from 'lodash-es';
+  import { useIncidentBuildStore } from '@/stores/incidentBuild'
 
   useSetTitle();
   const loginUserStore = useLoginUserStore();
   const { goBack }  = useGoBack();
   const inspectionValueStore = useInspectionValueStore();
+  const incidentBuildStore = useIncidentBuildStore();
 
   // 主题颜色
   const primaryColor = ref(defaultColor)
 
   // 所有页码数据
   const formPageList = reactive([]);
+  
+  // 故障来源列表
+  const defaultSourceValue = ref();
 
   // 表单
   const baseForm = ref()
@@ -132,6 +137,61 @@
   function changeForm(){
     handleData(true);
   }
+  
+  // 跳转巡检列表
+  function toInspectionExecute(){
+    inspectionValueStore.clearInspectionValueData();
+    uni.reLaunch({
+      url: `/pages/inspection/inspectionExecute/inspectionExecute`
+    })
+  }
+  
+  // 获取故障来源列表
+  function getSources(){
+    let postData = {
+      "key": 'incident_source',
+      "type": "list",
+    };
+    api_getDictionary(postData).then(res => {
+      res = res || [];
+      let discover = res.find(v => v.value === 'inspection');
+      if(discover){
+        defaultSourceValue.value = discover.id;
+      }
+    })
+  }
+  
+  // 跳转新建事件
+  function toBuildIncident(res){
+    let imgList = Object.values(itemRefs.value);
+    let repairImgList = [];
+    if(imgList.length){
+      repairImgList = imgList[0].baseFormData.handlerImgList;
+    }
+
+    let incidentData = {
+      place: res.inspectionNode.floorDTO,
+      houseNumber: res.inspectionNode.address,
+      source: defaultSourceValue.value,
+      description: res.inspectionValuesList.filter(v => v.exception == 1).map(v => `${v.name}填写值为${v.valuex}`).join('；'),
+      requester: loginUserStore.loginUser.user,
+      branch: loginUserStore.loginUser.user.currentHospital.parent ? loginUserStore.loginUser.user.currentHospital.parent.id : loginUserStore.loginUser.user.currentHospital.id,
+      contacts: loginUserStore.loginUser.user.name,
+      contactsInformation: loginUserStore.loginUser.user.phone,
+      category: res.inspectionForm.categoryDTO,
+      department: res.inspectionForm.repairDeptDTO,
+      priority: res.inspectionForm.priorityDTO,
+      repairImgList,
+      inspectionTaskId: res.id,
+    }
+    console.log(repairImgList, 'repairImgList')
+    console.log(incidentData, 'incidentData')
+    incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
+    inspectionValueStore.clearInspectionValueData();
+    uni.navigateTo({
+      url: `/pages/buildIncident/buildIncident?type=inspection`
+    })
+  }
 
   // 保存
   function submit(){
@@ -194,10 +254,75 @@
             Object.values(itemRefs.value).forEach(v => {
               v && v.uploadFn();
             })
-            inspectionValueStore.clearInspectionValueData();
-            uni.reLaunch({
-              url: `/pages/inspection/inspectionExecute/inspectionExecute`
-            })
+
+            if(res.exception){
+              // 异常
+              if(res.inspectionForm.createOrder == 1){
+                // 是否自动生成维修单
+                uni.showModal({
+                	title: '提示',
+                	content: `巡检提交成功，您巡检有产生异常；系统自动生成工单：${res.incidentSign}`,
+                  showCancel: false,
+                  confirmText: '返回巡检列表',
+                	success: (res) => {
+                		if (res.confirm) {
+                      toInspectionExecute();
+                		}
+                	}
+                });
+              } else if(res.inspectionForm.showOrder == 1){
+                // 是否显示生成维修单
+                uni.showModal({
+                	title: '提示',
+                	content: '巡检提交成功，您巡检有产生异常，是否生成维修单',
+                  confirmText: '生成维修单',
+                  cancelText: '返回巡检列表',
+                	success: (result) => {
+                		if (result.confirm) {
+                			toBuildIncident(res);
+                		} else if (result.cancel) {
+                			toInspectionExecute();
+                		}
+                	}
+                });
+              } else {
+                uni.showToast({
+                  icon: 'none',
+                  title: "巡检提交成功，有异常",
+                  duration: 2000,
+                  mask: true,
+                })
+                setTimeout(() => {
+                  toInspectionExecute();
+                }, 2000)
+              }
+            }else{
+              // 无异常
+              uni.showToast({
+                icon: 'none',
+                title: "巡检提交成功，无异常",
+                duration: 2000,
+                mask: true,
+              })
+              setTimeout(() => {
+                toInspectionExecute();
+              }, 2000)
+            }
+          } else if(res.status == 555){
+            // 自动生成维修单失败
+            uni.showModal({
+            	title: '提示',
+            	content: '巡检提交成功，您巡检有产生异常；系统自动生成工单失败，请手动建单',
+              confirmText: '生成维修单',
+              cancelText: '返回巡检列表',
+            	success: (result) => {
+            		if (result.confirm) {
+            			toBuildIncident(res);
+            		} else if (result.cancel) {
+            			toInspectionExecute();
+            		}
+            	}
+            });
           } else {
             uni.showToast({
               icon: 'none',
@@ -334,6 +459,7 @@
   }
 
   onLoad((option) => {
+    getSources();
     inspectionExecuteId.value = +option.inspectionExecuteId;
     // 巡检项
     if(inspectionValueStore.inspectionValue.data){
@@ -352,6 +478,9 @@
     margin-top: 8rpx;
   }
 }
+::v-deep .uni-modal__btn_primary{
+  color: $uni-primary!important;
+}
 .inspectionValue{
   height: 100%;
   display: flex;

pages/my/my.vue

@@ -45,6 +45,9 @@
         </view>
       </view>
     </scroll-view>
+		<view class="new-btn">
+			<button @click="addPolling" v-if="bindingPolling" type="default" class="primaryButton"><text class="icon-style newicon newicon-bangding"></text>巡检点绑定</button>
+		</view>
     <view class="foot_common_btns">
 			<button @click="myRepair" type="default" class="primaryButton btn"><text class="icon-style newicon newicon-ziyuan-baoxiu1"></text>我的报修</button>
       <button @click="toBuildIncident" type="default" class="primaryButton btn"><text class="newicon newicon-xinjian2"></text>新建事件</button>
@@ -76,6 +79,9 @@
   // 主题颜色
   const primaryColor = ref(defaultColor)
   
+	// 巡检点绑定权限
+	const bindingPolling = ref(false)
+	
   // 数据
   const dataInfo = reactive({
     todo: 0,
@@ -132,6 +138,13 @@
     })
   }
   
+	// 巡检点绑定
+	function addPolling(){
+		uni.navigateTo({
+		  url: `/pages/setPolling/setPolling`
+		})
+	}
+	
 	// 知识库
 	function myRepair(){
 		// repositorySearchStore.clearRepositoryListSearchData()
@@ -165,6 +178,10 @@
   }
   
   onLoad((option) => {
+		let menu = loginUserStore.loginUser.menu.find(v => v.link === 'wxPperation')
+		if(menu && menu.childrens && menu.childrens.length>0){
+			bindingPolling.value = menu.childrens.some(v => v.link === 'bindingPolling')
+		}
     for(let i = 0; i<7; i++){
     	setTabbar(i)
     }
@@ -257,5 +274,8 @@ page{
 		position: relative;
 		left: -6rpx;
 	}
+	.new-btn{
+		padding: 0 24rpx;
+	}
 }
 </style>

pages/myRepair/myRepair.vue

@@ -684,7 +684,8 @@
 				id:dataForm.dept
 			},
 			commonDept:commonDeptData.value,
-			commonDeptDTO:arr
+			commonDeptDTO:arr,
+			upType: "changeDept"
 		}
 		api_userSave({
 		  user: postData,

pages/repair/config.vue

@@ -157,7 +157,8 @@
 				id:dataForm.dept
 			},
 			commonDept:commonDeptData.value,
-			commonDeptDTO:arr
+			commonDeptDTO:arr,
+			upType: "changeDept"
 		}
 		api_userSave({
 		  user: postData,

pages/setPolling/selectPolling.vue

@@ -0,0 +1,172 @@
+<template>
+  <view class="consumableList">
+    <view class="head">
+      <uni-search-bar v-model="dataInfo.keyWord" :placeholder="placeHolder" bgColor="#F8F8F8" @input="search" cancelButton="none" focus :radius="18" />
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <view class="body_item ellipsis" :class="dataInfo.index == index ? 'activeClass' :''" v-for="(data, index) in dataInfo.list" :key="data.id" @click="clickItem(data,index)">
+        {{data.name}}
+      </view>
+    </view>
+    <view class="zanwu" v-else>
+      <text class="newicon newicon-zanwu"></text>
+    </view>
+    <view class="foot_common_btns">
+      <button @click="goBackPage" type="default" class="primaryButton btn">确定</button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { debounce } from 'lodash-es'
+  import { ref, reactive} from 'vue'
+  import { onLoad } from '@dcloudio/uni-app'
+  import { api_inspectionNode } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useIncidentBuildStore } from '@/stores/incidentBuild'
+  import { useGoBack } from '@/share/useGoBack.js'
+  
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const incidentBuildStore = useIncidentBuildStore();
+  const { goBack }  = useGoBack();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  const placeHolder = ref('请搜索巡检点');
+  
+	const entranceType = ref(null);
+	
+	// 院区id
+	const branchId = ref(null);
+	
+  // 数据
+  const dataInfo = reactive({
+    list: [],//工单列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    incidentData: {},//事件对象
+    keyWord: '',//搜索的关键词
+		item:null,
+		index:null
+  })
+  
+  // 搜索
+  const search = debounce(getList.bind(null, 0), 500);
+
+  // 获取列表信息
+  function getList(idx){
+    if(dataInfo.keyWord.trim() === ''){
+      dataInfo.list = [];
+      return;
+    }
+    
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+
+    let postData = {
+      idx: dataInfo.idx,
+      sum: 9999,
+      inspectionNode: {
+				hosId: loginUserStore.loginUser.user.currentHospital.id,
+				name: dataInfo.keyWord
+      }
+    }
+    api_inspectionNode(postData).then(res => {
+      uni.hideLoading();
+      if(res.status == 200){
+        let list = res.list || [];
+        if(list.length){
+          dataInfo.hasMore = true;
+          dataInfo.list = list;
+        }else{
+          dataInfo.hasMore = false;
+        }
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+	function goBackPage(){
+		if(!dataInfo.item){
+			uni.showToast({
+			  icon: 'none',
+			  title: '请选择巡检点！'
+			});
+			return
+		}
+		let data = JSON.stringify(dataInfo.item)
+		uni.navigateTo({
+		  url: '/pages/setPolling/setPolling?data=' + data
+		})
+	}
+	
+  // 点击
+  function clickItem(data,index){
+		dataInfo.index = index
+		dataInfo.item = data;
+		console.log(444,dataInfo.item)
+  }
+  
+  onLoad((option) => {
+    getList(0);
+  })
+</script>
+
+<style lang="scss" scoped>
+.consumableList{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .head{
+    height: 88rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 24rpx;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    box-sizing: border-box;
+    background: linear-gradient( 90deg, #58CF66 0%, #DDE9FC 100%);
+  }
+  .body{
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    font-size: 26rpx;
+    .body_item{
+      border-bottom: 1rpx solid #DEDEDE;
+      padding: 24rpx;
+    }
+		.activeClass{
+			color: #49b856;
+		}
+  }
+  .zanwu{
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    display: flex;
+    justify-content: center;
+    .newicon-zanwu{
+      font-size: 256rpx;
+      color: #D6D6D6;
+      margin-top: 140rpx;
+    }
+  }
+  .foot_common_btns{
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background-color: #fff;
+  }
+}
+</style>

pages/setPolling/setPolling.vue

@@ -0,0 +1,270 @@
+<template>
+	<view class="handler">
+		<view class="body">
+			<view class="scan-box">
+				<view class="scan">
+					<text class="newicon newicon-saoma icon" @click="scanCodes"></text>
+				</view>
+			</view>
+			<view class="container">
+				<view class="weight-class">可以通过扫一扫功能设置“巡检点”，扫描二维码后设置或选择巡检点。</view>
+				<view class="weight-tip">查询巡检点结果：{{dataInfo.pollingData}}</view>
+				<view class="weight-tip" v-if="dataInfo.newPollingData">选择巡检点为：<text class="red">{{dataInfo.newPollingData.name}}</text></view>
+			</view>
+		</view>
+		<view class="foot_common_btns">
+			<button v-if="dataInfo.type" @click="replace" type="default" class="primaryButton btn">选择巡检点</button>
+			<button v-if="dataInfo.newPollingData" @click="save" type="default" class="primaryButton btn">保存</button>
+		</view>
+		<uni-popup ref="alertDialog" type="dialog" :mask-click="false">
+			<view class="popup-content">
+				<view class="tip">提示</view>
+				<view class="content">{{dataInfo.content}}</view>
+			</view>
+			<view class="btn-box">
+				<view @click="close" class="btn-item-50 color-close">取消</view>
+				<view @click="dialogConfirm" class="btn-item-50 color">确认</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script setup>
+	import { SM } from "@/http/http.js"
+  import { ref, reactive, computed } from 'vue'
+  import { onLoad, onUnload } from '@dcloudio/uni-app'
+  import { api_inspectionNode, api_inspectionNodeEdit } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useGoBack } from '@/share/useGoBack.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+	import { post } from "@/http/http.js"
+	import { join } from "lodash-es"
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const { goBack }  = useGoBack();
+	
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+	
+	const alertDialog = ref(null)
+	
+  // 数据
+  const dataInfo = reactive({
+		pollingData:'无',
+		pollingId:null,
+		newPollingData:null,
+		content:'',
+		type:false,
+		bindingPolling:false
+  })
+	
+	// 清空数据
+	function setInfoData(){
+		dataInfo.pollingData = '无'
+		dataInfo.pollingId = null
+		dataInfo.newPollingData = null
+		dataInfo.content = ''
+		dataInfo.type = false
+		dataInfo.bindingPolling = false
+		uni.removeStorageSync('pollingCode')
+	}
+	
+	// 选择巡检点
+	function replace(){
+		// let data = {
+		// 	code: 'inspection|$|703f3569-b80e-48df-aafd-5fcef36c96f0',
+		// 	pollingData: '1东',
+		// 	pollingId: 1,
+		// }
+		// uni.setStorageSync('pollingCode',JSON.stringify(data))
+		uni.navigateTo({
+		  url: `/pages/setPolling/selectPolling`
+		})
+	}
+	
+	// 保存
+	function save(){
+		setTimeout(_=>{
+			alertDialog.value.open()
+		},100)
+	}
+	
+	// 提交
+	function dialogConfirm(){
+		let data = JSON.parse(uni.getStorageSync('pollingCode'))
+		let query = {
+			inspectionNode:{
+				updateInspectionNodeCode: 1,
+				id: data.pollingId,
+				updateId: dataInfo.newPollingData.id,
+				code: data.code
+			}
+		}
+		uni.showLoading({
+		  title: "加载中",
+		  mask: true,
+		});
+		api_inspectionNodeEdit(query).then((result) => {
+		    if (result.status == 200) {
+					uni.hideLoading();
+		      uni.showToast({
+		        icon: 'none',
+		        title: result.msg
+		      });
+					alertDialog.value.close()
+					setTimeout(_=>{
+						setInfoData()
+					},1000)
+		    } else {
+					uni.showToast({
+					  icon: 'none',
+					  title: result.msg
+					});
+		    }
+		  });
+	}
+	
+	// 关闭
+	function close(){
+		alertDialog.value.close()
+	}
+	
+	// 扫码
+	function scanCodes(){
+		uni.showLoading({
+		  title: "加载中",
+		  mask: true,
+		});
+
+		SM().then((res) => {
+			let query = {
+				idx: 0,
+				sum: 1,
+				inspectionNode:{
+					code:res
+				}
+			}
+			api_inspectionNode(query).then((res2) => {
+			  uni.hideLoading();
+			  if (res2.status == 200) {
+					if(res2.list.length>0){
+						dataInfo.pollingData = res2.list[0].name
+						dataInfo.pollingId = res2.list[0].id
+					}
+					let data = {
+						code: res,
+						pollingData: dataInfo.pollingData,
+						pollingId: dataInfo.pollingId,
+					}
+					uni.setStorageSync('pollingCode',JSON.stringify(data))
+					dataInfo.type = true
+			  } else {
+			    uni.showToast({
+			      icon: 'none',
+			      title: res2.msg || '请求数据失败！'
+			    });
+			  }
+			});
+		})
+	}
+	
+  onLoad((option) => {
+		if(option && option.data){
+			let data = JSON.parse(option.data)
+			dataInfo.newPollingData = data
+			console.log(998,data)
+		}
+		if(uni.getStorageSync('pollingCode')){
+			let data = JSON.parse(uni.getStorageSync('pollingCode'))
+			dataInfo.pollingData = data.pollingData
+			dataInfo.pollingId = data.pollingId
+			dataInfo.content = `二维码绑定为“${dataInfo.newPollingData.name}”，原“${dataInfo.pollingData}”二维码被清空，您确认绑定吗？`
+		}
+  })
+	
+	onUnload(()=>{
+		setInfoData()
+	})
+</script>
+
+<style>
+	>>> .uni-popup .uni-popup__wrapper{
+		background-color: #fff !important;
+		width: 90%;
+		border-radius: 10rpx;
+	}
+	>>> .uni-popup__info{
+		color: #333 !important;
+	}
+	>>>.uni-button-color{
+		color: #49B856 !important;
+	}
+</style>
+<style lang="scss" scoped>
+.handler{
+  height: 89vh;
+	.body{
+		height: 100%;
+		padding: 0 30rpx;
+		.scan-box{
+			padding: 40rpx 0 ;
+			display: flex;
+			justify-content: center;
+			.scan{
+				width: 150rpx;
+				height: 150rpx;
+				border-radius: 50%;
+				text-align: center;
+				line-height: 150rpx;
+				background: linear-gradient( 300deg, #6BBF76 0%, #46B491 100%);
+				.icon{
+					color: #fff;
+				}
+			}
+		}
+		.container{
+			text-align: center;
+			.weight-class{
+				font-size: 38rpx;
+				font-weight: 600;
+				margin-bottom: 20rpx;
+			}
+			.weight-tip{
+				font-size: 32rpx;
+				margin-bottom: 20rpx;
+			}
+		}
+	}
+	.popup-content{
+		padding: 20rpx;
+		text-align: center;
+		.tip{
+			font-size: 32rpx;
+			color: #333;
+			margin-bottom: 20rpx;
+		}
+		.content{
+			color: #6C6C6C;
+			padding: 20rpx;
+		}
+	}
+	.btn-box{
+		display: flex;
+		border-top: 1px solid #E3E3E3;
+		.btn-item-50{
+			flex: 1;
+			height: 90rpx;
+			line-height: 90rpx;
+			text-align: center;
+		}
+		.color-close{
+			color: #606266;
+		}
+		.color{
+			color: #49B856;
+			border-left: 1px solid #E3E3E3;
+		}
+	}
+}
+</style>

static/font/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon newicon">&#xe68b;</span>
+                <div class="name">绑定</div>
+                <div class="code-name">&amp;#xe68b;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon newicon">&#xe633;</span>
                 <div class="name">右箭头</div>
                 <div class="code-name">&amp;#xe633;</div>
@@ -246,9 +252,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'newicon';
-  src: url('iconfont.woff2?t=1721874329610') format('woff2'),
-       url('iconfont.woff?t=1721874329610') format('woff'),
-       url('iconfont.ttf?t=1721874329610') format('truetype');
+  src: url('iconfont.woff2?t=1741933729857') format('woff2'),
+       url('iconfont.woff?t=1741933729857') format('woff'),
+       url('iconfont.ttf?t=1741933729857') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -275,6 +281,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon newicon newicon-bangding"></span>
+            <div class="name">
+              绑定
+            </div>
+            <div class="code-name">.newicon-bangding
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon newicon newicon-youjiantou"></span>
             <div class="name">
               右箭头
@@ -564,6 +579,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-bangding"></use>
+                </svg>
+                <div class="name">绑定</div>
+                <div class="code-name">#newicon-bangding</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#newicon-youjiantou"></use>
                 </svg>
                 <div class="name">右箭头</div>

static/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "newicon"; /* Project id 4304860 */
-  src: url('iconfont.woff2?t=1721874329610') format('woff2'),
-       url('iconfont.woff?t=1721874329610') format('woff'),
-       url('iconfont.ttf?t=1721874329610') format('truetype');
+  src: url('iconfont.woff2?t=1741933729857') format('woff2'),
+       url('iconfont.woff?t=1741933729857') format('woff'),
+       url('iconfont.ttf?t=1741933729857') format('truetype');
 }
 
 .newicon {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.newicon-bangding:before {
+  content: "\e68b";
+}
+
 .newicon-youjiantou:before {
   content: "\e633";
 }

static/font/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "5039564",
+      "name": "绑定",
+      "font_class": "bangding",
+      "unicode": "e68b",
+      "unicode_decimal": 59019
+    },
+    {
       "icon_id": "9021524",
       "name": "右箭头",
       "font_class": "youjiantou",