合并提交

pages/disease/forecastResult.vue

@@ -27,10 +27,10 @@
           </p>
           <p>预测位置：{{ this.address || "无" }}</p>
           <p>
-            最近上报时间：<span v-if="this.latest_uptime != ''">{{
-              this.latest_uptime | timeFormat()
+            最近预测时间：<span v-if="this.latest_uptime != ''">{{
+               formetDate(this.latest_uptime)
             }}</span>
-            <span v-else>暂无</span>
+            <span v-else>暂无数据</span>
           </p>
         </view>
       </view>
@@ -41,7 +41,7 @@
 				</view>
 			</view> -->
       <view class="his_box">
-        <view class="title">气象数据</view>
+        <view class="title">预测数据</view>
         <view class="condition">
           <scroll-view scroll-top="0" scroll-x="true" class="scroll-X">
             <table class="table">
@@ -60,7 +60,7 @@
                 :key="'b' + indexs"
                 v-if="!forbidden"
               >
-                <td class="td">{{ items.uptime | timeFormat() }}</td>
+                <td class="td">{{ formetDate(items.uptime) }}</td>
                 <td class="td">{{ items.incidence }}</td>
                 <td class="td">{{ filterIncidence(items.incidence) }}</td>
               </tr>
@@ -161,6 +161,16 @@ export default {
     };
   },
   methods: {
+    formetDate(time) {
+      let date = new Date(time * 1000);
+      let y = date.getFullYear();
+      let m = date.getMonth() + 1;
+      let d = date.getDate();
+      return `${y}-${this.addZero(m)}-${this.addZero(d)}`;
+    },
+    addZero(x) {
+      return Number(x) < 10 ? `0${x}` : x;
+    },
     copy(item) {
       uni.setClipboardData({
         data: item,

pages/environment/index.vue

@@ -401,6 +401,7 @@ export default {
         this.eqlistdata = [];
         this.tubulareqlist();
       } else if (type == 11) {
+        this.diseaseId = type;
         this.eqlistdata = [];
         this.getEquipList();
       } else if (type == 19) {

pages/equipList/index.vue

@@ -497,6 +497,7 @@ page {
 
 .textbox {
   width: 100%;
+  height: 100vh;
   padding: 20rpx 30rpx;
   box-sizing: border-box;
   border-top-left-radius: 80rpx;

unpackage/cache/apk/apkurl

@@ -1 +1,5 @@
-https://ide.dcloud.net.cn/build/download/f4fea6b0-d102-11ec-9936-a9114ee0f763
+<<<<<<< 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//云控
 }