2020-5-30

测试小程序分包/miniprogram-2/packageA/pages/list_facility/list_facility/list_facility.js

@@ -68,7 +68,8 @@ Page({
           data: {
             username: res.data,
             type: type,
-            page: '1'
+            page: '1',
+            ret: 'list'
           },
           success: function (res) {
             var list = []
@@ -122,7 +123,6 @@ Page({
 
   //获取搜索ID的值
   searchID: function (e) {
-    console.log(e.detail.value)
     this.setData({
       searchID: e.detail.value
     })
@@ -158,7 +158,7 @@ Page({
       method: "post",
       data: {
         equip_id: searchID,
-        type: type
+        type: type,
       },
       success: function (res) {
         //判断当前请求到的数据是否为空
@@ -377,7 +377,8 @@ Page({
           data: {
             username: res.data,
             type: type,
-            page: that.data.page
+            page: that.data.page,
+            ret: 'list'
           },
           success: function (res) {
             var list = that.data.list;

测试小程序分包/miniprogram-2/packageB/pages/bzy_forms/bzbz_forms_details_image/bzbz_forms_details_image.js

@@ -23,8 +23,6 @@ Page({
       },
       data: {
         equip_id: id,
-        // equip_id: '866262040450529',
-        // equip_id: '865650042816179'  ,
         page: that.data.page
       },
       success: function (res) {
@@ -56,6 +54,80 @@ Page({
     })
   },
 
+  //删除
+  delImg: function (e) {
+    var that = this;
+    var id = that.data.id
+    var img = e.currentTarget.dataset.img
+    wx.showModal({
+      title: '提示',
+      content: '是否进行删除',
+      success(res) {
+        if (res.confirm) {
+          wx.request({
+            url: 'https://wx.yfzhwlw.com/bzy_photo_list',
+            method: 'post',
+            header: {
+              "Content-Type": "application/x-www-form-urlencoded"
+            },
+            data: {
+              equip_id: id,
+              photo: img
+            },
+            success: function (res) {
+              if (res.statusCode != 200) {
+                app.showError()
+              } else {
+                console.log('删除成功')
+              }
+            },
+            fail: function (err) {
+              app.showError()
+            }
+          })
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+  },
+
+  //查看
+  changeImg: function (e) {
+    var that = this
+    var id = that.data.id
+    var img = e.currentTarget.dataset.img
+    wx.request({
+      url: 'https://wx.yfzhwlw.com/bzy_photo_list',
+      method: 'post',
+      header: {
+        "Content-Type": "application/x-www-form-urlencoded"
+      },
+      data: {
+        equip_id: id,
+        photo: img
+      },
+      success: function (res) {
+        if (res.statusCode != 200) {
+          app.showError()
+        } else {
+          console.log('删除成功')
+        }
+      },
+      fail: function (err) {
+        app.showError()
+      }
+    })
+  },
+
+  //添加识别
+  addrImg: function (e) {
+    var that = this;
+    var id = that.data.id
+    var img = e.currentTarget.dataset.img
+    
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */

测试小程序分包/miniprogram-2/packageB/pages/bzy_forms/bzbz_forms_details_image/bzbz_forms_details_image.wxml

@@ -8,26 +8,26 @@
 
 			<!-- 图片 -->
 			<view class="bzbz_forms_details_image-list-image-box">
-				<image class="bzbz_forms_details_image-list-image" src="{{ 'https://wx.yfzhwlw.com/' + item.addr}}"></image>
+				<image class="bzbz_forms_details_image-list-image" src="{{ 'https://wx.yfzhwlw.com/bzy/' + item.addr}}"></image>
 			</view>
 
 			<!-- 操作 -->
 			<view class="bzbz_forms_details_image-operation-box">
 
 				<!-- 删除 -->
-				<view class="bzbz_forms_details_image-operation-del">
+				<view class="bzbz_forms_details_image-operation-del" bindtap="delImg" data-id="" data-img="{{item.addr}}">
 					<image class="bzbz_forms_details_image-operation-del-image" src="https://wx.yfzhwlw.com/wechat_photo/equip/del_5.png"></image>
 					<view class="bzbz_forms_details_image-operation-del-txt">删除</view>
 				</view>
 
 				<!-- 查看详情 -->
-				<view class="bzbz_forms_details_image-operation-details">
+				<view class="bzbz_forms_details_image-operation-details" bindtap="changeImg" data-img="{{item.addr}}">
 					<image class="bzbz_forms_details_image-operation-details-image" src="https://wx.yfzhwlw.com/wechat_photo/equip/text_5.png"></image>
 					<view class="bzbz_forms_details_image-operation-details-txt">查看详情</view>
 				</view>
 
 				<!-- 添加描述 -->
-				<view class="bzbz_forms_details_image-operation-described">
+				<view class="bzbz_forms_details_image-operation-described" bindtap="addrImg" data-img="{{item.addr}}">
 					<image class="bzbz_forms_details_image-operation-described-image" src="https://wx.yfzhwlw.com/wechat_photo/equip/qian_5.png"></image>
 					<view class="bzbz_forms_details_image-operation-described-txt">添加描述</view>
 				</view>

测试小程序分包/miniprogram-2/packageB/pages/cbd_forms/cbd_forms_details/cbd_forms_details.wxss

@@ -108,7 +108,8 @@
 }
 /* 温控状态img */
 .wkzt {
-  width: 50rpx;
+  /* width: 50rpx; */
+  width: 45rpx;
   height: 70rpx;
 }
 .ykzt {

测试小程序分包/miniprogram-2/packageB/pages/cbd_forms/cbd_forms_details_image-look/cbd_forms_details_image-look.js

@@ -226,6 +226,7 @@ Page({
                       // wx.navigateTo({
                       //   url: '../cbd_forms_details_image/cbd_forms_details_image',
                       // })
+                      wx.navigateBack({ changed: true });//返回上一页
                     }
                   }
                 })

测试小程序分包/miniprogram-2/packageB/pages/cbd_forms/cbd_forms_details_image_discern/cbd_forms_details_image_discern.wxml

@@ -11,7 +11,7 @@
 
 		<!-- 识别图片 -->
 		<view class="cbd_forms_details_image_discern-img-box">
-			<image class="cbd_forms_details_image_discern-img" src="{{redata.image}}"></image>
+			<image class="cbd_forms_details_image_discern-img" src="{{ 'https://wx.yfzhwlw.com/' + redata.image}}"></image>
 		</view>
 	</view>
 

测试小程序分包/miniprogram-2/packageB/pages/cbd_list/cbd_list-details-control/cbd_list-details-control.js

@@ -106,6 +106,7 @@ Page({
     var datt = e.detail.value.timeInterval //数据上传时间间隔
 
     var type = e.detail.value.workPattern //工作模式
+    var id = that.data.id
     //判断定时模式是否为时控
     if (ts == 0) {
       var st = 0
@@ -124,8 +125,8 @@ Page({
           },
           method: 'post',
           data: {
-            imei: '86123456789',
-            // imei: '',
+            // imei: '86123456789',
+            imei: id,
             username: res.data,
             // username: 'demo',
             ret: 'set',
@@ -171,6 +172,7 @@ Page({
   },
   workData: function (type) {
     var that = this
+    var id = that.data.id
     wx.getStorage({
       key: 'userName',
       success (res) {
@@ -181,10 +183,8 @@ Page({
           },
           method: 'post',
           data: {
-            imei: '86123456789',
-            // imei: '',
-            // username: res.data,
-            username: 'demo',
+            imei: id,
+            username: res.data,
             ret: 'workmode',
             type: type
           },
@@ -227,7 +227,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    let id = options.id
+    let that = this
+    that.setData({
+      id: id
+    })
   },
 
   /**

测试小程序分包/miniprogram-2/packageB/pages/cbd_list/cbd_list-details/cbd_list-details.js

@@ -38,10 +38,10 @@ Page({
             "Content-Type": "application/x-www-form-urlencoded"
           },
           data: {
-            username: 'demo',
-            imei: '86123456789',
-            // username: res.data,
-            // imei: id,
+            // username: 'demo',
+            // imei: '86123456789',
+            username: res.data,
+            imei: id,
             ret: 'sim',
             iccid: icd,
           },

测试小程序分包/miniprogram-2/packageB/pages/cbd_list/cbd_list-details/cbd_list-details.wxml

@@ -135,7 +135,7 @@
 
 			<!-- 版本型号 -->
 			<view bindtap="cbdList" class="cbd_list-details-form-list">
-				<image class="cbd_list-details-form-list-img" src="https://wx.yfzhwlw.com/wechat_photo/equip/xing_4.png"></image>
+				<image class="cbd_list-details-form-list-img xinghao" src="https://wx.yfzhwlw.com/wechat_photo/equip/xing_4.png"></image>
 				<view class="cbd_list-details-form-list-txt-box">
 					<view class="cbd_list-details-form-list-txt">{{redata.dver}}</view>
 					<view class="cbd_list-details-form-list-btn">版本型号</view>

测试小程序分包/miniprogram-2/packageB/pages/cbd_list/cbd_list-details/cbd_list-details.wxss

@@ -137,9 +137,15 @@
   width: 60rpx;
   height: 80rpx;
 }
+/* 版本型号 */
+.cbd_list-details-form-list .xinghao {
+  width: 60rpx;
+  height: 80rpx;
+}
 
 .cbd_list-details-form-list-txt-box {
-  padding: 50rpx 50rpx 50rpx 60rpx;
+  /* padding: 50rpx 50rpx 50rpx 60rpx; */
+  padding: 50rpx 50rpx 50rpx 40rpx;
 }
 
 .cbd_list-details-form-list-txt {

测试小程序分包/miniprogram-2/packageB/pages/qxz_forms/weather-forms-details/weather-forms-details.js

@@ -194,8 +194,8 @@ Page({
    */
   onLoad: function (options) {
     // var windowWidth = 320;
-    // var id = options.id
-    var id = '16064809'
+    var id = options.id
+    // var id = '16064809'
     var that = this
     that.setData({
       // id: '16064809'

测试小程序分包/miniprogram-2/packageB/pages/qxz_forms/weather-forms/weather-forms.wxss

@@ -73,7 +73,7 @@
   height: 12px;
   content: "";
   left: 62px;
-  top: 63px;
+  top: 64px;
   position: absolute;
   display: block;
   border-radius: 10px 10px 0 0;

测试小程序分包/miniprogram-2/packageB/pages/qxz_list/weather-list-details/weather-list-details.js

@@ -68,40 +68,55 @@ Page({
   manual: function () {
     var that = this
     var id = that.data.id
-    //请求数据
-    wx.request({
-      url: 'https://wx.yfzhwlw.com/qxz_wechat_switch',
-      header: {
-        "Content-Type": "application/x-www-form-urlencoded"
-      },
-      method: "GET",
-      data: {
-        equip_id: id
-      },
-      success: function (res) {
-        if (res.statusCode != 200) {
-          app.showError()
-        } else {
-          //判断当前是否有数据
-          if (res.data.length == 0) {
-            wx.showToast({
-              title: '该功能暂未开放',
-              icon: 'none',
-              duration: 2000
-            })
+    var off = that.data.demo
+    //判断当前设备是否能有手动控制功能switch==0没有开关 switch==1有开关
+    console.log(off.switch)
+    if (off.switch == 0) {
+      //没有开关不能进入
+      wx.showToast({
+        title: '该功能暂未开放',
+        icon: 'none',
+        duration: 2000
+      })
+    } else if (off.switch == 1) {
+      //有开关能进入
+      //请求数据
+      wx.request({
+        url: 'https://wx.yfzhwlw.com/qxz_wechat_switch',
+        header: {
+          "Content-Type": "application/x-www-form-urlencoded"
+        },
+        method: "GET",
+        data: {
+          equip_id: id
+        },
+        success: function (res) {
+          if (res.statusCode != 200) {
+            app.showError()
           } else {
-            var data = JSON.stringify(res.data)
-            console.log(data)
-            wx.navigateTo({
-              url: '../weather-list-details-manual/weather-list-details-manual?data=' + data,
-            })
+            //判断当前是否有数据
+            if (res.data.length == 0) {
+              wx.showToast({
+                title: '该功能暂未开放',
+                icon: 'none',
+                duration: 2000
+              })
+            } else {
+              var data = JSON.stringify(res.data)
+              console.log(data)
+              wx.navigateTo({
+                url: '../weather-list-details-manual/weather-list-details-manual?data=' + data,
+              })
+            }
           }
+        },
+        fail: function (err) {
+          app.showError()
         }
-      },
-      fail: function (err) {
-        app.showError()
-      }
-    })
+      })
+    }
+
+
   },
 
   /**
@@ -113,8 +128,8 @@ Page({
     })
     //请求设备数据详情
     var that = this;
-    // var id = options.id
-    var id = '16062012'
+    var id = options.id
+    // var id = '16062012'
     that.setData({
       id: id
     })

测试小程序分包/miniprogram-2/packageB/pages/scd_list/scd_list-details/scd_list-details.js

@@ -278,7 +278,7 @@ Page({
                   username: res.data,
                   // username: '泉州安溪县',
                   imei: id,
-                  kind: 'status'
+                  kind: 'status',
                 },
                 success: function (res) {
                   if (res.statusCode != 200) {
@@ -378,8 +378,8 @@ Page({
    */
   onLoad: function (options) {
     var that = this;
-    var id = '862991419831505'
-    // var id = options.id
+    // var id = '862991419831505'
+    var id = options.id
     that.setData({
       id: id
     })

测试小程序分包/miniprogram-2/packageB/pages/scd_list/scd_list-details/scd_list-details.wxml

@@ -185,7 +185,10 @@
 						<view class="scd_list-details-list-tlt">设备开关</view>
 					</view>
 					<view class="scd_list-details-list-txt-box">
-						<view class="scd_list-details-list-txt">{{array[index]}}</view>
+						<view class="scd_list-details-list-txt" wx:if="{{!array[index]}}">{{redata.ds == 1 ? '开启' : '关闭'}}</view>
+						<view class="scd_list-details-list-txt" wx:else>{{array[index]}}</view>
+						<!-- <view class="scd_list-details-list-txt">{{array[index]}}</view> -->
+						<!-- <view class="scd_list-details-list-txt">{{redata.ds}}</view> -->
 						<image class="scd_list-details-list-txt-img" src="https://wx.yfzhwlw.com/wechat_photo/equip/xcx_42.png"></image>
 					</view>
 				</view>

测试小程序分包/miniprogram-2/packageB/pages/xyq_forms/xyq_forms/xyq_forms.wxss

@@ -146,11 +146,12 @@
 }
 
 .xyq_forms-list-name-txt {
-  font-size: 14px;
+  font-size: 12px;
   color: #636363;
   font-weight: 550;
   text-align: left;
   overflow: hidden;
+  width: 210rpx;
   /* text-overflow: ellipsis; */
   white-space: nowrap;
   display: -webkit-box;

测试小程序分包/miniprogram-2/packageB/pages/xyq_forms/xyq_forms_details-history/xyq_forms_details-history.js

@@ -33,30 +33,43 @@ Page({
         page: that.data.page
       },
       success: function (res) {
-
-
         if (res.statusCode != 200) {
           app.showError()
         } else {
-          var list = that.data.list;
-          for (var i = 0; i < res.data.dat.length; i++) {
-            list.push(res.data.dat[i]);
-          }
-          that.setData({
-            list: list
-          });
-          wx.hideLoading()
-          var num = that.data.pageSize //限制数据条数
-          var nums = res.data.nums
-          var bb = nums / num
-          var aa = Math.ceil(bb) //最后得到的页数
-          if (aa == that.data.page) {
-            //后端数据条数大于限制数据条数时显示提示
-            if (res.data.nums >= num) {
-              that.setData({
-                newData: '0'
-              })
+          //判断当前数据是否为空
+          if (res.data.dat.length != 0 && res.data.num != 0) {
+            var list = that.data.list;
+            for (var i = 0; i < res.data.dat.length; i++) {
+              list.push(res.data.dat[i]);
+            }
+            that.setData({
+              list: list
+            });
+            wx.hideLoading()
+            var num = that.data.pageSize //限制数据条数
+            var nums = res.data.nums
+            var bb = nums / num
+            var aa = Math.ceil(bb) //最后得到的页数
+            if (aa == that.data.page) {
+              //后端数据条数大于限制数据条数时显示提示
+              if (res.data.nums >= num) {
+                that.setData({
+                  newData: '0'
+                })
+              }
             }
+          } else {
+            wx.hideLoading()
+            wx.showModal({
+              title: '提示',
+              content: '已无更多数据',
+              showCancel: false,
+              success(res) {
+                if (res.confirm) {
+                  console.log('用户点击确定')
+                }
+              }
+            })
           }
         }
       },

测试小程序分包/miniprogram-2/packageB/pages/xyq_forms/xyq_forms_details-image/xyq_forms_details-image.js

@@ -34,25 +34,40 @@ Page({
         if (res.statusCode != 200) {
           app.showError()
         } else {
-          var list = that.data.list;
-          for (var i = 0; i < res.data.dat.length; i++) {
-            list.push(res.data.dat[i]);
-          }
-          that.setData({
-            list: list
-          });
-          wx.hideLoading()
-          var num = that.data.pageSize //限制数据条数
-          var nums = res.data.nums
-          var bb = nums / num
-          var aa = Math.ceil(bb) //最后得到的页数
-          if (aa == that.data.page) {
-            //后端数据条数大于限制数据条数时显示提示
-            if (res.data.nums >= num) {
-              that.setData({
-                newData: '0'
-              })
+          //判断当前是否为空 
+          if (res.data.dat.length != 0 && res.data.num != 0) {
+            var list = that.data.list;
+            for (var i = 0; i < res.data.dat.length; i++) {
+              list.push(res.data.dat[i]);
+            }
+            that.setData({
+              list: list
+            });
+            wx.hideLoading()
+            var num = that.data.pageSize //限制数据条数
+            var nums = res.data.nums
+            var bb = nums / num
+            var aa = Math.ceil(bb) //最后得到的页数
+            if (aa == that.data.page) {
+              //后端数据条数大于限制数据条数时显示提示
+              if (res.data.nums >= num) {
+                that.setData({
+                  newData: '0'
+                })
+              }
             }
+          } else {
+            wx.hideLoading()
+            wx.showModal({
+              title: '提示',
+              content: '已无更多数据',
+              showCancel: false,
+              success (res) {
+                if (res.confirm) {
+                  console.log('用户点击确定')
+                }
+              }
+            })
           }
         }
       },
@@ -169,6 +184,6 @@ Page({
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
-    
+
   }
 })

测试小程序分包/miniprogram-2/pages/login/login.wxss

@@ -2,8 +2,11 @@
 .login-container {
   padding: 0 35rpx 0 35rpx;
   background-image: url('https://wx.yfzhwlw.com/wechat_photo/index/login.jpg');
+  background-size: 100% 100%;
+  -moz-background-size: 100% 100%;
 }
-.userinfo { 
+
+.userinfo {
   display: flex;
   flex-direction: column;
   align-items: center;