fix:权限修改

pages/cb/bzy/equip-set/equip-set.vue

@@ -7,9 +7,9 @@
 			<view class="btns">
 				 <button type="warn" @click="equipBtnControl('dtu_update')" size="mini">升级</button>
 				 <button type="warn" @click="equipBtnControl('dtu_reboot')" size="mini">重启</button>
-				 <button type="warn" @click="equipBtnControl('dtu_reboot')" size="mini">立即拍照</button>
-				 <button type="warn" @click="equipBtnControl('dtu_reboot')" size="mini">对焦拍照</button>
-				 <button type="warn" @click="equipBtnControl('dtu_reboot')" size="mini">转仓</button>
+				 <button type="warn" @click="equipBtnControl('takephoto')" size="mini">立即拍照</button>
+				 <button type="warn" @click="equipBtnControl('autotakephoto')" size="mini">对焦拍照</button>
+				 <button type="warn" @click="equipBtnControl('turn')" size="mini">转仓</button>
 			</view>
 			<view class="tit adminTit">
 				设备开关

pages/cb/cbd/equip-set/imgpage.vue

@@ -247,7 +247,7 @@
 			shibie(id, addr) { //识别
 				// this.discern(id)
 				uni.navigateTo({
-					url: "./results?id=" + id + "&addr=" + addr
+					url: "./results?id=" + id + "&addr=" + addr+"&identify_model=" + this.modelList[this.identify_model].value
 				})
 			},
 			tongji(item) { //统计

pages/cb/cbd/equip-set/results.vue

@@ -56,7 +56,7 @@
 						img_id: this.id,
 						ret: ret,
 						device_type: "cbd",
-						identify_model: "A",
+						identify_model: this.identify_model,
 						sign: pubblicData
 					}
 				})
@@ -112,8 +112,10 @@
 			},
 		},
 		onLoad(option) {
+			// console.log('结果页面：',option)
 			this.id = option.id
 			this.addr = option.addr
+			this.identify_model = option.identify_model
 			this.discern("see")
 		}
 	}

pages/cb/equip-detail/equip-detail.vue

@@ -127,7 +127,9 @@
 
 <script>
 	import equipState from "../../../static/js/equipState_dict.json"
-	import {QueryPermission} from "../../../util/QueryPermission.js"
+	import {
+		QueryPermission
+	} from "../../../util/QueryPermission.js"
 	export default {
 		data() {
 			return {
@@ -233,12 +235,36 @@
 			curEquip() {
 				switch (this.type) {
 					case 3:
+						if (this.equipInfo.device_model == 11) {
+							// 虫情信息采集设备
+							let permission = [QueryPermission(294), QueryPermission(296), QueryPermission(295),
+								QueryPermission(293), true
+							]
+							this.cbd.map((cb, index) => {
+								cb.tf = permission[index]
+							})
+							console.log(this.cbd)
+						}
 						return this.cbd;
 					case 7:
+						if (this.equipInfo.device_model == 51) {
+							// 孢子仪1.0
+							let permission = [QueryPermission(301), QueryPermission(302), QueryPermission(303), true]
+							this.bzy.map((cb, index) => {
+								cb.tf = permission[index]
+							})
+						} else if (this.equipInfo.device_model == 52) {
+							// 孢子仪2.0
+							let permission = [QueryPermission(308), QueryPermission(309), QueryPermission(310), true]
+							this.bzy.map((cb, index) => {
+								cb.tf = permission[index]
+							})
+						}
 						return this.bzy;
 					case 4:
 						return this.xy
 				}
+
 			},
 			curState() {
 				switch (this.type) {
@@ -524,11 +550,11 @@
 						d_id: this.equipInfo.d_id,
 						page: 1,
 						page_size: 1,
-						start_time: Math.floor((+new Date() - 30*24 * 60 * 60 * 1000) / 1000),
+						start_time: Math.floor((+new Date() - 30 * 24 * 60 * 60 * 1000) / 1000),
 						end_time: Math.floor((+new Date()) / 1000)
 					}
 				})
-				this.$set(this.newState,"yc",res.total_num)
+				this.$set(this.newState, "yc", res.total_num)
 				this.dataloadingtf = false
 			},
 			partClick(path) {
@@ -857,4 +883,4 @@
 	.red {
 		color: rgb(235, 103, 101);
 	}
-</style>
+</style>

unpackage/dist/dev/mp-weixin/components/multiple-select.json

@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

util/QueryPermission.js

@@ -1,13 +1,8 @@
-var list = []
-
+var list =[]
 function QueryPermission(id) {
-	uni.getStorage({
-		key: "jurisdiction",
-		success: function(res) {
-			list = JSON.parse(res.data)
-		}
-	})
-	// console.log(list)
+	if(uni.getStorageSync("jurisdiction")){
+		list = JSON.parse(uni.getStorageSync("jurisdiction"))
+	}
 	for (var i = 0; i < list.length; i++) {
 		if (list[i].children) {
 			var data = list[i].children
@@ -28,4 +23,4 @@ function QueryPermission(id) {
 }
 export {
 	QueryPermission
-}
+}