巡检点绑定开发

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/my/my.vue

@@ -45,6 +45,9 @@
         </view>
       </view>
     </scroll-view>
+		<view class="new-btn">
+			<button @click="addPolling" 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>
@@ -132,6 +135,13 @@
     })
   }
   
+	// 巡检点绑定
+	function addPolling(){
+		uni.navigateTo({
+		  url: `/pages/setPolling/setPolling`
+		})
+	}
+	
 	// 知识库
 	function myRepair(){
 		// repositorySearchStore.clearRepositoryListSearchData()
@@ -257,5 +267,8 @@ page{
 		position: relative;
 		left: -6rpx;
 	}
+	.new-btn{
+		padding: 0 24rpx;
+	}
 }
 </style>

pages/setPolling/selectPolling.vue

@@ -0,0 +1,180 @@
+<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, onPullDownRefresh, onReachBottom } 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);
+  })
+  
+  onPullDownRefresh(() => {
+
+  })
+  
+  onReachBottom(() => {
+
+  })
+</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,212 @@
+<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">
+			<uni-popup-dialog type="info" :before-close="true" cancelText="取消" confirmText="确认" title="提示" :content="dataInfo.content" @confirm="dialogConfirm" @close="close"></uni-popup-dialog>
+		</uni-popup>
+	</view>
+</template>
+
+<script setup>
+	import { SM } from "@/http/http.js"
+  import { ref, reactive, computed } from 'vue'
+  import { onLoad } 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
+  })
+	
+	// 选择巡检点
+	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
+			}
+		}
+		api_inspectionNodeEdit(query).then((result) => {
+		    if (result.status == 200) {
+		      uni.showToast({
+		        icon: 'none',
+		        title: result.msg
+		      });
+					setTimeout(_=>{
+						alertDialog.value.close()
+						dataInfo.pollingData = '无'
+						dataInfo.pollingId = null
+						dataInfo.newPollingData = null
+						dataInfo.content = ''
+						dataInfo.type = false
+						uni.removeStorageSync('pollingCode')
+					},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}”二维码被清空，您确认绑定吗？`
+		}
+  })
+</script>
+
+<style>
+	>>> .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;
+			}
+		}
+	}
+}
+</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",