zhangyun 5 лет назад
Родитель
Сommit
928284e943
100 измененных файлов с 6740 добавлено и 3562 удалено
  1. 1 1
      components/equip-item/equip-item.vue
  2. 3 3
      manifest.json
  3. 9 0
      pages.json
  4. 27 8
      pages/afterSale/addafter.vue
  5. 45 7
      pages/afterSale/index.vue
  6. 52 22
      pages/cb/cbd/equip-set/imgpage.vue
  7. 198 66
      pages/cb/cbd/equip-set/note.vue
  8. 169 0
      pages/cb/cbd/equip-set/results.vue
  9. 109 48
      pages/cb/equip-detail/equip-detail.vue
  10. 27 5
      pages/cb/index/index.vue
  11. 44 9
      pages/cb/index/search.vue
  12. 9 3
      pages/cb/sim/sim.vue
  13. 1 0
      pages/cb/xy2.0/historydatas.vue
  14. 115 30
      pages/cb/xy2.0/particulars.vue
  15. 78 29
      pages/distribution/index.vue
  16. 30 14
      pages/environment/equipment.vue
  17. 8 2
      pages/environment/history.vue
  18. 2 1
      pages/environment/index.vue
  19. 2 1
      pages/environment/search.vue
  20. 137 52
      pages/equipList/index.vue
  21. 19 4
      pages/equipList/modification.vue
  22. 32 10
      pages/equipList/search.vue
  23. 24 4
      pages/expertDiagnosis/index.vue
  24. 1 1
      pages/expertDiagnosis/wormcase.vue
  25. 40 1
      pages/fourBase/basefacility.vue
  26. 11 2
      pages/fourBase/index.vue
  27. 9 4
      pages/fourBase/modification.vue
  28. 36 10
      pages/index/index.vue
  29. 8 3
      pages/login/login.vue
  30. 1 11
      pages/monitor/index.vue
  31. 12 3
      pages/my/about/about.vue
  32. 1 0
      pages/my/index/index.vue
  33. 44 69
      pages/my/record/record.vue
  34. 14 48
      pages/prevention/control.vue
  35. 69 45
      pages/prevention/equipmentdetails.vue
  36. 2 1
      pages/prevention/index.vue
  37. 2 1
      pages/prevention/search.vue
  38. 3 2
      pages/prevention/sim.vue
  39. BIN
      static/images/cb/6286299.gif
  40. BIN
      static/images/fuzhi.png
  41. BIN
      unpackage/cache/apk/__UNI__DBA6730_cm.apk
  42. 1 1
      unpackage/cache/apk/apkurl
  43. 1 1
      unpackage/cache/apk/cmManifestCache.json
  44. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-hdpi.png
  45. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xhdpi.png
  46. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxhdpi.png
  47. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxxhdpi.png
  48. 2 2
      unpackage/cache/wgt/__UNI__DBA6730/app-config-service.js
  49. 1 1
      unpackage/cache/wgt/__UNI__DBA6730/app-service.js
  50. 1 1
      unpackage/cache/wgt/__UNI__DBA6730/app-view.js
  51. 1 1
      unpackage/cache/wgt/__UNI__DBA6730/manifest.json
  52. BIN
      unpackage/cache/wgt/__UNI__DBA6730/static/images/cb/6286299.gif
  53. BIN
      unpackage/cache/wgt/__UNI__DBA6730/static/images/fuzhi.png
  54. 2 2
      unpackage/dist/build/app-plus/app-config-service.js
  55. 1 1
      unpackage/dist/build/app-plus/app-service.js
  56. 1 1
      unpackage/dist/build/app-plus/app-view.js
  57. 1 1
      unpackage/dist/build/app-plus/manifest.json
  58. BIN
      unpackage/dist/build/app-plus/static/images/cb/6286299.gif
  59. BIN
      unpackage/dist/build/app-plus/static/images/fuzhi.png
  60. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/equip-item/equip-item.js.map
  61. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/bzy/equip-set/equip-set.js.map
  62. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/equip-set.js.map
  63. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/equip-detail/equip-detail.js.map
  64. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/index/index.js.map
  65. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy/equip-set/equip-set.js.map
  66. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/historydatas.js.map
  67. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/particulars.js.map
  68. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/distribution/index.js.map
  69. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/equipment.js.map
  70. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/index.js.map
  71. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/modification.js.map
  72. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/search.js.map
  73. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/assignment.js.map
  74. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/index.js.map
  75. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/useroperation.js.map
  76. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/allocation.js.map
  77. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/basefacility.js.map
  78. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/index.js.map
  79. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  80. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
  81. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index/index.js.map
  82. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/control.js.map
  83. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/equipmentdetails.js.map
  84. 2 2
      unpackage/dist/dev/app-plus/app-config-service.js
  85. 2747 1659
      unpackage/dist/dev/app-plus/app-service.js
  86. 2494 1283
      unpackage/dist/dev/app-plus/app-view.js
  87. 1 1
      unpackage/dist/dev/app-plus/manifest.json
  88. BIN
      unpackage/dist/dev/app-plus/static/images/cb/6286299.gif
  89. BIN
      unpackage/dist/dev/app-plus/static/images/fuzhi.png
  90. BIN
      unpackage/dist/dev/app-plus/static/images/my/user.png
  91. 5 2
      unpackage/dist/dev/mp-weixin/app.json
  92. 11 11
      unpackage/dist/dev/mp-weixin/common/vendor.js
  93. 8 8
      unpackage/dist/dev/mp-weixin/components/bazaar-city_list/index.js
  94. 8 8
      unpackage/dist/dev/mp-weixin/components/equip-item/equip-item.js
  95. 8 8
      unpackage/dist/dev/mp-weixin/components/ksp-image-cutter/ksp-image-cutter.js
  96. 8 8
      unpackage/dist/dev/mp-weixin/components/uni-icons/uni-icons.js
  97. 8 8
      unpackage/dist/dev/mp-weixin/components/uni-nav-bar/uni-nav-bar.js
  98. 8 8
      unpackage/dist/dev/mp-weixin/components/uni-status-bar/uni-status-bar.js
  99. 2 2
      unpackage/dist/dev/mp-weixin/pages/afterSale/addafter.js
  100. 0 0
      unpackage/dist/dev/mp-weixin/pages/afterSale/index.js

+ 1 - 1
components/equip-item/equip-item.vue

@@ -7,7 +7,7 @@
 			<view class="tag tag-off" ></view>
 		</template>
 		<view class="info">
-			<text class="">设备ID:{{item.imei}}</text>
+			<text class="">设备ID:{{item.imei || item.device_id}}</text>
 			<text v-if="item.is_online==1" class="state on">在线</text>
 			<text v-else  class="state off">离线</text>
 		</view>

+ 3 - 3
manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "大数据平台APP",
+    "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.0.2",
+    "versionCode" : 102,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

+ 9 - 0
pages.json

@@ -483,6 +483,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/cb/cbd/equip-set/results",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "识别结果",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"condition": { //模式配置,仅开发期间生效
 		"current": 3, //当前激活的模式(list 的索引项)

+ 27 - 8
pages/afterSale/addafter.vue

@@ -86,25 +86,32 @@
 				selfList:'',//视频链接
 				actionSheetList: [//设备选项
 					{
-						text: '杀虫灯'
+						text: '杀虫灯',
+						id:2
 					},
 					{
-						text: '测报灯'
+						text: '测报灯',
+						id:3
 					},
 					{
-						text: '智能性诱'
+						text: '智能性诱',
+						id:4
 					},
 					{
-						text: '环境检测'
+						text: '环境监测',
+						id:5
 					},
 					{
-						text: '监控设备'
+						text: '监控设备',
+						id:6
 					},
 					{
-						text: '孢子仪'
+						text: '孢子仪',
+						id:7
 					},
 					{
-						text: '性诱设备'
+						text: '性诱2.0',
+						id:10
 					},
 				],
 				show:false,//选择器的显示
@@ -118,6 +125,18 @@
 				videoshow:false
 			}
 		},
+		onLoad(option) {
+			if(option.device_id){
+				console.log(option)
+				this.adddata.id = option.device_id
+				var typedata = this.actionSheetList.filter((item)=>{
+					return item.id == Number(option.device_type)
+				})
+				console.log(typedata)
+				this.adddata.type = typedata[0].text
+				this.adddata.type_id = typedata[0].id
+			}
+		},
 		methods: {
 			clickLeft(){//返回
 				uni.navigateTo({
@@ -224,7 +243,7 @@
 			},
 			actionSheetCallback(index) {//选择器选择
 				this.adddata.type = this.actionSheetList[index].text;
-				this.adddata.type_id=index+2
+				this.adddata.type_id = this.actionSheetList[index].id
 			},
 			iphone(){//检测手机
 				if(!/^1[23456789]\d{9}$/.test(this.adddata.phone)){

+ 45 - 7
pages/afterSale/index.vue

@@ -2,11 +2,7 @@
 	<view>
 		<view class="status_bar"></view>
 		<view style="position: fixed;z-index: 100;top: 44px;">
-			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="售后系统"></uni-nav-bar>
-		</view>
-		<view class="aftersale_search">
-			<u-icon name="search" class="sp_icon" @click="search"></u-icon>
-			<u-icon name="plus" class="sp_icon" @click="addf"></u-icon>
+			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="售后系统" rightIcon="search" @clickRight="search" ></uni-nav-bar>
 		</view>
 		<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/afterSale/dcd7147f4b15d00c5c90006738b8453.png'" class="expertimages"></image>
 		<view class="aftersaleTF" v-if="aftersaleTF">
@@ -34,6 +30,9 @@
 				</view>
 			</view>
 		</view>
+		<view class="addindent" @click="addf">
+			新 增 售 后 单
+		</view>
 		<u-modal v-model="show" :mask-close-able="maskcloseable" :show-confirm-button="showconfirmbutton" :title="title" class="model">
 			<view class="model_box">
 				<p v-if="faultinfo_tf">{{faultinfo}}</p>
@@ -41,6 +40,9 @@
 				<video :src="BASE_URL+faultvideo" controls v-if="faultvideo_tf" style="width:90%;"></video>
 			</view>
 		</u-modal>
+		<view class="top" v-if="isTop" @click="top">
+			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/6209a98f0cb3b5086f2ca36152c9269.png'" mode=""></image>
+		</view>
 	</view>
 </template>
 <script>
@@ -79,7 +81,8 @@
 				faultimg: [],//故障图片
 				faultimg_tf: false,//故障图片显示
 				page:1,
-				aftersaleTF:true
+				aftersaleTF:true,
+				isTop:false
 			}
 		},
 		methods: {
@@ -164,6 +167,12 @@
 					urls: imgarr
 				});
 			},
+			top() {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 500
+				})
+			}
 		},
 		onLoad() { 
 			this.getAftersale()
@@ -171,7 +180,14 @@
 		onReachBottom() {
 			this.page++
 			this.getAftersale()
-		}
+		},
+		onPageScroll(e) { //nvue暂不支持滚动监听,可用bindingx代替
+			if (e.scrollTop > 200) { //距离大于200时显示
+				this.isTop = true
+			} else { //距离小于200时隐藏
+				this.isTop = false
+			}
+		},
 	}
 </script>
 
@@ -290,4 +306,26 @@
 			justify-content: center;
 		}
 	}
+	.top {
+		position: fixed;
+		right: 30px;
+		bottom: 100px;
+		z-index: 100;
+		image{
+			width: 100rpx;
+			height: 100rpx;
+		}
+	}
+	.addindent{
+		width: 100%;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		height: 80rpx;
+		text-align: center;
+		line-height: 80rpx;
+		background-color: #71cd9a;
+		color: #ffffff;
+		font-size: 16px;
+	}
 </style>

+ 52 - 22
pages/cb/cbd/equip-set/imgpage.vue

@@ -20,7 +20,7 @@
 				<view class="imglist_box" v-for="(item,index) in imglists" :key="index">
 					<view class="imglist_left">
 						<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode=""></image>
-						<image :src="item.addr" mode="" @click="examine(item)"></image>
+						<image :src="item.addr" mode="" @click="examine(index)"></image>
 					</view>
 					<view class="imglist_right">
 						<view class="icon_box" @click="delimg(item.id)">
@@ -67,7 +67,8 @@
 				},
 				flag:1,
 				self:true,
-				isTop:false
+				isTop:false,
+				resultdata:{}
 			}
 		},
 		methods: {
@@ -100,16 +101,19 @@
 						addrlist: id
 					}
 				})
-			},
-			//forecast.forecast_system.equip_photo_discern识别
-			async discern(id) { //识别图片
-				const res = await this.$myRequest({
-					url: '/api/api_gateway?method=forecast.forecast_system.equip_photo_discern',
-					data: {
-						img_id: id,
-						ret: "see"
-					}
-				})
+				if (res) {
+					uni.showToast({
+						title: '指令下发成功!',
+						duration: 2000
+					});
+					this.imglistdata(parseInt(this.timestate),parseInt(this.timeend))
+				}else{
+					uni.showToast({
+						title: '指令下发失败!',
+						duration: 2000,
+						icon:"none"
+					});
+				}
 			},
 			//forecast.forecast_system.equip_photo_species  pest_list
 			//forecast.forecast_system.equip_photo_species统计
@@ -121,6 +125,18 @@
 						img_id: id
 					}
 				})
+				if (res) {
+					uni.showToast({
+						title: '指令下发成功!',
+						duration: 2000
+					});
+				}else{
+					uni.showToast({
+						title: '指令下发失败!',
+						duration: 2000,
+						icon:"none"
+					});
+				}
 			},
 			//forecast.send_control.admin_device_control 拍照 
 			async takephoto() { //统计
@@ -138,10 +154,18 @@
 						title: '指令下发成功!',
 						duration: 2000
 					});
+					var that = this
+					setTimeout(()=>{
+						that.imglistdata(parseInt(that.timestate),parseInt(that.timeend))
+					},1000)
+				}else{
+					uni.showToast({
+						title: '指令下发失败!',
+						duration: 2000,
+						icon:"none"
+					});
 				}
-				uni.navigateBack({
-					delta:1
-				})
+				
 			},
 			clickLeft() {
 				uni.navigateBack({
@@ -154,7 +178,7 @@
 					content: '是否删除此图片?',
 					success: function(res) {
 						if (res.confirm) {
-							// this.del(id)
+							this.del(id)
 							console.log('用户点击确定');
 						} else if (res.cancel) {
 							console.log('用户点击取消');
@@ -163,7 +187,10 @@
 				});
 			},
 			shibie(id) { //识别
-				this.discern(id)
+				// this.discern(id)
+				uni.navigateTo({
+					url: "./results?id="+id
+				})
 			},
 			tongji(id) { //统计
 				this.species(id)
@@ -173,13 +200,15 @@
 					url: "./addimg?id=" + id + "&device_id" + this.device_id
 				})
 			},
-			examine(url) {
-				console.log(url)
+			examine(index) {
 				var imgarr = []
-				imgarr.push(url.addr)
+				for(var i=0;i<this.imglists.length;i++){
+					imgarr.push(this.imglists[i].addr)
+				}
 				console.log(imgarr)
 				uni.previewImage({
-					urls: imgarr
+					urls: imgarr,
+					current:index
 				});
 			},
 			clickRight() { //下发拍照指令
@@ -221,8 +250,9 @@
 			this.d_id = option.d_id
 		},
 		onShow(){
+			var that = this
 			setTimeout(()=>{
-				this.imglistdata('','')
+				that.imglistdata('','')
 			},1000)
 			this.timeend = +new Date() / 1000
 			this.timestate = this.timeend - 60 * 60 * 24

+ 198 - 66
pages/cb/cbd/equip-set/note.vue

@@ -22,19 +22,22 @@
 						<p class="kind_top_title">指定害虫数量预警</p>
 						<u-switch v-model="checked2" size="30" style="margin-top: 6rpx;" active-color="#58C876"></u-switch>
 					</view>
-					<view class="kind_bot">
-						<p class="kind_bot_title">害虫种类:</p>
-						<view class="input" @click="pickertf = !pickertf">
-							<input type="text" v-model="selector[form.appointPestName]" :disabled="!checked2" />
-							<u-icon name="arrow-down" class="icon"></u-icon>
-							<u-picker v-model="pickertf" mode="selector" @confirm="confirmFun2" :default-selector="[form.appointPestName]"
-							 :range="selector"></u-picker>
+					<view class="kind_box" v-for="item,index in kindnum" :key="index" v-if="appointPestNames[index]">
+						<view class="kind_bot">
+							<p class="kind_bot_title">害虫种类:</p>
+							<view class="input" @click="pickerchange(index)">
+								<input type="text" v-model="selector[Number(appointPestNames[index])]" :disabled="!checked2" />
+								<u-icon name="arrow-down" class="icon"></u-icon>
+							</view>
 						</view>
+						<view class="kind_bot">
+							<p class="kind_bot_title">害虫数量:</p>
+							<input type="number" v-model="appointPestNums[index]" :disabled="!checked2" />
+						</view>
+						<u-icon name="plus-circle" class="icons" size="40" color="#28AE4F" @click="addkindnum(index)" v-if="index==0"></u-icon>
+						<u-icon name="trash" class="icons" size="40" color="#ff0000" @click="jiankindnum(index)" v-else></u-icon>
 					</view>
-					<view class="kind_bot">
-						<p class="kind_bot_title">害虫数量:</p>
-						<input type="number" v-model="form.appointPestNum" :disabled="!checked2" />
-					</view>
+					<u-picker v-model="pickertf" mode="selector" @confirm="confirmFun2" :default-selector="[Number(appointPestNames[datasindex])]" :range="selector"></u-picker>
 					<p class="hint">(每天指定害虫数量达到此数量时,短信预警)</p>
 				</view>
 				<view class="kind">
@@ -59,7 +62,7 @@
 				</view>
 				<view class="kind">
 					<view class="kind_top">
-						<p class="kind_top_title">信息接受</p>
+						<p class="kind_top_title">信息接收</p>
 					</view>
 					<view class="kind_bot">
 						<p class="kind_bot_title">信息接受手机号:</p>
@@ -89,7 +92,12 @@
 				conf: "",
 				form: {},
 				phonetf: false,
-				selector: []
+				selector: [],
+				kindnum:1,
+				kindtf:-1,
+				datasindex:null,
+				appointPestNames:[-1],//害虫名称
+				appointPestNums:[],//害虫数量
 			}
 		},
 		methods: {
@@ -101,63 +109,156 @@
 						conf: this.conf
 					}
 				})
+				console.log(res)
 				this.form = JSON.parse(res)
 				console.log(this.form)
-				//种类
-				if (this.form.pestCategory == "on") {
-					this.checked1 = true
-				} else {
-					this.checked1 = false
-				}
-				//pestTotal 总和开关
-				if (this.form.pestTotal == "on") {
-					this.checked3 = true
-				} else {
-					this.checked3 = false
-				}
-				//pestWarn综合预警
-				if (this.form.pestWarn == "on") {
-					this.checked4 = true
-				} else {
-					this.checked4 = false
-				}
-				//appointPest指定害虫
-				if (this.form.appointPest == "on") {
-					this.checked2 = true
-				} else {
-					this.checked2 = false
+				if(this.conf==""){
+					this.appointPestNames = this.form.appointPestName.split("#")
+					this.appointPestNums = this.form.appointPestNum.split("#")
+					if(this.appointPestNames.length==0){
+						this.kindnum = 1
+					}else{
+						this.kindnum = this.appointPestNames.length
+					}
+					if (this.form.pestCategory == "on") {
+						this.checked1 = true
+					} else {
+						this.checked1 = false
+					}
+					//pestTotal 总和开关
+					if (this.form.pestTotal == "on") {
+						this.checked3 = true
+					} else {
+						this.checked3 = false
+					}
+					//pestWarn综合预警
+					if (this.form.pestWarn == "on") {
+						this.checked4 = true
+					} else {
+						this.checked4 = false
+					}
+					//appointPest指定害虫
+					if (this.form.appointPest == "on") {
+						this.checked2 = true
+					} else {
+						this.checked2 = false
+					}
+				}else{
+					if(res){
+						uni.showToast({
+							title: '操作成功!',
+							duration: 2000,
+							icon:"none"
+						});
+					}
 				}
+				//种类
 			},
 			btn() {
-				if (this.checked1 == true) {
-					this.form.pestCategory = "on"
-				} else {
-					this.form.pestCategory = "off"
-				}
-				//pestTotal 总和开关
-				if (this.checked3 == true) {
-					this.form.pestTotal = "on"
-				} else {
-					this.form.pestTotal = "off"
-				}
-				//pestWarn综合预警
-				if (this.checked4 == true) {
-					this.form.pestWarn = "on"
-				} else {
-					this.form.pestWarn = "off"
-				}
-				//appointPest指定害虫
-				if (this.checked2 == true) {
-					this.form.appointPest = "on"
-				} else {
-					this.form.appointPest = "off"
+				if(this.checked1==true || this.checked2==true || this.checked3==true || this.checked4==true){
+					if (this.checked1 == true) {
+						this.form.pestCategory = "on"
+					} else {
+						this.form.pestCategory = "off"
+					}
+					//pestTotal 总和开关
+					if (this.checked3 == true) {
+						this.form.pestTotal = "on"
+					} else {
+						this.form.pestTotal = "off"
+					}
+					//pestWarn综合预警
+					if (this.checked4 == true) {
+						this.form.pestWarn = "on"
+					} else {
+						this.form.pestWarn = "off"
+					}
+					//appointPest指定害虫
+					if (this.checked2 == true) {
+						this.form.appointPest = "on"
+					} else {
+						this.form.appointPest = "off"
+					}
+					var obj = {}
+					for(var i=0;i<this.kindnum;i++){
+						obj["appointPestName"+(i+1)] = this.appointPestNames[i]
+						obj["appointPestName"] = this.appointPestNames.join("#")
+						obj["appointPestNum"+(i+1)] = this.appointPestNums[i]
+						obj["appointPestNum"] = this.appointPestNums.join("#")
+					}
+					Object.assign(this.form,obj)
+					console.log(this.form)
+					this.conf = JSON.stringify(this.form)
+					var namesome = this.appointPestNames.some((item)=>{
+						return item == -1
+					})
+					var numsome = false;
+					if(this.appointPestNums.length != this.appointPestNames.length){
+						numsome = true
+					}
+					var arr = false
+					if(this.checked1){
+						if(!this.form.pestCategoryNum){
+							uni.showToast({
+								title: '请输入害虫种类数量!',
+								duration: 2000,
+								icon:"none"
+							});
+							arr=false
+						}else{
+							arr=true
+						}
+					}
+					if(this.checked2){
+						if(namesome){
+							uni.showToast({
+								title: '请将指定害虫数量信息填写完全!',
+								duration: 2000,
+								icon:"none"
+							});
+							arr=false
+						}else if(numsome){
+							uni.showToast({
+								title: '请将指定害虫数量信息填写完全!',
+								duration: 2000,
+								icon:"none"
+							});
+							arr=false
+						}else{
+							arr = true
+						}
+					}
+					if(this.checked3){
+						if(!this.form.pestTotalNum){
+							uni.showToast({
+								title: '请输入害虫种类总和数量!',
+								duration: 2000,
+								icon:"none"
+							});
+							arr=false
+						}else{
+							arr=true
+						}
+					}
+					if(this.form.phone){
+						if(!this.phonetf && arr){
+							this.notealloc()
+						}
+					}else{
+						uni.showToast({
+							title: '请输入手机号码!',
+							duration: 2000,
+							icon:"none"
+						});
+					}
+				}else{
+					uni.showToast({
+						title: '请在开启预警后点击确定!',
+						duration: 2000,
+						icon:"none"
+					});
 				}
-				// console.log(this.form)
-				this.conf = JSON.stringify(this.form)
-				this.notealloc()
-				uni.navigateBack({
-					delta: 1
-				})
+				
 			},
 			phonereg() {
 				if (/^1[23456789]\d{9}$/.test(this.form.phone)) {
@@ -167,12 +268,36 @@
 				}
 			},
 			confirmFun2(index) {
-				this.form.appointPestName = index
+				this.appointPestNames[this.datasindex] = index[0]
 			},
 			clickLeft() {
 				uni.navigateBack({
 					delta: 1
 				})
+			},
+			pickerchange(index){
+				if(this.checked2){
+					this.pickertf = !this.pickertf
+					this.datasindex = index
+				}else{
+					uni.showToast({
+						title: '请在开启预警后输入!',
+						duration: 2000,
+						icon:"none"
+					});
+				}
+			},
+			addkindnum(){
+				this.kindnum++
+				this.appointPestNames.push(-1)
+				console.log(this.appointPestNames)
+			},
+			jiankindnum(index){
+				console.log(index)
+				this.kindnum--
+				console.log(this.appointPestNames)
+				this.appointPestNames.splice(index,1)
+				this.appointPestNums.splice(index,1)
 			}
 		},
 		onLoad(option) {
@@ -205,7 +330,14 @@
 					padding-left: 20rpx;
 				}
 			}
-
+			.kind_box{
+				position: relative;
+				.icons{
+					position: absolute;
+					top: 40rpx;
+					right: 50rpx;
+				}
+			}
 			.kind_bot {
 				display: flex;
 				padding-left: 28rpx;

+ 169 - 0
pages/cb/cbd/equip-set/results.vue

@@ -0,0 +1,169 @@
+<template>
+	<view>
+		<view class="images_box">
+			<p class="title">图片标记</p>
+			<view class="images">
+				<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="" class="jiazai"></image>
+				<image :src="resuils.image" mode="" @click="examine(resuils)"></image>
+				<view class="imgbg" v-if="imgbg">
+					<image src="../../../../static/images/cb/6286299.gif" mode="" class="img"></image>
+				</view>
+			</view>
+			<view class="btn">
+				<p class="btn_box" @click="anew">重新识别</p>
+			</view>
+		</view>
+		<view class="information">
+			<p class="title">识别结果</p>
+			<view class="information_data" v-for="item,index in resuils.result">
+				<p>害虫名称:<span>{{item.result_list}}</span></p>
+				<p>害虫数量:<span>{{item.nums}}只</span></p>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				resuils:{},
+				id:"",
+				imgbg:false,
+			}
+		},
+		methods: {
+			//forecast.forecast_system.equip_photo_discern识别 see again
+			async discern(ret) { //识别图片
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=forecast.forecast_system.equip_photo_discern',
+					data: {
+						img_id: this.id,
+						ret: ret
+					}
+				})
+				console.log(res)
+				if(res){
+					uni.showToast({
+						title: '识别成功!',
+						duration: 2000
+					});
+					this.resuils = res
+					this.imgbg =false
+				}else{
+					uni.showToast({
+						title: '识别失败!',
+						duration: 2000,
+						icon:"none"
+					});
+					this.imgbg =false
+				}
+			},
+			anew(){
+				this.discern("again")
+				this.imgbg =true
+			},
+			examine(url) {
+				console.log(url)
+				var imgarr = []
+				imgarr.push(url.image)
+				console.log(imgarr)
+				uni.previewImage({
+					urls: imgarr
+				});
+			},
+		},
+		onLoad(option) {
+			this.id = option.id
+			this.discern("see")
+		}
+	}
+</script>
+
+<style lang="scss">
+	.images_box{
+		width: 90%;
+		margin: 0 auto;
+		padding-top: 20rpx;
+		.title{
+			border-left: 10rpx solid #71cd9a;
+			padding-left: 20rpx;
+			font-size: 30rpx;
+		}
+		.images{
+			margin: 20rpx 0;
+			width: 100%;
+			height: 480rpx;
+			position: relative;
+			image{
+				width: 100%;
+				position: absolute;
+				top: 0;
+				left: 0;
+			}
+			.jiazai{
+				width: 480rpx;
+				height: 400rpx;
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				margin-top: -240rpx;
+				margin-left: -240rpx;
+			}
+			.imgbg{
+				width: 100%;
+				height: 480rpx;
+				position: absolute;
+				top: 0;
+				left: 0;
+				background-color: rgba(0,0,0,0.5);
+				.img{
+					width: 430rpx;
+					height: 400rpx;
+					position: absolute;
+					top: 50%;
+					left: 50%;
+					margin-top: -200rpx;
+					margin-left: -220rpx;
+				}
+			}
+		}
+		.btn{
+			width: 100%;
+			display: flex;
+			justify-content: flex-end;
+			.btn_box{
+				width: 200rpx;
+				height: 60rpx;
+				background-color: #fbb40a;
+				color: #FFFFFF;
+				text-align: center;
+				line-height: 60rpx;
+				margin-left: -10rpx;
+			}
+		}
+	}
+	.information{
+		width: 90%;
+		margin: 0 auto;
+		padding-top: 20rpx;
+		.title{
+			border-left: 10rpx solid #71cd9a;
+			padding-left: 20rpx;
+			font-size: 30rpx;
+		}
+		.information_data{
+			margin: 30rpx;
+			display: flex;
+			box-shadow: 0 0 10rpx #e8e5f7;
+			padding: 20rpx 10rpx;
+			p{
+				margin-right: 20rpx;
+				font-size: 28rpx;
+				span{
+					color: #FF0000;
+				}
+			}
+		}
+	}
+</style>

+ 109 - 48
pages/cb/equip-detail/equip-detail.vue

@@ -1,17 +1,18 @@
 <template>
 	<view>
 		<view :class="['info',equipInfo.is_online==1?'on':'off']">
-			<view class="">
-				设备ID:{{equipInfo.imei}}
+			<view class="" @click="copy(equipInfo)">
+				设备ID:{{equipInfo.imei||equipInfo.device_id}}
+				<image src="http://static.yfpyx.com/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image>
 			</view>
 			<view class="">
 				设备名称:{{equipInfo.device_name}}
 			</view>
 			<view class="">
-				设备类型:{{equipInfo.type|equipType}}
+				设备类型:{{equipInfo.type|equipType}}{{equipInfo.type_name}}
 			</view>
 			<view class="">
-				最新上报时间:{{equipInfo.addtime | timeFormat}}
+				最新上报时间:{{equipInfo.addtime||equipInfo.uptime | timeFormat}}
 			</view>
 			<view class="">
 				设备地址:{{equipInfo.address?equipInfo.address:"--"}}
@@ -55,7 +56,7 @@
 					</view>
 				</view>
 			</template>
-			<template v-else>
+			<template v-else-if="equipInfo.type==3">
 				<view class="item2" v-for="item in curEquip" v-if="item.tf" @click="partClick(item.path)">
 					<image :src="'http://static.yfpyx.com/bigdata_app'+item.icon" mode="widthFix"></image>
 					<view class="">
@@ -63,9 +64,18 @@
 					</view>
 				</view>
 			</template>
+			<template v-else>
+				<view class="item3" v-for="item in curEquip" v-if="item.tf" @click="partClick(item.path)">
+					<image :src="'http://static.yfpyx.com/bigdata_app'+item.icon" mode="widthFix"></image>
+					<view class="">
+						{{item.tex}}
+					</view>
+				</view>
+			</template>
 		</view>
 		<view class="tit">
-			实时数据
+			<p>实时数据</p>
+			<p class="span" @click="partClicks">历史数据>>></p>
 		</view>
 		<view class="newtishi" v-if="!newtishitf">
 			暂无数据
@@ -100,12 +110,14 @@
 					tex: '查看图片',
 					path: '/pages/cb/cbd/equip-set/imgpage',
 					tf:false
-				}, {
-					icon: '/image/cb/2.png',
-					tex: '历史数据',
-					path: '/pages/cb/cbd/equip-set/historyfile',
-					tf:false
-				}, {
+				}, 
+				// {
+				// 	icon: '/image/cb/2.png',
+				// 	tex: '历史数据',
+				// 	path: '/pages/cb/cbd/equip-set/historyfile',
+				// 	tf:false
+				// }, 
+				{
 					icon: '/image/cb/3.png',
 					tex: '害虫统计',
 					path: '/pages/cb/cbd/equip-set/statistics',
@@ -124,7 +136,12 @@
 					icon: '/image/cb/6.png',
 					tex: 'sim卡详情',
 					path: '/pages/cb/sim/sim',
-					tf:false
+					tf:true
+				},{
+					icon: '/image/environment/7.png',
+					tex: '一键报修',
+					path: '/pages/afterSale/addafter',
+					tf:true
 				}],
 				bzy: [{
 					icon: '/image/cb/4.png',
@@ -136,16 +153,23 @@
 					tex: '查看图片',
 					path: '/pages/cb/cbd/equip-set/imgpage',
 					tf:false
-				}, {
-					icon: '/image/cb/2.png',
-					tex: '历史数据',
-					path: '/pages/cb/bzy/equip-set/bzyhistoryile',
-					tf:false
-				}, {
+				}, 
+				// {
+				// 	icon: '/image/cb/2.png',
+				// 	tex: '历史数据',
+				// 	path: '/pages/cb/bzy/equip-set/bzyhistoryile',
+				// 	tf:false
+				// }, 
+				{
 					icon: '/image/cb/6.png',
 					tex: 'sim卡详情',
 					path: '/pages/cb/sim/sim',
 					tf:false
+				},{
+					icon: '/image/environment/7.png',
+					tex: '一键报修',
+					path: '/pages/afterSale/addafter',
+					tf:true
 				}],
 				xy: [{
 					icon: '/image/cb/4.png',
@@ -162,6 +186,11 @@
 					tex: '历史数据',
 					path: '/pages/cb/xy/equip-set/xyhistoryile',
 					tf:false
+				},{
+					icon: '/image/environment/7.png',
+					tex: '一键报修',
+					path: '/pages/afterSale/addafter',
+					tf:true
 				}],
 				newState: {}, //设备最新状态
 				setTimeShow: false,
@@ -174,7 +203,7 @@
 				yxShow: false, //诱芯弹框
 				xyErr: '',
 				decoy: '',
-				newtishitf:false
+				newtishitf:false,
 			}
 		},
 		computed: {
@@ -229,11 +258,11 @@
 							}, {
 								icon: '/image/cb/icon08.png',
 								txt: '环境温度(℃)',
-								value: this.newState.at
+								value: this.newState.at=="2.5"||this.newState.at=="25"||this.newState.at==""?this.newState.new_tem:this.newState.at
 							}, {
 								icon: '/image/cb/icon07.png',
 								txt: '环境湿度(%)',
-								value: this.newState.ah
+								value:this.newState.ah=="30"||this.newState.ah=="3.0"||this.newState.ah==""?this.newState.new_hum:this.newState.ah
 							}, {
 								icon: '/image/cb/icon16.png',
 								txt: '信号强度',
@@ -292,11 +321,11 @@
 							}, {
 								icon: '/image/cb/icon08.png',
 								txt: '环境温度(℃)',
-								value: this.newState.at
+								value: this.newState.at=="2.5"||this.newState.at=="25"||this.newState.at==""?this.newState.new_tem:this.newState.at
 							}, {
 								icon: '/image/prevention/66.png',
 								txt: '环境湿度(%)',
-								value: this.newState.ah
+								value:this.newState.ah=="30"||this.newState.ah=="3.0"||this.newState.ah==""?this.newState.new_hum:this.newState.ah
 							}, {
 								icon: '/image/cb/icon16.png',
 								txt: '信号强度',
@@ -317,15 +346,7 @@
 								icon: '/image/cb/icon08.png',
 								txt: '保温仓设定温度',
 								value: this.newState.set_temp
-							}, {
-								icon: '/image/prevention/107.png',
-								txt: '经度',
-								value: this.newState.lng
-							}, {
-								icon: '/image/prevention/108.png',
-								txt: '纬度',
-								value: this.newState.lat
-							},
+							}
 						];
 					case 4:
 						return [{
@@ -344,14 +365,19 @@
 								value: this.newState.ws == 1 ? '工作' : ' 待机'
 							},
 							{
+								icon: '/image/cb/icon12.png',
+								txt: '设备版本',
+								value: this.newState.dver
+							},
+							{
 								icon: '/image/cb/icon08.png',
 								txt: '环境温度(℃)',
-								value: this.newState.at
+								value: this.newState.at=="2.5"||this.newState.at=="25"||this.newState.at==""?this.newState.new_tem:this.newState.at
 							},
 							{
 								icon: '/image/cb/icon07.png',
 								txt: '环境湿度(%)',
-								value: this.newState.ah
+								value:this.newState.ah=="30"||this.newState.ah=="3.0"||this.newState.ah==""?this.newState.new_hum:this.newState.ah
 							},
 							{
 								icon: '/image/prevention/105.png',
@@ -369,11 +395,6 @@
 								value: this.newState.csq
 							},
 							{
-								icon: '/image/cb/icon12.png',
-								txt: '设备版本',
-								value: this.newState.dver
-							},
-							{
 								icon: '/image/cb/xy/9.png',
 								txt: '充电状态',
 								value: Number(this.newState.cs) == 1 ? '充电' : '正常'
@@ -420,7 +441,7 @@
 		},
 		onLoad(option) {
 			this.equipInfo = JSON.parse(option.info)
-			this.type = Number(this.equipInfo.type)
+			this.type = Number(this.equipInfo.type) || Number(this.equipInfo.equip_type)
 			this.device_status = this.equipInfo.is_online
 			this.getState()
 			console.log(this.equipInfo)
@@ -455,7 +476,6 @@
 								break
 							case "设备控制":
 								this.cbd[3].tf = true
-								
 								break
 							case "害虫统计":
 								this.cbd[2].tf = true
@@ -507,12 +527,14 @@
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.worm_lamp.device_history_data',
 					data: {
-						device_type_id: this.equipInfo.type,
-						device_id: this.equipInfo.imei,
+						device_type_id: this.equipInfo.type || this.equipInfo.equip_type,
+						device_id: this.equipInfo.imei || this.equipInfo.device_id,
 						page: 1,
 						page_size: 1,
 					}
 				})
+				console.log(res)
+				console.log(1222)
 				if(res.counts!=0){
 					this.newState = res.data[0].d_h_t
 					this.newtishitf = true
@@ -523,7 +545,18 @@
 			partClick(path) {
 				console.log(path)
 				uni.navigateTo({
-					url: path + '?d_id=' + this.equipInfo.d_id + "&device_id=" + this.equipInfo.imei
+					url: path + '?d_id=' + this.equipInfo.d_id + "&device_id=" + this.equipInfo.imei + "&device_type="+this.type
+				});
+			},
+			partClicks(){
+				var path = ""
+				if(this.type==3){
+					path="/pages/cb/cbd/equip-set/historyfile"
+				}else if(this.type == 7){
+					path="/pages/cb/bzy/equip-set/bzyhistoryile"
+				}
+				uni.navigateTo({
+					url: path + '?d_id=' + this.equipInfo.d_id + "&device_id=" + this.equipInfo.imei + "&device_type="+this.type
 				});
 			},
 			async setTime(d_id) {
@@ -617,6 +650,15 @@
 					}
 				})
 			},
+			copy(item){
+				console.log(item)
+				uni.setClipboardData({
+				    data: item.imei||item.device_id,
+				    success: function () {
+				        console.log('success');
+				    }
+				});
+			},
 		},
 	}
 </script>
@@ -636,6 +678,11 @@
 			background-position: top left;
 			box-sizing: border-box;
 			width: 100%;
+			.tishi{
+				width: 28rpx;
+				height: 28rpx;
+				margin: 0rpx 0 0 20rpx;
+			}
 		}
 
 		.on {
@@ -658,24 +705,38 @@
 			}
 
 			.item1 {
-				padding: 20rpx 10rpx;
+				padding: 20rpx 0;
 				box-sizing: border-box;
 				flex-basis: 25%;
 			}
 
 			.item2 {
-				padding: 20rpx;
+				padding: 20rpx 10rpx;
 				box-sizing: border-box;
 				flex-basis: 33%;
 				/* flex-grow: 1; */
 			}
+			.item3{
+				padding: 20rpx 0;
+				box-sizing: border-box;
+				flex-basis: 25%;
+			}
 		}
 
 		.tit {
 			font-weight: 800;
-			line-height: 50rpx;
+			height: 50rpx;
 			font-size: 30rpx;
 			margin-bottom: 20rpx;
+			display: flex;
+			justify-content: space-between;
+			.span{
+				color: #6e6c76;
+				font-size: 24rpx;
+				display: flex;
+				justify-content: space-between;
+				/* margin-top: 12rpx; */
+			}
 		}
 		.newtishi{
 			width: 90%;

+ 27 - 5
pages/cb/index/index.vue

@@ -4,7 +4,7 @@
 		<view class="" style="position: relative;top: 44px;">
 			<view style="position: fixed;z-index: 100;">
 				<uni-nav-bar @clickRight="clickRight" @clickLeft="clickLeft" left-icon="back" left-text="返回" right-icon="search"
-				 title="测报灯系统"></uni-nav-bar>
+				 title="测报系统"></uni-nav-bar>
 				<view>
 					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/cb/banner.jpg'" mode="widthFix"></image>
 				</view>
@@ -20,7 +20,8 @@
 					<template v-for="(item,index) in equipArr[active].list">
 						<equipItem @click.native="itemClick(item)" v-bind:item="item" :key="index">
 							<view class="date">
-								最新上报时间:{{item.addtime|timeFormat}}
+								<p>设备名称:{{item.device_name==""?"无":item.device_name}}</p>
+								<p>最新上报时间:{{item.addtime|timeFormat}}</p>
 							</view>
 						</equipItem>
 					</template>
@@ -95,7 +96,7 @@
 								break
 							case "性诱2.0":
 								this.equipArr[3].tf = true
-								this.getEquipList(3)
+								this.getxyEquipList(3)
 								break
 						}
 					}
@@ -114,7 +115,11 @@
 		onPullDownRefresh() {
 			this.equipArr[this.active].pageIndex = 1
 			this.equipArr[this.active].list = []
-			this.getEquipList(this.active)
+			if(this.active==3){
+				this.getxyEquipList(3)
+			}else{
+				this.getEquipList(this.active)
+			}
 			setTimeout(() => {
 				uni.stopPullDownRefresh()
 			}, 1000)
@@ -125,7 +130,11 @@
 				return false
 			}
 			this.equipArr[act].pageIndex++;
-			this.getEquipList(act)
+			if(this.active==3){
+				this.getxyEquipList(3)
+			}else{
+				this.getEquipList(act)
+			}
 		},
 		onPageScroll(e) { //nvue暂不支持滚动监听,可用bindingx代替
 			if (e.scrollTop > 200) { //距离大于200时显示
@@ -155,6 +164,19 @@
 				this.equipArr[act].list = [...this.equipArr[act].list, ...res.data]
 				console.log(this.equipArr[act].list)
 			},
+			async getxyEquipList(act) {
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=sex_lure_nl.sex_lure.nl_device_list',
+					data: {
+						device_type_id: this.equipArr[act].type,
+						page: this.equipArr[act].pageIndex,
+						page_size: 10,
+					}
+				})
+				console.log(res)
+				this.equipArr[act].list = [...this.equipArr[act].list, ...res.data]
+				console.log(this.equipArr[act].list)
+			},
 			tabClick(index) {
 				this.active = index;
 				this.device_id = this.equipArr[index].type

+ 44 - 9
pages/cb/index/search.vue

@@ -17,11 +17,12 @@
 					<image :src="item.is_online==1?'http://static.yfpyx.com/bigdata_app/image/prevention/6.png':'http://static.yfpyx.com/bigdata_app/image/prevention/7.png'" mode=""
 					 class="prevents_item_img"></image>
 					<view class="prevents_item_top">
-						<p>设备 ID:{{item.imei}}</p>
+						<p>设备 ID:{{item.imei || item.device_id}}</p>
 						<p :class="item.is_online==1?'green':'red'" v-text="item.is_online==1?'在线':'离线'"></p>
 					</view>
 					<view class="prevents_item_bot">
-						最新上报时间:{{item.addtime|timeFormat()}}
+						<p>设备名称:{{item.device_name}}</p>
+						<p>最新上报时间:{{item.addtime|timeFormat()}}</p>
 					</view>
 				</view>
 			</view>
@@ -66,17 +67,42 @@
 					this.none = false
 				}
 			},
+			async getxyEquipList(act) {
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=sex_lure_nl.sex_lure.nl_device_list',
+					data: {
+						device_type_id: this.device_id,
+						page: this.page,
+						page_size: 10,
+					}
+				})
+				this.eqlistdata = this.eqlistdata.concat(res.data)
+				console.log(res)
+				if(this.eqlistdata.length==0){
+					this.none = true
+				}else{
+					this.none = false
+				}
+			},
 			searchinp(){
 				Debounce(() => {
 					this.eqlistdata = []
 					this.page = 1
-					this.searchEquip()
+					if(this.device_id==10){
+						this.getxyEquipList()
+					}else{
+						this.searchEquip()
+					}
 				}, 1000)()
 			},
 			search(){
 				this.eqlistdata = []
 				this.page = 1
-				this.searchEquip()
+				if(this.device_id==10){
+					this.getxyEquipList()
+				}else{
+					this.searchEquip()
+				}
 			},
 			clickLeft(){
 				uni.navigateTo({
@@ -93,19 +119,28 @@
 				item.type = Number(this.device_id)
 				console.log(item)
 				let data = JSON.stringify(item)
-				uni.navigateTo({
-					url: '/pages/cb/equip-detail/equip-detail?info=' + data
-				});
+				if(item.type==10){
+					uni.navigateTo({
+						url: '/pages/cb/xy2.0/particulars?info=' + data
+					});
+				}else{
+					uni.navigateTo({
+						url: '/pages/cb/equip-detail/equip-detail?info=' + data
+					});
+				}
 			}
 		},
 		onLoad(option){
 			this.device_id = option.device_id
-			console.log(this.device_id)
 		},
 		onReachBottom() {
 			this.page++
 			console.log(1)
-			this.searchEquip()
+			if(this.device_id==10){
+				this.getxyEquipList()
+			}else{
+				this.searchEquip()
+			}
 		},
 		onBackPress(options) {
 			if (options.from === 'navigateBack') {

+ 9 - 3
pages/cb/sim/sim.vue

@@ -3,7 +3,7 @@
 		<view class="section">
 			<view class="tit">
 				<image mode="widthFix" src="http://static.yfpyx.com/bigdata_app/image/cb/sim1.png" ></image>
-				sim卡流量
+				数据sim卡流量
 			</view>
 			<view class="item">
 				<text>ICCID:</text>
@@ -34,7 +34,7 @@
 			<view class="section">
 				<view class="tit">
 					<image mode="widthFix" src="http://static.yfpyx.com/bigdata_app/image/cb/sim2.png" ></image>
-					海康sim卡流量
+					图片sim卡流量
 				</view>
 				<view class="item">
 					<text>ICCID:</text>
@@ -103,6 +103,9 @@
 			}
 		},
 		onLoad(option){
+			if(Number(option.device_type)==4){
+				this.showHksimFlag = false
+			}
 			this.d_id=option.d_id
 			this.lookSIMCode('sim')
 			this.lookSIMCode('hksim')
@@ -144,7 +147,10 @@
 						iccid:res[0].iccid,
 					}
 				})
-				let obj=eval('('+res2.data+')').data
+				
+				// let obj=eval('('+res2.data+')').data
+				let obj = res2.data.data
+				console.log(obj)
 				if(flag=='sim'){
 					this.sim={
 						iccid: res[0].iccid,

+ 1 - 0
pages/cb/xy2.0/historydatas.vue

@@ -297,6 +297,7 @@
 		onShow(){
 			this.end_time = +new  Date() + 1000
 			this.start_time = this.end_time - 24 * 60 * 60 * 1000
+			console.log(new Date(this.end_time),new Date(this.start_time))
 			setTimeout(()=>{
 				this.history()
 				this.historylist()

+ 115 - 30
pages/cb/xy2.0/particulars.vue

@@ -2,18 +2,29 @@
 	<view>
 		<view class="">
 			<view :class="['info',equipInfo.is_online==1?'on':'off']">
-				<p>设备ID:{{newState.device_id}}</p>
+				<p @click="copy(newState.device_id)">设备ID:{{newState.device_id}}<image src="http://static.yfpyx.com/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image></p>
 				<p>设备名称:{{newState.device_name}}</p>
 				<p>最新上报时间:{{newState.uptime | timeFormat}}</p>
 				<p>最新地址:{{newState.addr}}</p>
-				<p class="fillin" @click="addxy">测报害虫:<input type="text" v-model="newState.decoy" disabled/><u-icon name="edit-pen" color="#f0ad4e" size="28"></u-icon></p>
-				<p>诱芯更换时间:<span v-if="newState.xy_uptime">{{newState.xy_uptime | timeFormat }}</span><span v-else>暂无</span></p>
-				<p>已使用天数:{{newState.day}}<span class="expiretishi" v-if="expiretext">{{"("+expiretext+")"}}</span></p>
+				<p class="fillin" @click="addxy">测报害虫:<input type="text" v-model="newState.decoy" disabled v-if="newState.decoy"/><u-icon name="edit-pen" color="#f0ad4e" size="28"></u-icon></p>
+				<p @click="glass_show=true">诱芯更换时间:<span style="margin:0 20rpx;">{{yxchangetime}}</span><u-icon name="edit-pen" color="#f0ad4e" size="28"></u-icon></p>
+				<p @click="glass_showtwo=true">诱芯到期时间:<span style="margin:0 20rpx;">{{yxendtime}}</span><u-icon name="edit-pen" color="#f0ad4e" size="28"></u-icon></p>
+				<u-calendar v-model="glass_show" mode="date" @change="timeChange"></u-calendar>
+				<u-calendar v-model="glass_showtwo" mode="date" :max-date="date" @change="timeChangetwo"></u-calendar>
+			</view>
+			<view class="control">
+				<view class="control_item" @click="repairs">
+					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/7.png'" mode=""></image>
+					<p>一键报修</p>
+				</view>
+				<view class="control_item" @click="toggle">
+					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/cb/2.png'" mode=""></image>
+					<p>历史数据</p>
+				</view>
 			</view>
 			<view class="realtime">
 				<view class="realtime_title">
 					<p>实时数据</p>
-					<p class="span" @click="toggle">历史数据>>></p>
 				</view>
 				<view class="realtime_text">
 					<view class="realtime_item">
@@ -77,14 +88,14 @@
 						<view class="sim_plan_text">
 							<p :style="{width:usedBeliel+'%'}"></p>
 						</view>
-						{{simdata.data_plan - simdata.data_balance}}MB
+						{{simdata.data_plan - simdata.data_balance.toFixed(2)}}MB
 					</view>
 					<view class="sim_plan">
 						剩余流量:
 						<view class="sim_plan_text">
 							<p :style="{width:residueBeliel+'%'}"></p>
 						</view>
-						{{simdata.data_balance}}MB
+						{{simdata.data_balance.toFixed(2)}}MB
 					</view>
 					<p class="p">到期时间:{{simdata.expiry_date | timeFormat}}</p>
 				</view>
@@ -114,7 +125,12 @@
 				expiretext:"",
 				yxShow:false,
 				xyErr:"",
-				decoy:""
+				decoy:"",
+				yxchangetime:0,//更换诱芯时间
+				yxendtime:0,//诱芯到期时间
+				glass_show:false,//更换诱芯时间选择
+				glass_showtwo:false,//诱芯到期时间选择
+				date:""
 			}
 		},
 		methods: {
@@ -126,21 +142,24 @@
 					}
 				})
 				this.newState = res[0]
-				if(Object.keys(this.newState.expire)[0]){
-					console.log(Object.keys(this.newState.expire)[0])
+				if(res[0].xy_expire_time==0){
+					this.yxendtime = "暂无"
+				}else{
+					var times = new Date(res[0].xy_expire_time*1000)
+					var month = times.getMonth()+1
+					month = month<10?"0"+month:month
+					var date = times.getDate()<10?"0"+times.getDate():times.getDate()
+					this.yxendtime = times.getFullYear() + "-" + month + "-" + date
 				}
-				switch (Number(Object.keys(this.newState.expire)[0])){
-					case 0 :
-						this.expiretext = "已过期,请更换诱芯"
-						break;
-					case 1 :
-						this.expiretext = "剩余"+(40-this.newState.day)+"天,请及时更换诱芯"
-						break;
-					case 2 :
-						this.expiretext = ""
-						break;
+				if(res[0].xy_uptime==0){
+					this.yxendtime = "暂无"
+				}else{
+					var times = new Date(res[0].xy_uptime*1000)
+					var month = times.getMonth()+1
+					month = month<10?"0"+month:month
+					var date = times.getDate()<10?"0"+times.getDate():times.getDate()
+					this.yxchangetime = times.getFullYear() + "-" + month + "-" + date
 				}
-				console.log(res)
 			},
 			async getSim(d_id) {
 				const res = await this.$myRequest({
@@ -159,13 +178,10 @@
 					this.simTF = false
 				}
 			},
-			async getworm(pest_name) {
+			async getworm(data,info) {
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=sex_lure_nl.sex_lure.nl_device_set_lure',
-					data: {
-						d_id: this.equipInfo.d_id,
-						pest_name:pest_name
-					}
+					data: data
 				})
 				console.log(res)
 				if(res.code == 200){
@@ -173,7 +189,13 @@
 						title: "设置成功",
 						icon: "none"
 					})
-					this.newState.decoy = pest_name
+					if(data.expire_time){
+						this.yxendtime = info
+					}else if(data.pest_name){
+						this.newState.decoy = info
+					}else if(data.addtime){
+						this.yxchangetime = info
+					}
 				}
 			},
 			toggle(){
@@ -190,10 +212,44 @@
 					this.xyErr = "请填写害虫名称"
 				}else{
 					this.xyErr = ""
-					this.getworm(this.decoy)
+					var obj = {
+						d_id: this.equipInfo.d_id,
+						pest_name:this.decoy
+					}
+					this.getworm(obj,this.decoy)
 					console.log(this.decoy)
 					this.yxShow =false
 				}
+			},
+			timeChange(e){
+				console.log(e)
+				var obj = {
+					d_id: this.equipInfo.d_id,
+					addtime:+new Date(e.result)/1000
+				}
+				this.getworm(obj,e.result)
+			},
+			timeChangetwo(e){
+				console.log(e)
+				var obj = {
+					d_id: this.equipInfo.d_id,
+					expire_time:+new Date(e.result)/1000
+				}
+				this.getworm(obj,e.result)
+			},
+			copy(item){
+				console.log(item)
+				uni.setClipboardData({
+				    data: item,
+				    success: function () {
+				        console.log('success');
+				    }
+				});
+			},
+			repairs(){
+				uni.navigateTo({
+					url: "../../afterSale/addafter?device_id="+ this.newState.device_id +"&device_type="+ 10
+				})
 			}
 		},
 		onLoad(option) {
@@ -201,6 +257,9 @@
 			console.log(this.equipInfo)
 			this.getState(this.equipInfo.d_id)
 			this.getSim(this.equipInfo.d_id)
+			var times = new Date()
+			this.date = times.getFullYear()+1 + "-" + Number(times.getMonth()+1) + "-" + times.getDate()
+			console.log(this.date)
 			// uni.getStorage({ 待开发
 			// 	key:"jurisdiction",
 			// 	success:(res)=>{
@@ -238,6 +297,11 @@
 			font-size: 24rpx;
 			color: #FF0000;
 		}
+		.tishi{
+			width: 28rpx;
+			height: 28rpx;
+			margin: 0rpx 0 0 20rpx;
+		}
 		.fillin{
 			display: flex;
 			input{
@@ -257,9 +321,30 @@
 	.off {
 		background-image: url('http://static.yfpyx.com/bigdata_app/image/cb/offBg.png')
 	}
+	.control {
+		width: 90%;
+		display: flex;
+		text-align: center;
+		box-sizing: border-box;
+		margin: 30rpx auto;
+		.control_item {
+			width: 120rpx;
+			height: 120rpx;
+			margin-right: 40rpx;
+			image {
+				width: 70rpx;
+				height: 70rpx;
+			}
+	
+			p {
+				font-size: 24rpx;
+			}
+		}
+	}
+	
 	.realtime{
 		width: 95%;
-		margin: 40rpx auto;
+		margin: 0rpx auto;
 		.realtime_title{
 			font-size: 36rpx;
 			display: flex;
@@ -312,7 +397,7 @@
 				display: flex;
 				margin-top: 20rpx;
 				.sim_plan_text{
-					width: 65%;
+					width: 60%;
 					height: 16rpx;
 					background-color: #cccccc;
 					border-radius:8rpx ;

+ 78 - 29
pages/distribution/index.vue

@@ -37,53 +37,47 @@
 				covers: [],
 				list: [{
 					name: "全部"
-				}, {
-					name: "杀虫灯"
-				}, {
-					name: "测报灯"
-				}, {
-					name: "性诱测报"
-				}, {
-					name: "环境检测"
-				}, {
-					name: "监控设备"
-				}, {
-					name: "孢子仪",
-				},{
-					name: "性诱2.0"
 				}],
 				current: 0,
 				icon: [{
 						id: '', //全部
-						url: "../../static/images/distribution/7610e3983eb33ed5b9ad72ebdfc8ed2.png"
+						url: "../../static/images/distribution/7610e3983eb33ed5b9ad72ebdfc8ed2.png",
+						name: "全部"
 					},
 					{
 						id: 2, //杀虫灯
-						url: "../../static/images/distribution/1bd535eb7dbb0809940030d40c64b4c.png"
+						url: "../../static/images/distribution/1bd535eb7dbb0809940030d40c64b4c.png",
+						name: "杀虫灯"
 					},
 					{
 						id: 3, //测报灯
-						url: "../../static/images/distribution/0b551e50be351dbc14f0dd6470e3443.png"
+						url: "../../static/images/distribution/0b551e50be351dbc14f0dd6470e3443.png",
+						name: "测报灯"
 					},
 					{
 						id: 4, //性诱测报
-						url: "../../static/images/distribution/be5c1cfed22713a9544f020cf41c25f.png"
+						url: "../../static/images/distribution/be5c1cfed22713a9544f020cf41c25f.png",
+						name: "性诱测报"
 					},
 					{
 						id: 5, //环境检测
-						url: "../../static/images/distribution/8325b1b6079456ce43f952ce13d2919.png"
+						url: "../../static/images/distribution/8325b1b6079456ce43f952ce13d2919.png",
+						name: "环境检测"
 					},
 					{
 						id: 6, //监控设备
-						url: "../../static/images/distribution/2eb9e550709430a1bd8178568c14785.png"
+						url: "../../static/images/distribution/2eb9e550709430a1bd8178568c14785.png",
+						name: "监控设备"
 					},
 					{
 						id: 7, //孢子仪
-						url: "../../static/images/distribution/54a96e2b0ad4efeecbd4a7b5e6deda3.png"
+						url: "../../static/images/distribution/54a96e2b0ad4efeecbd4a7b5e6deda3.png",
+						name: "孢子仪",
 					},
 					{
 						id: 10, //性诱2.0
-						url: "../../static/images/distribution/515ea6143e0aaff4a823270c7aa00a6.png"
+						url: "../../static/images/distribution/515ea6143e0aaff4a823270c7aa00a6.png",
+						name: "性诱2.0"
 					},
 				],
 				type: '', //设备类型
@@ -99,11 +93,63 @@
 					position:"absolute",
 					bottom:"0rpx"
 				},
-				facilitydatas:[]
+				facilitydatas:[],
 			}
 		},
-		onLoad() {
-			this.history()
+		onShow() {
+			this.device_id = ""
+			this.list = [{
+					name: "全部"
+				}]
+			uni.getStorage({
+				key: "jurisdiction",
+				success: (res) => {
+					console.log(JSON.parse(res.data))
+					var res = JSON.parse(res.data)
+					for (var i = 0; i < res.length; i++) {
+						switch (res[i].purview_name) {
+							case "测报系统":
+								for (var j = 0; j < res[i].children.length; j++) {
+									var obj = {
+										name: res[i].children[j].purview_name=="虫情测报灯"?"测报灯":res[i].children[j].purview_name
+									}
+									this.list.push(obj)
+								}
+								break;
+							case "监控系统":
+								for (var j = 0; j < res[i].children.length; j++) {
+									var obj = {
+										name: res[i].children[j].purview_name
+									}
+									this.list.push(obj)
+								}
+								break;
+							case "环境监测系统":
+								for (var j = 0; j < res[i].children.length; j++) {
+									var obj = {
+										name: res[i].children[j].purview_name
+									}
+									this.list.push(obj)
+								}
+								break;
+							case "防治系统":
+								for (var j = 0; j < res[i].children.length; j++) {
+									var obj = {
+										name: res[i].children[j].purview_name
+									}
+									this.list.push(obj)
+								}
+								break;
+						}
+					}
+					for (var i = 0; i < this.icon.length; i++) {
+						if (this.list[0].name == this.icon[i].name) {
+							this.type = this.icon[i].id
+						}
+					}
+					this.history()
+				},
+			})
 		},
 		methods: {
 			async history() { //获取分布位置
@@ -145,10 +191,13 @@
 				this.current = index
 				if (index == 0) {
 					this.type = ''
-				} else if(index == 7){
-					this.type = index + 3
-				} else {
-					this.type = index + 1
+				}else{
+					for (var i = 0; i < this.icon.length; i++) {
+						if (this.list[index].name == this.icon[i].name) {
+							console.log(this.icon[i].id)
+							this.type = this.icon[i].id
+						}
+					}
 				}
 				this.history()
 			},

+ 30 - 14
pages/environment/equipment.vue

@@ -9,7 +9,9 @@
 				<view class="info_item">
 					<image :src="eqinfo.item.is_online==1?'http://static.yfpyx.com/bigdata_app/image/cb/onBg.png':'http://static.yfpyx.com/bigdata_app/image/cb/offBg.png'" mode=""
 					 class="bgi"></image>
-					<p style="font-size: 32rpx;">设备 ID:{{eqinfo.item.equip_id}}</p>
+					<p style="font-size: 32rpx;" @click="copy(eqinfo.item)">设备 ID:{{eqinfo.item.equip_id||eqinfo.item.device_id}}
+					<image src="http://static.yfpyx.com/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image>
+					</p>
 					<p>设备名称:{{eqinfo.item.equip_name?eqinfo.item.equip_name:"无"}}</p>
 					<p>最近上报时间:{{eqinfo.item.uptime|timeFormat()}}</p>
 					<p>地址:{{city==""?"--":city}}</p>
@@ -17,12 +19,12 @@
 			</view>
 			<view class="control">
 				<view class="control_item" v-if="kongtf" @click="control">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/prevention/8.png'" mode=""></image>
+					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/8.png'" mode=""></image>
 					<p>设备控制</p>
 				</view>
-				<view class="control_item" v-if="daydatatf" @click="information">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/9.png'" mode=""></image>
-					<p>24小时数据</p>
+				<view class="control_item"  @click="repairs">
+					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/7.png'" mode=""></image>
+					<p>一键报修</p>
 				</view>
 				<view class="control_item" v-if="shujutf" @click="charts">
 					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/10.png'" mode=""></image>
@@ -72,7 +74,7 @@
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=weather.weather.qxz_status',
 					data: {
-						device_id: this.eqinfo.item.equip_id
+						device_id: this.eqinfo.item.equip_id || this.eqinfo.item.device_id
 					}
 				})
 				this.olddata = res
@@ -89,11 +91,6 @@
 					url: "./contros?id=" + this.eqinfo.item.d_id
 				})
 			},
-			information() { //24小时数据
-				uni.navigateTo({
-					url: "./onedaythedata?id=" + this.eqinfo.item.equip_id
-				})
-			},
 			charts() { //历史数据
 				uni.navigateTo({
 					url: "./history?device_id=" + this.eqinfo.item.equip_id
@@ -109,6 +106,21 @@
 						this.city = ress.data.regeocode.formatted_address
 					}  
 				});
+			},
+			copy(item){
+				uni.setClipboardData({
+				    data: item.equip_id||item.device_id,
+				    success: function () {
+				        console.log('success');
+				    }
+				});
+			},
+			repairs(){
+				console.log(this.eqinfo.item)
+				var device_id = this.eqinfo.item.equip_id||this.eqinfo.item.device_id
+				uni.navigateTo({
+					url: "../afterSale/addafter?device_id="+ device_id +"&device_type="+ 5
+				})
 			}
 		},
 		onLoad(option) {
@@ -160,23 +172,27 @@
 		.info_item {
 			width: 90%;
 			margin: 0 auto;
-			height: 260rpx;
+			height: 250rpx;
 			padding: 26rpx 50rpx;
 			position: relative;
 			box-sizing: border-box;
 			.bgi {
 				width: 100%;
-				height: 260rpx;
+				height: 250rpx;
 				position: absolute;
 				top: 0;
 				left: 0;
 				z-index: -1;
 			}
-
 			p {
 				font-size: 24rpx;
 				color: #FFFFFF;
 				margin-bottom: 10rpx;
+				.tishi{
+					width: 30rpx;
+					height: 30rpx;
+					margin: 0rpx 0 0 20rpx;
+				}
 			}
 		}
 	}

+ 8 - 2
pages/environment/history.vue

@@ -150,7 +150,13 @@
 					for (var key in res.conf) {
 						var obj = {}
 						if (res.conf[key] != "") {
-							obj.name = res.conf[key]
+							var arr = res.conf[key].split("#")
+							if(arr[0].length==2){
+								arr[0]=arr[0]+"    "
+							}else if(arr[0].length==1){
+								arr[0]=arr[0]+"  "
+							}
+							obj.name = arr[0]+"("+arr[1]+")"
 						}
 						var arr = []
 						for (var i = 0; i < res.data.length; i++) {
@@ -245,7 +251,7 @@
 						line: {
 							type: 'curve'
 						}
-					}
+					},
 				});
 			},
 			touchLineA(e) {

+ 2 - 1
pages/environment/index.vue

@@ -16,7 +16,8 @@
 						<p :class="item.is_online==1?'green':'red'" v-text="item.is_online==1?'在线':'离线'"></p>
 					</view>
 					<view class="prevents_item_bot">
-						最新上报时间:{{item.uptime|timeFormat()}}
+						<p>设备名称:{{item.equip_name==""?"无":item.equip_name}}</p>
+						<p>最新上报时间:{{item.uptime|timeFormat()}}</p>
 					</view>
 				</view>
 			</view>

+ 2 - 1
pages/environment/search.vue

@@ -18,7 +18,8 @@
 						<p :class="item.is_online==1?'green':'red'" v-text="item.device_status==1?'在线':'离线'"></p>
 					</view>
 					<view class="prevents_item_bot">
-						最新上报时间:{{item.uptime|timeFormat()}}
+						<p>设备名称:{{item.equip_name==""?"无":item.equip_name}}</p>
+						<p>最新上报时间:{{item.uptime|timeFormat()}}</p>
 					</view>
 				</view>
 			</view>

+ 137 - 52
pages/equipList/index.vue

@@ -6,7 +6,7 @@
 		</view>
 		<view class="utabs_box">
 			<view class="utabs">
-				<u-tabs :list="list" :is-scroll="true" :current="current" @change="change" item-width="140" font-size="24" gutter="20"
+				<u-tabs :list="list" :is-scroll="true" :current="currents" @change="change" item-width="140" font-size="24" gutter="20"
 				 bar-width="60" active-color="#42b983"></u-tabs>
 			</view>
 		</view>
@@ -14,15 +14,17 @@
 			<view class="list_item" v-for="(item,index) in eqlistdata" :key="index" @click="historys(item)">
 				<view class="list_item_top">
 					<p class="p1">
-						<image :src="'http://static.yfpyx.com/bigdata_app'+images[current].path" mode=""></image>
+						<image :src="'http://static.yfpyx.com/bigdata_app'+imgpath[0].path" mode=""></image>
 						{{item.device_name==''?"--":item.device_name}}
 					</p>
 					<p :class="[item.is_online?'p2':'p_out']">{{item.is_online?"在线":"离线"}}</p>
 				</view>
 				<view class="list_item_text">
-					<p>设备ID:{{item.imei}}</p>
+					<p>设备ID:{{item.imei || item.device_id}}</p>
 					<p>适配用户:{{item.real_name==''?"无":item.real_name}}</p>
-					<p>添加设备时间:{{item.addtime|timeFormat()}}</p>
+					<p>最新上报时间:{{item.addtime|timeFormat()}}</p>
+					<p>添加设备时间:{{item.uptime|timeFormat()}}</p>
+					<p>设备已运行:{{item.days}}天</p>
 				</view>
 				<view class="list_item_btn" v-if="infoalter" @click.stop="modification(item)">
 					信息修改
@@ -39,70 +41,91 @@
 	export default {
 		data() {
 			return {
-				list: [{
-					name: "杀虫灯"
-				}, {
-					name: "测报灯"
-				}, {
-					name: "智能性诱"
-				}, {
-					name: "环境检测"
-				}, {
-					name: "监控设备"
-				}, {
-					name: "孢子仪"
-				}, {
-					name: "性诱2.0"
-				}],
+				list: [],
 				current: 0,
+				currents:0,
 				page: 1,
 				size: 10,
 				images: [{
+						name: "杀虫灯",
 						path: "/image/fourMoodBase/3.png", //
 						id: 2
 					},
 					{
+						name: "测报灯",
 						path: "/image/fourMoodBase/1.png",
 						id: 3
 					}, {
+						name: "性诱测报",
 						path: "/image/fourMoodBase/6.png",
 						id: 4
 					}, {
+						name: "环境监测",
 						path: "/image/fourMoodBase/5.png",
 						id: 5
 					}, {
+						name: "监控设备",
 						path: "/image/fourMoodBase/2.png",
 						id: 6
 					}, {
+						name: "孢子仪",
 						path: "/image/fourMoodBase/4.png",
 						id: 7
 					},
 					{
+						name: "性诱2.0",
 						path: "/image/fourMoodBase/10.png",
 						id: 10
 					}
 				],
 				eqlistdata: [],
 				isTop: false,
-				infoalter:false // 权限设置
+				infoalter: false, // 权限设置,
+				type_id: 0, //设备类型,
+				imgpath:[]
 			}
 		},
 		methods: {
-			async eqlist() { //设备列表
-				if (this.current == 6) {
-					var index = this.current + 4
-				} else {
-					var index = this.current + 2
-				}
+			async eqlist(tf) { //设备列表
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.worm_lamp.lamp_list',
 					data: {
-						device_type_id: index,
+						device_type_id: this.type_id,
 						page: this.page,
 						page_size: this.size,
 					}
 				})
-				this.eqlistdata = this.eqlistdata.concat(res.data)
+				var newtime = +new Date() / 1000
+				if(tf){
+					this.eqlistdata = this.eqlistdata.concat(res.data)
+				}else{
+					this.eqlistdata = res.data
+				}
+				for (var i = 0; i < this.eqlistdata.length; i++) {
+					var days = (newtime - this.eqlistdata[i].uptime) / 60 / 60 / 24
+					this.eqlistdata[i].days = Math.round(days)
+				}
+				console.log(res)
+			},
+			async xyeqlist(tf) { //设备列表
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=sex_lure_nl.sex_lure.nl_device_list',
+					data: {
+						device_type_id: this.type_id,
+						page: this.page,
+						page_size: this.size,
+					}
+				})
+				var newtime = +new Date() / 1000
+				if(tf){
+					this.eqlistdata = this.eqlistdata.concat(res.data)
+				}else{
+					this.eqlistdata = res.data
+				}
+				for (var i = 0; i < this.eqlistdata.length; i++) {
+					var days = (newtime - this.eqlistdata[i].uptime) / 60 / 60 / 24
+					this.eqlistdata[i].days = Math.round(days)
+				}
 				console.log(res)
 			},
 			//camera.camera_manage.list_camera
@@ -116,26 +139,34 @@
 				this.accessToken = res.accessToken
 			},
 			change(index) { //头部导航栏的点击
+				this.current = index
+				this.currents = index
 				this.page = 1
 				this.eqlistdata = []
-				this.current = index
-				this.eqlist()
+				console.log(index)
+				for (var i = 0; i < this.images.length; i++) {
+					if (this.list[index].name == this.images[i].name) {
+						this.type_id = this.images[i].id
+					}
+				}
+				this.imgpath = this.images.filter((item)=>{
+					return item.id == this.type_id
+				})
+				if (this.type_id == 10) {
+					this.xyeqlist()
+				} else {
+					this.eqlist()
+				}
 			},
 			clickRight() { //搜索
 				uni.navigateTo({
-					url: "./search?id=" + (this.current + 2)
+					url: "./search?id=" + this.type_id
 				})
 			},
 			modification(item) {
-				if(this.current==6){
-					uni.navigateTo({
-						url: "./modification?data=" + JSON.stringify(item) + "&id=" + (this.current + 4)
-					})
-				}else{
-					uni.navigateTo({
-						url: "./modification?data=" + JSON.stringify(item) + "&id=" + (this.current + 2)
-					})
-				}
+				uni.navigateTo({
+					url: "./modification?data=" + JSON.stringify(item) + "&id=" + this.type_id,
+				})
 			},
 			top() {
 				uni.pageScrollTo({
@@ -144,7 +175,7 @@
 				})
 			},
 			historys(item) {
-				switch (this.current + 2) {
+				switch (this.type_id) {
 					case 2:
 						uni.navigateTo({
 							url: "../prevention/equipmentdetails?shebei=" + JSON.stringify(item)
@@ -170,19 +201,19 @@
 						})
 						break;
 					case 3:
-						item.type = this.current + 2
+						item.type = this.type_id
 						uni.navigateTo({
 							url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item)
 						})
 						break;
 					case 4:
-						item.type = this.current + 2
+						item.type = this.type_id
 						uni.navigateTo({
 							url: "../cb/equip-detail/equip-detail?info=" + JSON.stringify(item)
 						})
 						break;
 					default:
-						item.type = this.current + 4
+						item.type = this.type_id
 						uni.navigateTo({
 							url: "../cb/xy2.0/particulars?info=" + JSON.stringify(item)
 						})
@@ -191,29 +222,83 @@
 			}
 		},
 		onLoad() {
-			this.eqlist()
+			this.list=[]
 			this.camera()
 			uni.getStorage({
-				key:"jurisdiction",
-				success:(res)=>{
+				key: "jurisdiction",
+				success: (res) => {
 					console.log(JSON.parse(res.data))
-					let items = JSON.parse(res.data).filter((item)=>{
+					let items = JSON.parse(res.data).filter((item) => {
 						return item.purview_name == "设备管理"
 					})
-					let items2 = items[0].children.filter((item)=>{
-						return item.purview_name == "分配设备"
+					let items2 = items[0].children.filter((item) => {
+						return item.purview_name == "设备列表"
 					})
 					console.log(items2[0].children)
-					this.infoalter = items2[0].children.some((item)=>{
+					this.infoalter = items2[0].children.some((item) => {
 						return item.purview_name == "修改名称" || item.purview_name == "添加位置"
 					})
 					console.log(this.infoalter)
+					var res = JSON.parse(res.data)
+					for (var i = 0; i < res.length; i++) {
+						switch (res[i].purview_name) {
+							case "测报系统":
+								for (var j = 0; j < res[i].children.length; j++) {
+									var obj = {
+										name: res[i].children[j].purview_name=="虫情测报灯"?"测报灯":res[i].children[j].purview_name
+									}
+									this.list.push(obj)
+								}
+								break;
+							case "监控系统":
+								for (var j = 0; j < res[i].children.length; j++) {
+									var obj = {
+										name: res[i].children[j].purview_name
+									}
+									this.list.push(obj)
+								}
+								break;
+							case "环境监测系统":
+								for (var j = 0; j < res[i].children.length; j++) {
+									var obj = {
+										name: res[i].children[j].purview_name
+									}
+									this.list.push(obj)
+								}
+								break;
+							case "防治系统":
+								for (var j = 0; j < res[i].children.length; j++) {
+									var obj = {
+										name: res[i].children[j].purview_name
+									}
+									this.list.push(obj)
+								}
+								break;
+						}
+					}
+					for (var i = 0; i < this.images.length; i++) {
+						if (this.list[this.current].name == this.images[i].name) {
+							this.type_id = this.images[i].id
+						}
+					}
+					this.imgpath = this.images.filter((item)=>{
+						return item.id == this.type_id
+					})
+					if (this.type_id == 10) {
+						this.xyeqlist(false)
+					} else {
+						this.eqlist(false)
+					}
 				},
 			})
 		},
 		onReachBottom() {
 			this.page++
-			this.eqlist()
+			if (this.type_id == 10) {
+				this.xyeqlist(true)
+			} else {
+				this.eqlist(true)
+			}
 		},
 		onPageScroll(e) { //nvue暂不支持滚动监听,可用bindingx代替
 			if (e.scrollTop > 200) { //距离大于200时显示

+ 19 - 4
pages/equipList/modification.vue

@@ -12,7 +12,7 @@
 				</view>
 				<view class="mod_id">
 					<p>设备ID</p>
-					<input type="text" :value="moddata.imei" disabled />
+					<input type="text" :value="moddata.imei || moddata.device_id" disabled />
 				</view>
 				<view class="mod_user">
 					<p>适配用户</p>
@@ -29,7 +29,7 @@
 					<p>设备添加时间</p>
 					<input type="text" :value="moddata.addtime|timeFormat()" disabled />
 				</view>
-				<p style="width: 90%;margin: 0 auto;text-align: right;color: #06B535;"><span style="color: #ff0000;" v-if="quanxian.infoalter">*</span>为可修改</p>
+				<p style="width: 90%;margin: 0 auto;text-align: right;color: #06B535;"><span style="color: #ff0000;">*</span>为可修改</p>
 				<view class="sub" v-if="quanxian.infoalter" @click="btn">
 					提 交
 				</view>
@@ -98,6 +98,17 @@
 				console.log(res)
 				this.selectaddress(this.moddata.lng, this.moddata.lat)
 			},
+			async xyeqlistuser(imei) { //获取设备信息
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=sex_lure_nl.sex_lure.nl_device_list',
+					data: {
+						device_id: imei,
+					}
+				})
+				console.log(res)
+				this.moddata = res.data[0]
+				this.selectaddress(this.moddata.lng, this.moddata.lat)
+			},
 			btn() {
 				this.eqlistcity(this.moddata.lat, this.moddata.lng)
 				this.eqlistname()
@@ -143,7 +154,11 @@
 		},
 		onLoad(option) {
 			console.log(option)
-			this.eqlistuser(option.id, JSON.parse(option.data).imei)
+			if(option.id==10){
+				this.xyeqlistuser(JSON.parse(option.data).device_id)
+			}else{
+				this.eqlistuser(option.id, JSON.parse(option.data).imei)
+			}
 			uni.getStorage({
 				key:"jurisdiction",
 				success:(res)=>{
@@ -152,7 +167,7 @@
 						return item.purview_name == "设备管理"
 					})
 					let items2 = items[0].children.filter((item)=>{
-						return item.purview_name == "分配设备"
+						return item.purview_name == "设备列表"
 					})
 					this.quanxian.namealter = items2[0].children.some((item)=>{
 						return item.purview_name == "修改名称"

+ 32 - 10
pages/equipList/search.vue

@@ -12,7 +12,7 @@
 			<view class="list_item" v-for="(item,index) in eqlistdata" :key="index" @click="historys(item)">
 				<view class="list_item_top">
 					<p class="p1">
-						<image :src=" 'http://static.yfpyx.com/bigdata_app'+images[indexs-2].path" mode=""></image>
+						<image :src="'http://static.yfpyx.com/bigdata_app'+ imgpath[0].path" mode=""></image>
 						{{item.device_name==''?"--":item.device_name}}
 					</p>
 					<p :class="[item.is_online?'p2':'p_out']">{{item.is_online?"在线":"离线"}}</p>
@@ -21,6 +21,8 @@
 					<p>设备ID:{{item.imei}}</p>
 					<p>适配用户:{{item.device_user==''?"无":item.device_user}}</p>
 					<p>添加设备时间:{{item.addtime|timeFormat()}}</p>
+					<p>添加设备时间:{{item.uptime|timeFormat()}}</p>
+					<p>设备已运行:{{item.days}}天</p>
 				</view>
 				<view class="list_item_btn" v-if="infoalter" @click.stop="modification(item)">
 					修改名称
@@ -44,31 +46,43 @@
 				imports: '',
 				eqlistdata: [],
 				images: [{
-						path: "/image/fourMoodBase/scd.png",
+						name: "杀虫灯",
+						path: "/image/fourMoodBase/3.png", //
 						id: 2
 					},
 					{
-						path: "/image/fourMoodBase/cbd.png",
+						name: "测报灯",
+						path: "/image/fourMoodBase/1.png",
 						id: 3
 					}, {
-						path: "/image/fourMoodBase/xycb.png",
+						name: "性诱测报",
+						path: "/image/fourMoodBase/6.png",
 						id: 4
 					}, {
-						path: "/image/fourMoodBase/qxz.png",
+						name: "环境监测",
+						path: "/image/fourMoodBase/5.png",
 						id: 5
 					}, {
-						path: "/image/fourMoodBase/jk.png",
+						name: "监控设备",
+						path: "/image/fourMoodBase/2.png",
 						id: 6
 					}, {
-						path: "/image/fourMoodBase/bzy.png",
+						name: "孢子仪",
+						path: "/image/fourMoodBase/4.png",
 						id: 7
+					},
+					{
+						name: "性诱2.0",
+						path: "/image/fourMoodBase/10.png",
+						id: 10
 					}
 				],
 				eqlistdatatf: false, //暂无数据
 				indexs: 2, //设备id
 				page: 1,
 				size: 10,
-				infoalter:false
+				infoalter:false,
+				imgpath:[]
 			}
 		},
 		methods: {
@@ -83,6 +97,11 @@
 					}
 				})
 				this.eqlistdata = this.eqlistdata.concat(res.data)
+				var newtime = +new Date()/1000
+				for(var i=0;i<this.eqlistdata.length;i++){
+					var days = (newtime-this.eqlistdata[i].uptime)/60/60/24
+					this.eqlistdata[i].days = Math.round(days)
+				} 
 				console.log(this.eqlistdata)
 				if (this.eqlistdata.length == 0) {
 					this.eqlistdatatf = true
@@ -149,7 +168,10 @@
 		},
 		onLoad(option) {
 			this.indexs = option.id
-			console.log(this.indexs)
+			this.imgpath = this.images.filter((item)=>{
+				return item.id == option.id
+			})
+			console.log(this.imgpath)
 			uni.getStorage({
 				key:"jurisdiction",
 				success:(res)=>{
@@ -158,7 +180,7 @@
 						return item.purview_name == "设备管理"
 					})
 					let items2 = items[0].children.filter((item)=>{
-						return item.purview_name == "分配设备"
+						return item.purview_name == "设备列表"
 					})
 					this.infoalter = items2[0].children.some((item)=>{
 						return item.purview_name == "修改名称" || item.purview_name == "添加位置"

+ 24 - 4
pages/expertDiagnosis/index.vue

@@ -58,7 +58,8 @@
 			return {
 				cooperation_academy: [], //合作院校信息
 				cooperation_unit: [], //合作单位信息
-				cooperation_specialist: [], //合作专家信息
+				cooperation_specialist: [], //合作专家信息,
+				jurisdiction:false
 			}
 		},
 		methods: {
@@ -94,15 +95,34 @@
 				});
 			},
 			exchange() {
-				uni.navigateTo({
-					url: "./exchangeShare"
-				});
+				if(this.jurisdiction){
+					uni.navigateTo({
+						url: "./exchangeShare"
+					});
+				}else{
+					uni.showToast({
+						title: "您暂无权限进行此操作,如有需要,请联系管理员",
+						icon: "none"
+					})
+				}
 			}
 		},
 		onLoad() {
 			this.getCooperation(1)
 			this.getCooperation(2)
 			this.getCooperation(3)
+			uni.getStorage({
+				key:"jurisdiction",
+				success:(res)=>{
+					console.log(JSON.parse(res.data))
+					let items = JSON.parse(res.data).filter((item)=>{
+						return item.purview_name == "专家介绍"
+					})
+					this.jurisdiction = items[0].children.some((item)=>{
+						return item.purview_name == "发帖列表"
+					})
+				},
+			})
 		},
 		onBackPress(options) {
 			if (options.from === 'navigateBack') {

+ 1 - 1
pages/expertDiagnosis/wormcase.vue

@@ -8,7 +8,7 @@
 			<view class="particulars">
 				<view class="particulars_item" v-for="(item,index) in content" :key="index" @click="introduce(item.id)">
 					<view class="imgs">
-						<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/loading-2.gif'" mode="" class="imgbg"></image>
+						<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/cb/jiazai.ui.gif'" mode="" class="imgbg"></image>
 						<image :src="item.img_urls" mode="" class="imgs_img"></image>
 					</view>
 					<p>{{item.name}}</p>

+ 40 - 1
pages/fourBase/basefacility.vue

@@ -6,7 +6,7 @@
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="基地设备"></uni-nav-bar>
 			</view>
 			<view class="ass_list">
-				<view class="equipment" v-for="(items,indexs) in assignments" :key="items.id" v-if="tishiTF">
+				<view class="equipment" v-for="(items,indexs) in assignments" :key="items.id" v-if="tishiTF" @click="skip(items)">
 					<view class="equipment_top">
 						<image :src="'http://static.yfpyx.com/bigdata_app'+items.src" mode="" class="equipment_top_img"></image>
 						<span class="equipment_top_name">{{items.type_name}}</span>
@@ -86,6 +86,15 @@
 					this.tishiTF = true
 				}
 			},
+			async camera() { //设备列表
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=camera.camera_manage.list_camera',
+					data: {
+						page_size: 1,
+					}
+				})
+				this.accessToken = res.accessToken
+			},
 			clickLeft() {
 				uni.navigateBack({
 					delta: 1
@@ -96,11 +105,41 @@
 					scrollTop: 0,
 					duration: 500
 				})
+			},
+			skip(items){
+				console.log(items)
+				// uni.navigateTo({
+				// 	url: "../environment/equipment?shebei=" + JSON.stringify(items)
+				// })
+				var item = JSON.stringify(items)
+				switch (items.equip_type){
+					case 5 :
+						uni.navigateTo({
+							url: "../environment/equipment?shebei=" + JSON.stringify(items)
+						})
+					break
+					case 6 :
+						uni.navigateTo({
+							url: "/pages/webview?device_id=" + items.device_id + "&accessToken=" + this.accessToken
+						})
+					break
+					case 10 :
+						uni.navigateTo({
+							url: '/pages/cb/xy2.0/particulars?info=' + item
+						});
+					break
+					default:
+						uni.navigateTo({
+							url: '/pages/cb/equip-detail/equip-detail?info=' + item
+						});
+					break
+				}
 			}
 		},
 		onLoad(option) {
 			this.base_id = option.id
 			this.ybase(option.id)
+			this.camera()
 		},
 		onPageScroll(e) { //nvue暂不支持滚动监听,可用bindingx代替
 			if (e.scrollTop > 200) { //距离大于200时显示

+ 11 - 2
pages/fourBase/index.vue

@@ -21,7 +21,7 @@
 						</view>
 					</view>
 					<view class="bases_list_text">
-						<p><span style="margin-right: 30rpx;">{{items.base_name}}</span><span>{{items.base_area}}㎡</span></p>
+						<p><span style="margin-right: 30rpx;">{{items.base_name}}</span><span>{{items.base_area}}亩</span></p>
 						<p style="font-size: 24rpx;">联系人:{{items.base_charge}}</p>
 						<p style="font-size: 24rpx;">联系电话:{{items.base_phone}}</p>
 						<p style="font-size: 24rpx;">地址:{{items.base_name}}</p>
@@ -99,6 +99,14 @@
 						base_id: this.delid.id
 					}
 				})
+				if(res){
+					uni.showToast({
+						title: '操作成功!',
+						duration: 2000,
+						icon:"none"
+					});
+					this.getFourbase()
+				}
 			},
 			clickLeft() { //返回主页
 				uni.switchTab({
@@ -176,7 +184,7 @@
 			}
 		},
 		onLoad() {
-			this.getFourbase()
+			// this.getFourbase()
 			uni.getStorage({
 				key:"jurisdiction",
 				success:(res)=>{
@@ -202,6 +210,7 @@
 			this.getFourbase()
 		},
 		onShow() {
+			this.getFourbase()
 			this.$forceUpdate()
 		},
 		onPageScroll(e) { //nvue暂不支持滚动监听,可用bindingx代替

+ 9 - 4
pages/fourBase/modification.vue

@@ -94,9 +94,17 @@
 			async addbase() { //获取分布位置 
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=base.bases.base_list',
-					data:this.baseinfo
+					data:this.baseinfo,
+					ret:"modify"
 				})
 				console.log(res)
+				if(res){
+					uni.showToast({
+					    title: '修改成功', 
+					    duration: 2000,
+						icon:"none"
+					});
+				}
 			},
 			clickLeft(){
 				uni.navigateTo({
@@ -178,9 +186,6 @@
 						console.log(this.baseinfo)
 						this.addbase()
 						localStorage.removeItem("id")
-						uni.navigateBack({
-							delta:1
-						})
 					}
 				}
 			},

+ 36 - 10
pages/index/index.vue

@@ -83,7 +83,9 @@
 					hjtf:false,
 					fztf:false,
 					sytf:false,
-					sbtf:false
+					sbtf:false,
+					sqtf:false,
+					zjtf:false
 				}
 			}
 		},
@@ -94,7 +96,9 @@
 					hjtf:false,
 					fztf:false,
 					sytf:false,
-					sbtf:false
+					sbtf:false,
+					sqtf:false,
+					zjtf:false
 				}
 			this.getUserlogin()
 		}, 
@@ -105,7 +109,9 @@
 					hjtf:false,
 					fztf:false,
 					sytf:false,
-					sbtf:false
+					sbtf:false,
+					sqtf:false,
+					zjtf:false
 				}
 			this.loadTF = false
 			this.getUserlogin()
@@ -144,22 +150,42 @@
 						case "系统管理":
 									this.jurisdiction.sbtf = true
 									break;
+						case "四情基地":
+									this.jurisdiction.sqtf = true
+									break;
+						case "专家诊断":
+									this.jurisdiction.zjtf = true
+									break;
 					}
 				}
 			},
 			tabfunction(index) {
 				if (index == 0) {
-					uni.navigateTo({
-						url: "../fourBase/index"
-					})
+					if(this.jurisdiction.sqtf){
+						uni.navigateTo({
+							url: "../fourBase/index"
+						})
+					}else{
+						uni.showToast({
+							title: "此账号未开启此模块,如有需要,请联系管理员",
+							icon: "none"
+						})
+					}
 				} else if (index == 1) {
 					var that = this
 					this.show = true
 				} else if (index == 2) {
-					uni.navigateTo({
-						url: "../expertDiagnosis/index",
-						 
-					})
+					if(this.jurisdiction.zjtf){
+						uni.navigateTo({
+							url: "../expertDiagnosis/index",
+							 
+						})
+					}else{
+						uni.showToast({
+							title: "此账号未开启此模块,如有需要,请联系管理员",
+							icon: "none"
+						})
+					}
 				} else if (index == 3) {
 					uni.navigateTo({
 						url: "../afterSale/index"

+ 8 - 3
pages/login/login.vue

@@ -1,5 +1,5 @@
 <template>
-	<view style="height: 100vh;">
+	<view>
 		<view class="status_bar"></view>
 		<view class="logo" @longpress="logoTime">
 			<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/login/8eef2e54055a5b072a5dc000919a7ae.png'" mode=""></image>
@@ -105,6 +105,7 @@
 					this.value = res.data
 				}
 			})
+			console.log(this.value)
 		},
 		onShow() {
 			this.getEquipList()
@@ -154,7 +155,8 @@
 			},
 			upgrade() {
 				console.log(this.appName)
-				var url = this.value + "/app_file/" + this.appName
+				// var url = this.value + "/app_file/" + this.appName
+				var url = "http://hnyfwlw.com/app/big_data.apk"
 				console.log(url)
 				const downloadTask = uni.downloadFile({
 					url: url, //仅为示例,并非真实的资源
@@ -243,6 +245,9 @@
 							icon: "none"
 						})
 						this.getEquipList()
+						uni.removeStorage({
+							key:"session_key"
+						})
 					}
 				});
 
@@ -298,8 +303,8 @@
 		width: 100%;
 		position: fixed;
 		bottom: 0;
+		left: 0;
 		z-index: -1;
-
 		image {
 			width: 100%;
 		}

+ 1 - 11
pages/monitor/index.vue

@@ -40,7 +40,7 @@
 				accessToken: '',
 				counts: '',
 				isTop:false,
-				contenttf:false
+				contenttf:false,
 			}
 		},
 		onLoad() {
@@ -104,16 +104,6 @@
 				})
 			},
 			itemClick(item) {
-				// uni.navigateTo({
-				// 	url:"/pages/monitor/detail?device_id="+item.device_id+"&accessToken="+this.accessToken
-				// })
-				// uni.setStorage({
-				// 	key: 'obj',
-				// 	data: JSON.stringify({
-				// 		device_id: item.device_id,
-				// 		accessToken: this.accessToken
-				// 	})
-				// })
 				uni.navigateTo({
 					url: "/pages/webview?device_id=" + item.device_id + "&accessToken=" + this.accessToken
 				})

+ 12 - 3
pages/my/about/about.vue

@@ -70,12 +70,13 @@
 	export default {
 		data() {
 			return {
-				 id:'1.0.0',
+				 id:'',
 				 versions:'',
 				 showA: false, //
 				 contentA: '',
 				 isShow: false, //进度条
-				 percentNum: 0, //在线下载进度
+				 percentNum: 0, //在线下载进度,
+				 value:""
 			}
 		},
 		methods: {
@@ -88,6 +89,7 @@
 				})
 				console.log(res)
 				this.appName = res[0].app_name
+				this.id = res[0].app_num
 				this.versions = Number(res[0].app_num.match(/\d+/g).join(""))
 				var ids = Number(this.id.match(/\d+/g).join(""))
 				if (this.versions > ids) {
@@ -117,8 +119,14 @@
 				this.getEquipList()
 			},
 			upgrade() {
+				uni.getStorage({
+					key: 'http',
+					success: (res) => {
+						this.value = res.data
+					}
+				})
 				console.log(this.appName)
-				var url = "http://182.92.193.64:8002/app_file/" + this.appName
+				var url = "http://hnyfwlw.com/app/big_data.apk"
 				console.log(url)
 				const downloadTask = uni.downloadFile({
 					url: url, //仅为示例,并非真实的资源
@@ -153,6 +161,7 @@
 		},
 		onShow() {
 			// this.id = plus.runtime.version
+			this.getEquipList()
 		},
 		onBackPress(option){
 			uni.redirectTo({

+ 1 - 0
pages/my/index/index.vue

@@ -20,6 +20,7 @@
 				<view class="AboutUs" @click="about">
 					<u-icon name="moban" custom-prefix="custom-icon" class="icon_left"></u-icon>
 					关于我们
+					<!-- 关于更新 -->
 					<uni-icons type="arrowright" class="icon_right"></uni-icons>
 				</view>
 			</view>

+ 44 - 69
pages/my/record/record.vue

@@ -4,80 +4,23 @@
 			<view class="records_itemtf" v-if="dataTF">
 				暂无更新记录
 			</view>
-			<view class="records_item" v-for="item,index in recordsdata" :key="index" @click="showtf(index)" v-else="dataTF">
-				<view class="records_item_top">
-					<view class="item_left">
-						<p>版本{{item.app_num}}主要更新</p>
-						<p>{{item.addtime|timeFormat()}}</p>
-					</view>
-					<view class="item_right">
-						<u-icon :name="indexnum == index?'arrow-down':'arrow-right'"></u-icon>
-					</view>
-				</view>
-				<view class="records_item_bot" v-if="indexnum == index">
-					<p v-for="item,index in item.app_desc" :key="index">{{index+1+'、'+item}}</p>
-				</view>
-			</view>
+			<u-collapse>
+				<u-collapse-item :title="item.head" v-for="(item, index) in itemList" :key="index">
+					<p v-for="items,indexs in item.body" :key="indexs">{{indexs+1+"、"+items}}</p>
+				</u-collapse-item>
+			</u-collapse>
 		</view>
 	</view>
 </template>
-<style lang="scss">
-	page {
-		background-color: #f1f1f1;
-	}
-	.records{
-		margin-top: 20rpx;
-		.records_itemtf{
-			font-size: 30rpx;
-			width: 100%;
-			height: 100rpx;
-			line-height: 100rpx;
-			text-align: center;
-		}
-		.records_item{
-			margin-bottom: 10rpx;
-			.records_item_top{
-				width: 100%;
-				background-color: #FFFFFF;
-				height: 110rpx;
-				padding: 10rpx 28rpx;
-				display: flex;
-				justify-content: space-between;
-				box-sizing: border-box;
-				.item_left{
-					p{
-						color: #474747;
-					}
-					p:first-child{
-						font-size: 32rpx;
-						margin-bottom: 10rpx;
-					}
-					p:last-child{
-						font-size: 26rpx;
-					}
-				}
-				.item_right{
-					height: 110rpx;
-					line-height: 100rpx;
-				}
-			}
-			.records_item_bot{
-				padding: 10rpx 28rpx 0;
-				box-sizing: border-box;
-				p{
-					margin-bottom: 6rpx;
-				}
-			}
-		}
-	}
-</style>
+
 <script>
 	export default {
 		data() {
 			return {
 				recordsdata: [],
-				indexnum:0,
-				dataTF:false
+				indexnum: 0,
+				dataTF: false,
+				itemList: [],
 			}
 		},
 		methods: {
@@ -87,13 +30,20 @@
 				})
 				console.log(res)
 				this.recordsdata = res
-				if(res.length == 0){
+				for(var i=0;i<res.length;i++){
+					var obj ={
+						head: "版本"+res[i].app_num+"主要更新",
+						body: res[i].app_desc,
+					}
+					this.itemList.push(obj)
+				}
+				if (res.length == 0) {
 					this.dataTF = true
-				}else{
+				} else {
 					this.dataTF = false
 				}
 			},
-			showtf(index){
+			showtf(index) {
 				this.indexnum = index
 				console.log(this.indexnum)
 			}
@@ -103,3 +53,28 @@
 		}
 	}
 </script>
+<style lang="scss">
+	page {
+		background-color: #f1f1f1;
+	}
+
+	.u-collapse-item {
+		width: 100%;
+		// height: 110rpx;
+		padding: 10rpx 28rpx;
+		justify-content: space-between;
+		box-sizing: border-box;
+		margin-bottom: 20rpx;
+		background-color: #FFFFFF;
+	}
+	.records {
+		margin-top: 20rpx;
+		.records_itemtf {
+			font-size: 30rpx;
+			width: 100%;
+			height: 100rpx;
+			line-height: 100rpx;
+			text-align: center;
+		}
+	}
+</style>

+ 14 - 48
pages/prevention/control.vue

@@ -6,7 +6,7 @@
 				<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="设备控制"></uni-nav-bar>
 			</view>
 			<view class="control">
-				<view class="control_restart">
+				<view class="control_restart" v-if="myuser_type">
 					<p class="title_p">管理员操作</p>
 					<view class="control_restart_but">
 						<button @click="restart">重启</button>
@@ -23,12 +23,12 @@
 				<view class="control_mo">
 					<p class="title_p">定时模式</p>
 					<view class="control_off_off" @click="show1 = !show1">
-						<p>{{condatas.timctrl==1 ? "时控":"光控"}}</p>
+						<p>{{Number(condatas.ts) == 1 ? "时控":"光控"}}</p>
 						<u-icon name="arrow-down-fill" size="12" color="#7F8082"></u-icon>
 					</view>
 					<u-action-sheet :list="options1" v-model="show1" @click="actionSheetCallback"></u-action-sheet>
 				</view>
-				<view class="control_time" v-if="condatas.timctrl== 0">
+				<view class="control_time" v-if="condatas.ts == 0">
 					<p class="title_p">定时时长(h)</p>
 					<view class="control_off_off" @click="show2 = !show2">
 						<p>{{condatas.tt==0?'常亮':condatas.tt}}</p>
@@ -52,10 +52,10 @@
 					<p class="title_p">上传时间间隔(min)</p>
 					<view class="slider">
 						<view class="" style="width: 90%;padding-top: 18rpx;">
-							<u-slider v-model="condatas.dattim" min="0" max="100" step="1" active-color="#58C876"></u-slider>
+							<u-slider v-model="condatas.dat_f" min="0" max="100" step="1" active-color="#58C876"></u-slider>
 						</view>
 						<view class="" style="width: 10%;text-align: center;">
-							{{condatas.dattim || 0}}
+							{{condatas.dat_f || 0}}
 						</view>
 					</view>
 				</view>
@@ -63,10 +63,10 @@
 					<p class="title_p">自清虫定时(min)</p>
 					<view class="slider">
 						<view class="" style="width: 90%;padding-top: 18rpx;">
-							<u-slider v-model="condatas.clt" min="0" max="100" step="1" active-color="#58C876"></u-slider>
+							<u-slider v-model="condatas.clt_t" min="0" max="100" step="1" active-color="#58C876"></u-slider>
 						</view>
 						<view class="" style="width: 10%;text-align: center;">
-							{{condatas.clt || 0}}
+							{{condatas.clt_t || 0}}
 						</view>
 					</view>
 				</view>
@@ -133,12 +133,6 @@
 						text: '8'
 					},
 					{
-						text: '9'
-					},
-					{
-						text: '10'
-					},
-					{
 						text: '00'
 					}
 				],
@@ -150,7 +144,7 @@
 					minute: false,
 					second: false
 				},
-				Administrator:false
+				myuser_type:false
 			}
 		},
 		methods: { //forecast.send_control.device_control_info
@@ -211,7 +205,7 @@
 				this.show2 = false
 			},
 			actionSheetCallback(index) {
-				this.condatas.timctrl = index
+				this.condatas.ts = index
 			},
 			checkedTF(e) { //设备开关
 				if (e == true) {
@@ -227,33 +221,18 @@
 				this.condatas.et = Number(e.hour)
 			},
 			restart() { //重启
-				if(this.Administrator){
 					let obj = {
 						d_id: this.d_id,
 						cmd: 'reboot'
 					}
 					this.reorup(obj)
-				}else{
-					uni.showToast({
-						title: "您暂无权限进行此操作,如有需要,请联系管理员",
-						icon: "none"
-					})
-				}
-				
 			},
 			upgrade() { //升级
-				if(this.Administrator){
 					let obj = {
 						d_id: this.d_id,
 						cmd: 'update'
 					}
 					this.reorup(obj)
-				}else{
-					uni.showToast({
-						title: "您暂无权限进行此操作,如有需要,请联系管理员",
-						icon: "none"
-					})
-				}
 			},
 			ensure() {
 				let str = JSON.stringify(this.condatas)
@@ -267,25 +246,12 @@
 			this.controldata(option.id)
 			this.d_id = option.id
 			uni.getStorage({
-				key:"jurisdiction",
-				success:(res)=>{
-					console.log(JSON.parse(res.data))
-					let items = JSON.parse(res.data).filter((item)=>{
-						return item.purview_name == "防治系统"
-					})
-					let items2 = items[0].children.filter((item)=>{
-						return item.purview_name == "杀虫灯"
-					})
-					var arr = items2[0].children
-					console.log(arr)
-					for(var i =0;i<arr.length;i++){
-						switch (arr[i].purview_name){
-							case "管理员操作":
-								this.Administrator = true
-								break
-						}
+				key: "myuser_type",
+				success: (res) => {
+					if (Number(res.data) == 1) {
+						this.myuser_type = true
 					}
-				},
+				}
 			})
 		}
 	}

+ 69 - 45
pages/prevention/equipmentdetails.vue

@@ -7,9 +7,11 @@
 			</view>
 			<view class="info">
 				<view class="info_item">
-					<image :src="eqinfo.item.is_online==1?'http://static.yfpyx.com/bigdata_app/image/cb/onBg.png':'http://static.yfpyx.com/bigdata_app/image/cb/offBg.png'" mode=""
-					 class="bgi"></image>
-					<p style="font-size: 32rpx;">设备 ID:{{eqinfo.item.imei}}</p>
+					<image :src="eqinfo.item.is_online==1?'http://static.yfpyx.com/bigdata_app/image/cb/onBg.png':'http://static.yfpyx.com/bigdata_app/image/cb/offBg.png'"
+					 mode="" class="bgi"></image>
+					<p style="font-size: 32rpx;" @click="copy(eqinfo.item.imei)">设备 ID:{{eqinfo.item.imei}}
+					<image src="http://static.yfpyx.com/bigdata_app/image/environment/fuzhi.png" mode="" class="tishi"></image>
+					</p>
 					<p>设备名称:{{eqinfo.item.device_name}}</p>
 					<p>设备型号:{{eqinfo.item.dtype}}</p>
 					<p>最近上报时间:{{eqinfo.item.addtime|timeFormat()}}</p>
@@ -18,17 +20,21 @@
 			</view>
 			<view class="control">
 				<view class="control_item" v-if="kongtf" @click="control">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/prevention/8.png'" mode=""></image>
+					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/8.png'" mode=""></image>
 					<p>设备控制</p>
 				</view>
 				<view class="control_item" v-if="shujutf" @click="charts">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/prevention/9.png'" mode=""></image>
+					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/10.png'" mode=""></image>
 					<p>历史数据</p>
 				</view>
 				<view class="control_item" v-if="simtf" @click="sim">
-					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/prevention/10.png'" mode=""></image>
+					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/9.png'" mode=""></image>
 					<p>SIM卡详情</p>
 				</view>
+				<view class="control_item" @click="repairs">
+					<image :src="'http://static.yfpyx.com/bigdata_app'+'/image/environment/7.png'" mode=""></image>
+					<p>一键报修</p>
+				</view>
 			</view>
 			<view class="realtime">
 				<p class="realtime_title">实时数据</p>
@@ -59,11 +65,11 @@
 				eqinfo: {},
 				olddata: {},
 				olddatas: [],
-				newdatesTF:false,
-				work:"",
-				shujutf:false,
-				kongtf:false,
-				simtf:false
+				newdatesTF: false,
+				work: "",
+				shujutf: false,
+				kongtf: false,
+				simtf: false
 			}
 		},
 		methods: {
@@ -76,7 +82,7 @@
 					{
 						icon: '/image/cb/icon05.png',
 						txt: '工作状态',
-						value:this.work
+						value: this.work
 					},
 					{
 						icon: '/image/prevention/44.png',
@@ -86,17 +92,17 @@
 					{
 						icon: '/image/prevention/33.png',
 						txt: '定时时长',
-						value: Math.abs(this.olddata.et - this.olddata.st)
+						value: this.olddata.tt
 					}, {
 						icon: '/image/cb/icon08.png',
 						txt: '环境温度(℃)',
-						value: this.olddata.at
+						value: this.olddata.new_tem
 					}, {
 						icon: '/image/cb/icon07.png',
 						txt: '环境湿度(%)',
-						value: this.olddata.ah
+						value: this.olddata.new_hum
 					}, {
-						icon: '/image/cb/icon16.png',
+						icon: '/image/prevention/icon16.png',
 						txt: '信号强度',
 						value: this.olddata.csq
 					}, {
@@ -119,18 +125,8 @@
 					},
 					{
 						icon: '/image/prevention/106.png',
-						txt: '电压状态',
-						value: Number(this.olddata.batStatus) == 1 ? "欠压" : '正常'
-					},
-					{
-						icon: '/image/prevention/107.png',
-						txt: '纬度',
-						value: this.olddata.lat
-					},
-					{
-						icon: '/image/prevention/108.png',
-						txt: '经度',
-						value: this.olddata.lng
+						txt: '电池电压',
+						value: Number(this.olddata.bv)
 					}
 				]
 			},
@@ -142,18 +138,18 @@
 						device_id: this.eqinfo.item.imei
 					}
 				})
-				if(res.data.length !=0){
+				if (res.data.length != 0) {
 					this.olddata = res.data[0].d_h_t
-					this.newdatesTF =true
-					if(Number(this.olddata.ws) == 0){
+					this.newdatesTF = true
+					if (Number(this.olddata.ws) == 0) {
 						this.work = "待机"
-					}else if(Number(this.olddata.ws) == 1){
+					} else if (Number(this.olddata.ws) == 1) {
 						this.work = "工作"
-					}else{
+					} else {
 						this.work = "充电"
 					}
-				}else{
-					this.newdatesTF =false
+				} else {
+					this.newdatesTF = false
 				}
 				this.modification()
 			},
@@ -162,10 +158,17 @@
 					delta: 1
 				})
 			},
-			sim() { 
+			sim() {
 				// sim卡详情
 				uni.navigateTo({
-					url:"./sim?id="+this.eqinfo.item.d_id
+					url: "./sim?id=" + this.eqinfo.item.d_id
+				})
+			},
+			repairs(){
+				console.log(this.eqinfo.item)
+				var device_id = this.eqinfo.item.equip_id||this.eqinfo.item.device_id
+				uni.navigateTo({
+					url: "../afterSale/addafter?device_id="+ device_id +"&device_type="+ 5
 				})
 			},
 			control() { //设备控制
@@ -177,7 +180,15 @@
 				uni.navigateTo({
 					url: "./ucharts?d_id=" + this.eqinfo.item.d_id + "&imei=" + this.eqinfo.item.imei
 				})
-			}
+			},
+			copy(item){
+				uni.setClipboardData({
+				    data: item , 
+				    success: function () {
+				        console.log('success');
+				    }
+				});
+			},
 		},
 		onLoad(option) {
 			this.$forceUpdate()
@@ -185,22 +196,28 @@
 			console.log(JSON.parse(option.shebei))
 			this.history()
 			uni.getStorage({
-				key:"jurisdiction",
-				success:(res)=>{
+				key: "jurisdiction",
+				success: (res) => {
 					console.log(JSON.parse(res.data))
-					let items = JSON.parse(res.data).filter((item)=>{
+					let items = JSON.parse(res.data).filter((item) => {
 						return item.purview_name == "防治系统"
 					})
-					let items2 = items[0].children.filter((item)=>{
+					let items2 = items[0].children.filter((item) => {
 						return item.purview_name == "杀虫灯"
 					})
 					var arr = items2[0].children
 					console.log(arr)
-					for(var i =0;i<arr.length;i++){
-						switch (arr[i].purview_name){
+					for (var i = 0; i < arr.length; i++) {
+						switch (arr[i].purview_name) {
+							case "设备操作":
+								this.kongtf = true
+								break
 							case "设备控制":
 								this.kongtf = true
 								break
+							case "SIM卡状态":
+								this.simtf = true
+								break
 							case "SIM卡":
 								this.simtf = true
 								break
@@ -242,6 +259,11 @@
 				font-size: 24rpx;
 				color: #FFFFFF;
 				margin-bottom: 10rpx;
+				.tishi{
+					width: 30rpx;
+					height: 30rpx;
+					margin: 0rpx 0 0 20rpx;
+				}
 			}
 		}
 	}
@@ -282,13 +304,15 @@
 			width: 90%;
 			margin: 0 auto;
 		}
-		.realtime_tishi{
+
+		.realtime_tishi {
 			width: 90%;
 			margin: 0 auto;
 			text-align: center;
 			font-size: 32rpx;
 			padding-top: 40rpx;
 		}
+
 		.realtime_text {
 			width: 90%;
 			margin: 0 auto;

+ 2 - 1
pages/prevention/index.vue

@@ -16,7 +16,8 @@
 						<p :class="item.is_online==1?'green':'red'" v-text="item.is_online==1?'在线':'离线'"></p>
 					</view>
 					<view class="prevents_item_bot">
-						最新上报时间:{{item.addtime|timeFormat()}}
+						<p>设备名称:{{item.device_name==""?"无":item.device_name}}</p>
+						<p>最新上报时间:{{item.addtime|timeFormat()}}</p>
 					</view>
 				</view>
 			</view>

+ 2 - 1
pages/prevention/search.vue

@@ -18,7 +18,8 @@
 						<p :class="item.is_online==1?'green':'red'" v-text="item.is_online==1?'在线':'离线'"></p>
 					</view>
 					<view class="prevents_item_bot">
-						最新上报时间:{{item.addtime|timeFormat()}}
+						<p>设备名称:{{item.device_name==""?"无":item.device_name}}</p>
+						<p>最新上报时间:{{item.addtime|timeFormat()}}</p>
 					</view>
 				</view>
 			</view>

+ 3 - 2
pages/prevention/sim.vue

@@ -58,7 +58,6 @@
 				}
 				
 			},
-
 			async simdata(data) { //设备列表
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.send_control.sim_query',
@@ -66,7 +65,8 @@
 						iccid: data
 					}
 				})
-				this.siminfo = JSON.parse(res.data)
+				// console.log()
+				this.siminfo = res.data
 				console.log(this.siminfo.data)
 			},
 			clickLeft() {
@@ -76,6 +76,7 @@
 			}
 		},
 		onLoad(option) {
+			console.log(option)
 			this.id = option.id
 			this.simid(this.id)
 		}

BIN
static/images/cb/6286299.gif


BIN
static/images/fuzhi.png


BIN
unpackage/cache/apk/__UNI__DBA6730_cm.apk


+ 1 - 1
unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://service.dcloud.net.cn/build/download/b5981850-bc5a-11eb-a7be-5fa0a7282212
+https://service.dcloud.net.cn/build/download/09a68840-c5dd-11eb-b587-2fa0fbe284f1

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/cache/apk/cmManifestCache.json


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-hdpi.png


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xhdpi.png


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxhdpi.png


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxxhdpi.png


Разница между файлами не показана из-за своего большого размера
+ 2 - 2
unpackage/cache/wgt/__UNI__DBA6730/app-config-service.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/cache/wgt/__UNI__DBA6730/app-service.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/cache/wgt/__UNI__DBA6730/app-view.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/cache/wgt/__UNI__DBA6730/manifest.json


BIN
unpackage/cache/wgt/__UNI__DBA6730/static/images/cb/6286299.gif


BIN
unpackage/cache/wgt/__UNI__DBA6730/static/images/fuzhi.png


Разница между файлами не показана из-за своего большого размера
+ 2 - 2
unpackage/dist/build/app-plus/app-config-service.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/build/app-plus/app-service.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/build/app-plus/app-view.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/build/app-plus/manifest.json


BIN
unpackage/dist/build/app-plus/static/images/cb/6286299.gif


BIN
unpackage/dist/build/app-plus/static/images/fuzhi.png


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/equip-item/equip-item.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/bzy/equip-set/equip-set.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/cbd/equip-set/equip-set.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/equip-detail/equip-detail.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/index/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy/equip-set/equip-set.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/historydatas.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/cb/xy2.0/particulars.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/distribution/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/environment/equipment.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/modification.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipList/search.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/assignment.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/equipMange/index/useroperation.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/allocation.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/basefacility.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/fourBase/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index/index.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/control.js.map


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/prevention/equipmentdetails.js.map


Разница между файлами не показана из-за своего большого размера
+ 2 - 2
unpackage/dist/dev/app-plus/app-config-service.js


Разница между файлами не показана из-за своего большого размера
+ 2747 - 1659
unpackage/dist/dev/app-plus/app-service.js


Разница между файлами не показана из-за своего большого размера
+ 2494 - 1283
unpackage/dist/dev/app-plus/app-view.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
unpackage/dist/dev/app-plus/manifest.json


BIN
unpackage/dist/dev/app-plus/static/images/cb/6286299.gif


BIN
unpackage/dist/dev/app-plus/static/images/fuzhi.png


BIN
unpackage/dist/dev/app-plus/static/images/my/user.png


+ 5 - 2
unpackage/dist/dev/mp-weixin/app.json

@@ -11,8 +11,8 @@
     "pages/equipMange/index/addusers",
     "pages/equipMange/index/changepasswold",
     "pages/equipMange/index/assignment",
+    "pages/equipMange/index/useroperation",
     "pages/cb/bzy/equip-set/equip-set",
-    "pages/cb/xy/equip-set/equip-set",
     "pages/cb/sim/sim",
     "pages/expertDiagnosis/index",
     "pages/expertDiagnosis/wormcase",
@@ -49,6 +49,7 @@
     "pages/cb/cbd/equip-set/note",
     "pages/cb/cbd/equip-set/statistics",
     "pages/cb/bzy/equip-set/bzyhistoryile",
+    "pages/cb/xy/equip-set/equip-set",
     "pages/cb/xy/equip-set/xyhistoryile",
     "pages/disandpests/index",
     "pages/monitor/index",
@@ -57,7 +58,9 @@
     "pages/fourBase/modification",
     "pages/fourBase/city",
     "pages/cb/index/search",
-    "pages/my/record/record"
+    "pages/my/record/record",
+    "pages/cb/xy2.0/particulars",
+    "pages/cb/xy2.0/historydatas"
   ],
   "subPackages": [],
   "window": {

Разница между файлами не показана из-за своего большого размера
+ 11 - 11
unpackage/dist/dev/mp-weixin/common/vendor.js


Разница между файлами не показана из-за своего большого размера
+ 8 - 8
unpackage/dist/dev/mp-weixin/components/bazaar-city_list/index.js


Разница между файлами не показана из-за своего большого размера
+ 8 - 8
unpackage/dist/dev/mp-weixin/components/equip-item/equip-item.js


Разница между файлами не показана из-за своего большого размера
+ 8 - 8
unpackage/dist/dev/mp-weixin/components/ksp-image-cutter/ksp-image-cutter.js


Разница между файлами не показана из-за своего большого размера
+ 8 - 8
unpackage/dist/dev/mp-weixin/components/uni-icons/uni-icons.js


Разница между файлами не показана из-за своего большого размера
+ 8 - 8
unpackage/dist/dev/mp-weixin/components/uni-nav-bar/uni-nav-bar.js


Разница между файлами не показана из-за своего большого размера
+ 8 - 8
unpackage/dist/dev/mp-weixin/components/uni-status-bar/uni-status-bar.js


Разница между файлами не показана из-за своего большого размера
+ 2 - 2
unpackage/dist/dev/mp-weixin/pages/afterSale/addafter.js


+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/afterSale/index.js


Некоторые файлы не были показаны из-за большого количества измененных файлов