pages.json

@@ -485,7 +485,7 @@
 		}, {
 			"path": "pages/disease/cmb",
 			"style": {
-				"navigationBarTitleText": "小麦赤霉病设备详情页",
+				"navigationBarTitleText": "病害设备详情页",
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
@@ -493,9 +493,8 @@
 		},{
 			"path": "pages/disease/forecastResult",
 			"style": {
-				"navigationBarTitleText": "病害设备详情页",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "预测结果",
+				"enablePullDownRefresh": false
 			}
 
 		},{

pages/cb/index/index.vue

@@ -138,7 +138,7 @@
 								this.equipArr[1].tf = true//"孢子仪"
 								this.getEquipList(1)
 								break
-							case 159:
+							case 161:
 								this.equipArr[3].tf = true//"性诱2.0"
 								this.getxyEquipList(3)
 								break

pages/disease/cmb.vue

@@ -93,6 +93,23 @@
               'margin-top': (-cHeight * (pixelRatio - 1)) / 2 + 'px',
             }"
           ></canvas>
+          <canvas
+            v-show="!tiemshow"
+            canvas-id="canvasColumnB"
+            id="canvasColumnB"
+            class="charts"
+            @touchstart="touchLineB($event)"
+            @touchmove="moveLineB($event)"
+            @touchend="touchEndLineB($event)"
+            disable-scroll="true"
+            :style="{
+              width: cWidth * pixelRatio + 'px',
+              height: cHeight * pixelRatio + 'px',
+              transform: 'scale(' + 1 / pixelRatio + ')',
+              'margin-left': (-cWidth * (pixelRatio - 1)) / 2 + 'px',
+              'margin-top': (-cHeight * (pixelRatio - 1)) / 2 + 'px',
+            }"
+          ></canvas>
         </view>
         <view class="condition">
           <scroll-view scroll-top="0" scroll-x="true" class="scroll-X">
@@ -153,6 +170,7 @@
 <script>
 import uCharts from "../../components/js_sdk/u-charts/u-charts/u-charts.js";
 var canvaColumnA = null;
+var canvaColumnB = null;
 export default {
   data() {
     return {
@@ -266,9 +284,11 @@ export default {
       });
     },
     tiemchange(e) {
+      console.log(e);
       //切换时间
-      this.begintime = parseInt(+new Date(e.startDate) / 1000);
-      this.end = parseInt(+new Date(e.endDate) / 1000);
+      // this.begintime = parseInt(+new Date(e.startDate) / 1000);
+      this.begintime = parseInt(+new Date(`${e.startDate} 00:00:00`) / 1000);
+      this.end = parseInt(+new Date(`${e.endDate} 00:00:00`) / 1000);
       this.histprydatas();
       this.getChartLine();
     },
@@ -370,11 +390,23 @@ export default {
           }
         }
         console.log(regroupData);
-        this.showColumn("canvasColumnA", xtitle, regroupData);
+        // 分割折线图
+        const regroupDataNum = Math.ceil(regroupData.length / 2);
+        const options1 = regroupData.filter((v, i) => {
+          return i < regroupDataNum;
+        });
+        const options2 = regroupData.filter((v, i) => {
+          return i >= regroupDataNum;
+        });
+        console.log(options1, options1);
+
+        this.showColumn("canvasColumnA", xtitle, options1);
+        this.showColumn("canvasColumnB", xtitle, options2);
         this.canvastishiTF = true;
       } else {
         this.canvastishiTF = false;
         this.showColumn("canvasColumnA", xtitle, []);
+        this.showColumn("canvasColumnB", xtitle, []);
       }
     },
     prev() {
@@ -397,41 +429,79 @@ export default {
       });
     },
     showColumn(id, xtitle, xinfo) {
+      console.log(id);
       var _self = this;
-      canvaColumnA = new uCharts({
-        canvasId: id,
-        type: "line",
-        legend: {
-          position: "top",
-        },
-        fontSize: 11,
-        background: "#FFFFFF",
-        pixelRatio: 1,
-        animation: true,
-        dataLabel: false,
-        categories: xtitle,
-        series: xinfo,
-        enableScroll: true, //开启图表拖拽功能
-        xAxis: {
-          disableGrid: true,
-          type: "grid",
-          gridType: "dash",
-          itemCount: 4, //x轴单屏显示数据的数量，默认为5个
-          scrollShow: true, //新增是否显示滚动条，默认false
-          // scrollAlign: 'left', //滚动条初始位置
-          scrollBackgroundColor: "#F7F7FF", //默认为 #EFEBEF
-          scrollColor: "#DEE7F7", //默认为 #A6A6A6
-        },
-        yAxis: {},
-        width: _self.cWidth * 1,
-        height: _self.cHeight * 1,
-        extra: {
-          line: {
-            type: "curve",
+      if (id === "canvasColumnA") {
+        canvaColumnA = new uCharts({
+          canvasId: id,
+          type: "line",
+          legend: {
+            position: "top",
           },
-        },
-      });
+          fontSize: 11,
+          background: "#FFFFFF",
+          pixelRatio: 1,
+          animation: true,
+          dataLabel: false,
+          categories: xtitle,
+          series: xinfo,
+          enableScroll: true, //开启图表拖拽功能
+          xAxis: {
+            disableGrid: true,
+            type: "grid",
+            gridType: "dash",
+            itemCount: 4, //x轴单屏显示数据的数量，默认为5个
+            scrollShow: true, //新增是否显示滚动条，默认false
+            // scrollAlign: 'left', //滚动条初始位置
+            scrollBackgroundColor: "#F7F7FF", //默认为 #EFEBEF
+            scrollColor: "#DEE7F7", //默认为 #A6A6A6
+          },
+          yAxis: {},
+          width: _self.cWidth * 1,
+          height: _self.cHeight * 1,
+          extra: {
+            line: {
+              type: "curve",
+            },
+          },
+        });
+      } else if (id === "canvasColumnB") {
+        canvaColumnB = new uCharts({
+          canvasId: id,
+          type: "line",
+          legend: {
+            position: "top",
+          },
+          fontSize: 11,
+          background: "#FFFFFF",
+          pixelRatio: 1,
+          animation: true,
+          dataLabel: false,
+          categories: xtitle,
+          series: xinfo,
+          enableScroll: true, //开启图表拖拽功能
+          xAxis: {
+            disableGrid: true,
+            type: "grid",
+            gridType: "dash",
+            itemCount: 4, //x轴单屏显示数据的数量，默认为5个
+            scrollShow: true, //新增是否显示滚动条，默认false
+            // scrollAlign: 'left', //滚动条初始位置
+            scrollBackgroundColor: "#F7F7FF", //默认为 #EFEBEF
+            scrollColor: "#DEE7F7", //默认为 #A6A6A6
+          },
+          yAxis: {},
+          width: _self.cWidth * 1,
+          height: _self.cHeight * 1,
+          extra: {
+            line: {
+              type: "curve",
+            },
+          },
+        });
+      }
     },
+
     touchLineA(e) {
       console.log(e);
       canvaColumnA.scrollStart(e);
@@ -448,6 +518,22 @@ export default {
         },
       });
     },
+    touchLineB(e) {
+      console.log(e);
+      canvaColumnB.scrollStart(e);
+    },
+    moveLineB(e) {
+      canvaColumnB.scroll(e);
+    },
+    touchEndLineB(e) {
+      canvaColumnB.scrollEnd(e);
+      //下面是toolTip事件，如果滚动后不需要显示，可不填写
+      canvaColumnB.showToolTip(e, {
+        format: function (item, category) {
+          return category + " " + item.name + ":" + item.data;
+        },
+      });
+    },
   },
   onLoad(option) {
     this.eqinfo = JSON.parse(option.shebei);
@@ -593,7 +679,7 @@ export default {
   margin: 20px auto;
   box-shadow: 0 0 10rpx #bcb9ca;
   padding-top: 20rpx;
-  height: 550rpx;
+  height: 1000rpx;
 
   .canvastishi {
     font-size: 32rpx;

pages/disease/forecastResult.vue

@@ -1,15 +1,15 @@
 <template>
   <view>
-    <view class="status_bar"></view>
-    <view class="" style="position: relative; top: 44px">
-      <view style="position: fixed; z-index: 100; width: 100%">
+    <!-- <view class="status_bar"></view> -->
+    <view class="">
+      <!-- <view style="position: fixed; z-index: 100; width: 100%">
         <uni-nav-bar
           @clickLeft="clickLeft"
           left-icon="back"
           left-text="返回"
           title="设备详情"
         ></uni-nav-bar>
-      </view>
+      </view> -->
       <view class="info">
         <view class="info_item">
           <image
@@ -28,7 +28,7 @@
           <p>预测位置：{{ this.address || "无" }}</p>
           <p>
             最近预测时间：<span v-if="this.latest_uptime != ''">{{
-              this.latest_uptime | timeFormat()
+               formetDate(this.latest_uptime)
             }}</span>
             <span v-else>暂无数据</span>
           </p>
@@ -196,23 +196,6 @@ export default {
         return "大发生";
       }
     },
-    // tiemchange(e) {
-    //   //切换时间
-    //   this.begintime = parseInt(+new Date(e.startDate) / 1000);
-    //   this.end = parseInt(+new Date(e.endDate) / 1000);
-    //   this.histprydatas();
-    //   this.getChartLine();
-    // },
-    // timetab(e) {
-    //   //时间转换
-    //   e = new Date(e * 1000);
-    //   var year = e.getFullYear();
-    //   var month =
-    //     e.getMonth() + 1 < 10 ? "0" + (e.getMonth() + 1) : e.getMonth() + 1;
-    //   var day = e.getDate() < 10 ? "0" + e.getDate() : e.getDate();
-    //   var time = year + "/" + month + "/" + day;
-    //   return time;
-    // },
     // 表格数据
     async histprydatas() {
       //表格历史数据
@@ -275,42 +258,7 @@ export default {
         delta: 1,
       });
     },
-    // showColumn(id, xtitle, xinfo) {
-    //   var _self = this;
-    //   canvaColumnA = new uCharts({
-    //     canvasId: id,
-    //     type: "line",
-    //     legend: {
-    //       position: "top",
-    //     },
-    //     fontSize: 11,
-    //     background: "#FFFFFF",
-    //     pixelRatio: 1,
-    //     animation: true,
-    //     dataLabel: false,
-    //     categories: xtitle,
-    //     series: xinfo,
-    //     enableScroll: true, //开启图表拖拽功能
-    //     xAxis: {
-    //       disableGrid: true,
-    //       type: "grid",
-    //       gridType: "dash",
-    //       itemCount: 4, //x轴单屏显示数据的数量，默认为5个
-    //       scrollShow: true, //新增是否显示滚动条，默认false
-    //       // scrollAlign: 'left', //滚动条初始位置
-    //       scrollBackgroundColor: "#F7F7FF", //默认为 #EFEBEF
-    //       scrollColor: "#DEE7F7", //默认为 #A6A6A6
-    //     },
-    //     yAxis: {},
-    //     width: _self.cWidth * 1,
-    //     height: _self.cHeight * 1,
-    //     extra: {
-    //       line: {
-    //         type: "curve",
-    //       },
-    //     },
-    //   });
-    // },
+
     touchLineA(e) {
       console.log(e);
       canvaColumnA.scrollStart(e);
@@ -334,8 +282,6 @@ export default {
     this.cWidth = uni.upx2px(650);
     this.cHeight = uni.upx2px(500);
     this.device_id = option.id;
-    // this.end = parseInt(+new Date() / 1000);
-    // this.begintime = parseInt(this.end - 24 * 60 * 60);
     this.histprydatas();
   },
 };
@@ -344,9 +290,6 @@ export default {
 <style lang="scss">
 .info {
   width: 100%;
-  position: absolute;
-  top: 44px;
-
   .info_item {
     width: 90%;
     margin: 0 auto;
@@ -378,7 +321,6 @@ export default {
 }
 .his_box {
   width: 100%;
-  top: 340rpx;
   position: relative;
   .title {
     padding: 20rpx 50rpx;

pages/environment/index.vue

@@ -247,6 +247,7 @@ export default {
   },
   methods: {
     async eqlist() {
+      console.log("搜素字段s", this.imports);
       //设备列表 环境监测
       this.loadingtf = true;
       const res = await this.$myRequest({
@@ -294,7 +295,7 @@ export default {
         method: "POST",
         url: "/api/api_gateway?method=wheat.wheat.wheat_list",
         data: {
-          device_id: "",
+          device_id: this.imports,
           device_name: "",
           page: this.page,
           device_type: this.diseaseId,
@@ -379,6 +380,13 @@ export default {
         } else if (this.side_type == 15) {
           this.eqlistdata = [];
           this.tubulareqlist();
+        } else if (
+          this.side_type == 11 ||
+          this.side_type == 19 ||
+          this.side_type == 20
+        ) {
+          this.eqlistdata = [];
+          this.getEquipList();
         }
       }, 1000)();
     },
@@ -482,6 +490,7 @@ export default {
 page {
   background: $uni-bg-color-grey;
 }
+
 .inputs {
   height: 54rpx;
   background-color: #e4e4e4;
@@ -526,25 +535,37 @@ page {
   left: 2.5%;
   text-align: center;
   z-index: 9;
+
   .img {
     width: 300rpx;
     height: 40rpx;
   }
 }
+.tab-box::-webkit-scrollbar {
+  display: none;
+}
 .tab-box {
   position: fixed;
   top: 170px;
-  display: flex;
-  justify-content: space-around;
+  // display: flex;
+  // justify-content: space-around;
   font-size: 30rpx;
   line-height: 80rpx;
   background-color: #ffffff;
   width: 100%;
   z-index: 2;
+  overflow: hidden;
+  overflow-x: scroll;
+  white-space: nowrap;
+
   .tab-item {
     cursor: pointer;
     position: relative;
+    width: 25%;
+    text-align: center;
+    display: inline-block;
   }
+
   .tab-item.active {
     .bottom-line {
       bottom: 0;
@@ -559,6 +580,7 @@ page {
     }
   }
 }
+
 .prevents {
   width: 100%;
   position: absolute;
@@ -573,6 +595,7 @@ page {
     box-sizing: border-box;
     position: relative;
     background-color: #fff;
+
     .prevents_item_img {
       width: 30rpx;
       height: 50rpx;
@@ -602,6 +625,7 @@ page {
       margin-top: 20rpx;
       font-size: 26rpx;
       color: #bdbdbd;
+
       .prevents_item_bot_sapn0 {
         color: #00b075;
       }

pages/equipList/index.vue

@@ -14,6 +14,7 @@
           placeholder-color="#909696"
           :show-action="false"
           search-icon-color="#909696"
+          @input="searchinput"
         >
         </u-search>
         <!-- <input type="text" value="" placeholder="请输入设备ID或设备名称" v-model="imports" @input="searchinput"
@@ -81,7 +82,7 @@
             </view>
             <view
               class="list_item_btn"
-              v-if="infoalter && ![11, 19, 20].includes(type_id)"
+              v-if="infoalter && ![13, 17, 18, 11, 19, 20].includes(type_id)"
               @click.stop="modification(item)"
             >
               信息修改
@@ -227,6 +228,7 @@ export default {
         };
         this.list.push(obj);
       }
+      console.log("设备列表11111111111111", this.list);
       if (res.length) {
         this.type_id = this.list[0].id;
         if (this.list[0].id == 10) {

unpackage/cache/apk/apkurl

@@ -1 +1,5 @@
-https://ide.dcloud.net.cn/build/download/e6f40ec0-d04c-11ec-8e8d-d9b3e424cb29
+<<<<<<< HEAD
+https://ide.dcloud.net.cn/build/download/f4fea6b0-d102-11ec-9936-a9114ee0f763
+=======
+https://ide.dcloud.net.cn/build/download/e6f40ec0-d04c-11ec-8e8d-d9b3e424cb29
+>>>>>>> 5414116f2bdb506d174436e6db8052c03bb30109

unpackage/cache/certdata

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+andrCertfile=E:/HBuilderX/HBuilderX/plugins/app-safe-pack/Test.keystore
+=======
 andrCertfile=D:/HBuilderX/HBuilderX/plugins/app-safe-pack/Test.keystore
+>>>>>>> 5414116f2bdb506d174436e6db8052c03bb30109
 andrCertAlias=android
 andrCertPass=ep/Tdjka4Y7WYqDB6/S7dw==

util/neutral.js

@@ -1,4 +1,4 @@
 export default{
 	// isneutral:true//云飞智控
-	isneutral:false//智控
+	isneutral:false//云控
 }