Explorar o código

todo
优化控制界面
假死现象
报警显示

wzh %!s(int64=2) %!d(string=hai) anos
pai
achega
8129592067
Modificáronse 3 ficheiros con 2123 adicións e 558 borrados
  1. 7 5
      pages.json
  2. 11 553
      pages/device/detail.vue
  3. 2105 0
      pages/device/detail1.vue

+ 7 - 5
pages.json

@@ -1,15 +1,16 @@
 {
 {
   "pages": [
   "pages": [
+
     {
     {
-      "path": "pages/bluetooth/index/index",
+      "path": "pages/login",
       "style": {
       "style": {
-        "navigationBarTitleText": "蓝牙控制"
+        "navigationBarTitleText": "登录"
       }
       }
     },
     },
     {
     {
-      "path": "pages/login",
+      "path": "pages/bluetooth/index/index",
       "style": {
       "style": {
-        "navigationBarTitleText": "登录"
+        "navigationBarTitleText": "蓝牙控制"
       }
       }
     },
     },
     {
     {
@@ -100,7 +101,8 @@
     {
     {
       "path": "pages/device/detail",
       "path": "pages/device/detail",
       "style": {
       "style": {
-        "navigationBarTitleText": "详情"
+        "navigationBarTitleText": "详情",
+        "navigationStyle": "custom"
       }
       }
     },
     },
     {
     {

+ 11 - 553
pages/device/detail.vue

@@ -1,571 +1,25 @@
 <template>
 <template>
-  <view class="content">
-    <view class="header" style="margin:0;padding: 0px;">
-
-      <view class="bg" style="position: fixed;top:0px;bottom:0px;left:0px;right:0px;background-image: url('https://hyscancode.oss-cn-hangzhou.aliyuncs.com/jianyaoji/images/device/bg.png');background-size: 100% 100%;padding:0 40rpx">
-        <view style="position: absolute;right:10rpx;top:30rpx">
-          <u-button @click="reportError" color="#EC6D2F" text="上报异常" type="error" size="mini"></u-button>
-        </view>
-
-        <view style="position: absolute;right:52rpx;top:116rpx;" v-if="deviceInfo.status == 3">
-          <view>
-            <u-image :showLoading="true" src="/static/images/device/zaixian.png" width="200rpx" height="200rpx" ></u-image>
-          </view>
-          <view style="position: absolute;color:#48C373;top:110rpx;left:70rpx">在线</view>
-        </view>
-
-        <view style="position: absolute;right:52rpx;top:116rpx;"  v-if="deviceInfo.status == 4">
-          <view>
-            <u-image :showLoading="true" src="/static/images/device/offline.png" width="200rpx" height="200rpx" ></u-image>
-          </view>
-          <view style="position: absolute;color:lightgray;top:110rpx;left:70rpx">离线</view>
-        </view>
-        <view style="font-weight: bold;font-size: 30rpx;margin-top:20rpx">
-          {{deviceInfo.deviceName}}
-
-        </view>
-        <view class="prop-text">
-          <text class="text-left">所属用户:</text>
-          <text class="text-right">{{sysDept.deptName}}</text>
-        </view>
-        <view class="prop-text">
-          <text class="text-left">设备编号:</text>
-          <text class="text-right">{{deviceInfo.serialNumber}}</text>
-        </view>
-        <view class="prop-text">
-          <text class="text-left">二维码ID:</text>
-          <text class="text-right">{{deviceInfo.qrcodeId==null?"未绑定":deviceInfo.qrcodeId}}</text>
-        </view>
-
-
-        <view class="prop-text">
-          <text class="text-left">激活时间:</text>
-          <text class="text-right">{{deviceInfo.activeTime}}</text>
-        </view>
-        <view class="prop-text">
-          <text class="text-left">查看位置:</text>
-          <view style="position: absolute;top:0px;left:120rpx">
-            <u-icon name="map-fill" label="查看位置" color="#2979ff" size="20" labelSize="12"></u-icon>
-          </view>
-        </view>
-
-        <view class="prop-card-area">
-
-          <view class="prop-card">
-            <view class="prop-card-top">{{ deviceInfo.rssi }}</view>
-            <view class="prop-card-bottom">设备信号</view>
-
-          </view>
-          <view class="prop-card">
-            <view class="prop-card-top">{{ timeobj.alltime }}</view>
-            <view class="prop-card-bottom">累计时长</view>
-
-          </view>
-          <view class="prop-card">
-            <view class="prop-card-top">{{ timeobj.avgtime }}</view>
-            <view class="prop-card-bottom">平均时长</view>
-
-          </view>
-        </view>
-
-        <view class="tab-area">
-
-<!--          <u-tabs lineWidth="80"  :activeStyle="{ color: '#3E9CFC' }" :list="summary" keyName="tabName" @change="getDeviceStatus"></u-tabs>-->
-
-          <u-tabs lineWidth="80"  :activeStyle="{ color: '#3E9CFC' }" :list="tabs" :current="current" keyName="tabName" @change="getNewDeviceStatus"></u-tabs>
-
-
-          <view>
-            <uni-row class="demo-uni-row">
-              <uni-col :span="12">
-              </uni-col>
-            </uni-row>
-            <uni-row class="demo-uni-row">
-              <uni-col :span="12">
-
-              </uni-col>
-            </uni-row>
-
-
-            <!--  煎药控制 -->
-            <view class="demo-uni-row" v-if="firstTab">
-              <!-- 子tab -->
-              <view style="width:70%;margin:0 auto">
-                <u-tabs :list="summary" :current="subCurrent" @change="changeSub"></u-tabs>
-              </view>
-
-              <!-- 设备和锁定开关 -->
-              <view class="demo-uni-row clearfix">
-                <view style="clear: both"></view>
-              </view>
-
-              <!-- 头部 -->
-              <view class="decoctControlHeader">
-                <uni-icons custom-prefix="iconfont" type="icon-fuzhushuxian" size="30"></uni-icons>
-                <text>煎药控制</text>
-              </view>
-
-              <!-- 腰部 -->
-              <view>
-                <!-- 上边部份 -->
-                <view class="decoctControlTop">
-                  <!-- 左边 -->
-                  <view class="decoctControlTopLeft">
-                    <view>温度设置</view>
-                    <view class="control-input-box">
-                      <view style="width: 80px">
-                        <u-input  placeholder="请输入" @change="changeTemperature()" v-model="temperature"></u-input>
-                      </view>
-                      <view class="control-input-box-danwei">℃</view>
-                    </view>
-                    <view class="gap">
-                     <view class="addTemperature" @click="addTemperature(1)">
-                       <u-image src="/static/images/device/up_btn.png" width="60rpx" height="60rpx"></u-image>
-                     </view>
-
-                     <view class="subTemperature" @click="subTemperature(1)">
-                       <u-image src="/static/images/device/down_btn.png" width="60rpx" height="60rpx"></u-image>
-                     </view>
-                   </view>
-
-                  </view>
-
-                  <!-- 右边 -->
-                  <view class="decoctControlTopRight">
-                    <view>煎药时间</view>
-                    <view class="control-input-box">
-                      <view style="width: 80px">
-                        <u-input placeholder="请输入" @change="changeTemperatureTime()" v-model="temperatureTime"></u-input>
-                      </view>
-                      <view class="control-input-box-danwei">min</view>
-                    </view>
-
-                    <view class="gap">
-                      <view class="addTime" @click="addTemperatureTime">
-                        <u-image src="/static/images/device/up_btn.png" width="60rpx" height="60rpx"></u-image>
-                      </view>
-
-                      <view class="subTime" @click="subTemperatureTime">
-                        <u-image src="/static/images/device/down_btn.png" width="60rpx" height="60rpx"></u-image>
-                      </view>
-                    </view>
-
-                  </view>
-                </view>
-
-                <!-- 下边部份 -->
-                <view class="decoctControlTop" style="height: 220rpx">
-                  <!-- 左边 -->
-                  <view class="decoctControlTopLeft" style="width: 30%">
-                    <text>当前温度</text>
-                    <u-input placeholder="0" disabled :value="currentTemperature+'℃'"></u-input>
-
-                  </view>
-
-                  <!-- 右边 -->
-                  <view class="decoctControlTopRight" style="width: 30%">
-                    <text>高温时间</text>
-                    <u-input placeholder="0" disabled :value="hightTemperature+'min'"></u-input>
-
-                  </view>
-
-                  <view class="decoctControlTopRight" style="width: 30%">
-                    <text>剩余时间</text>
-                    <u-input placeholder="0" disabled :value="leftJianyaoTime+'min'"></u-input>
-
-                  </view>
-                </view>
-              </view>
-
-              <!-- 尾部 -->
-              <view>
-                <!-- 上边 -->
-                <view class="decoctControlBottom" >
-                  <!-- 左边 -->
-                  <view>
-                    <text>开关状态</text>
-                  </view>
-                  <!-- 右边 -->
-                  <view style="display: flex;align-items: center">
-                    <text style="margin-right: 15px" v-if="decoctControlOnOffStatus">已开机</text>
-                    <text style="margin-right: 15px" v-if="!decoctControlOnOffStatus">未开机</text>
-                    <u-switch v-model="decoctControlOnOffStatus" @change="decoctControlOnOffChange"></u-switch>
-                  </view>
-                </view>
-
-                <!-- 下边 -->
-                <view class="decoctControlBottom">
-                  <!-- 左边 -->
-                  <view>
-                    <text v-if="decoctControlStatus">煎药状态</text>
-                    <text v-else>
-                      <text>
-                        煎药状态
-                      </text>
-                      <text v-if="leftAppointmentTime>0" style="font-size: 10px">
-                       (已预约,开启煎药后进入倒计时)
-                      </text>
-
-
-                    </text>
-
-                  </view>
-                  <!-- 右边 -->
-                  <view style="display: flex;align-items: center">
-                    <text style="margin-right: 15px" v-if="!decoctControlStatus">
-                      未煎药</text>
-                    <text v-else>
-                      <text style="margin-right: 15px" v-if="leftAppointmentTime == 0">煎药中</text>
-                      <text style="margin-right: 15px" v-if="leftAppointmentTime >0">已预约,剩余{{leftAppointmentTime}}分钟</text>
-
-                    </text>
-                    <u-switch v-model="decoctControlStatus" @change="decoctControlChange"></u-switch>
-                  </view>
-                </view>
-
-              </view>
-
-            </view>
-
-            <!--  包装控制 -->
-            <view class="demo-uni-row" v-if="!firstTab">
-
-              <view class="demo-uni-row clearfix">
-                <view style="clear: both"></view>
-              </view>
-              <!-- 头部 -->
-              <view class="decoctControlHeader">
-                <uni-icons custom-prefix="iconfont" type="icon-fuzhushuxian" size="30"></uni-icons>
-                <text>包装控制</text>
-              </view>
-
-              <!-- 腰部 -->
-              <view>
-                <!-- 上边部份 -->
-                <view class="decoctControlTop" style="margin:0 30rpx">
-                  <!-- 左边 -->
-                  <view class="decoctControlTopLeft" style="width: 23%;margin:0 5px;">
-                    <view>封边温度</view>
-                    <view class="control-input-box">
-                      <view style="width: 80px">
-                        <u-input placeholder="请输入" @change="changeEdegTemperature" v-model="setEdegTemperature"></u-input>
-                      </view>
-                      <view class="control-input-box-danwei">℃</view>
-                    </view>
-                    <view class="addTemperature baozhuang-add" @click="addEdegTemperature">
-                      <u-image src="/static/images/device/up_btn.png" width="60rpx" height="60rpx"></u-image>
-                    </view>
-
-
-                    <view class="subTime baozhuang-sub" @click="subEdegTemperature">
-                      <u-image src="/static/images/device/down_btn.png" width="60rpx" height="60rpx"></u-image>
-                    </view>
-
-                  </view>
-
-                  <!-- 右边 -->
-                  <view class="decoctControlTopLeft" style="width: 23%;margin:0 5px;">
-                    <view>封口温度</view>
-                    <view class="control-input-box">
-                      <view style="width: 80px">
-                        <u-input placeholder="请输入" @change="changeSealingTemperature" v-model="setSealingTemperature"></u-input>
-                      </view>
-                      <view class="control-input-box-danwei">℃</view>
-                    </view>
-                    <view class="addTemperature baozhuang-add"  @click="addSealingTemperature">
-                      <u-image src="/static/images/device/up_btn.png" width="60rpx" height="60rpx"></u-image>
-                    </view>
-
-                    <view class="subTime baozhuang-sub" @click="subSealingTemperature">
-                      <u-image src="/static/images/device/down_btn.png" width="60rpx" height="60rpx"></u-image>
-                    </view>
-
-                  </view>
-
-                  <view class="decoctControlTopLeft" style="width: 23%;margin:0 5px;">
-                    <view>包装容量</view>
-                    <view class="control-input-box">
-                      <view style="width: 80px">
-                        <u-input placeholder="请输入" @change="changePackageVolume" :value="packageVolume"></u-input>
-                      </view>
-                      <view class="control-input-box-danwei">ml</view>
-                    </view>
-                    <view class="addTemperature baozhuang-add" @click="addPackageVolume">
-                      <u-image src="/static/images/device/up_btn.png" width="60rpx" height="60rpx"></u-image>
-                    </view>
-
-                    <view class="subTime baozhuang-sub" @click="subPackageVolume">
-                      <u-image src="/static/images/device/down_btn.png" width="60rpx" height="60rpx"></u-image>
-                    </view>
-
-                  </view>
-
-                  <!-- 右边 -->
-                  <view style="width:23%;line-height: 2;text-align: center;margin: 0 1px;position: relative">
-                    <view>包装数量</view>
-                    <view class="control-input-box">
-                      <view style="width: 80px">
-                        <u-input placeholder="请输入" @change="changePackageNumber" :value="packageNumber"></u-input>
-                      </view>
-                      <view class="control-input-box-danwei">个</view>
-                    </view>
-                    <view class="addTemperature baozhuang-add" @click="addPackageNumber">
-                      <u-image src="/static/images/device/up_btn.png" width="60rpx" height="60rpx"></u-image>
-                    </view>
-
-                    <view class="subTime baozhuang-sub" @click="subPackageNumber">
-                      <u-image src="/static/images/device/down_btn.png" width="60rpx" height="60rpx"></u-image>
-                    </view>
-
-                  </view>
-                </view>
-
-                <!-- 下边部份 -->
-                <view class="decoctControlTop">
-                  <view class="decoctControlTopLeft" style="width: 40%">
-                    <text>当前封边温度</text>
-                    <u-input placeholder="0" disabled :value="edegTemperature+'℃'"></u-input>
-
-                  </view>
-
-                  <!-- 右边 -->
-                  <view class="decoctControlTopRight" style="width: 40%">
-                    <text>当前封口温度</text>
-                    <u-input placeholder="0" disabled :value="sealingTemperature+'℃'"></u-input>
-
-                  </view>
-
-                </view>
-              </view>
-
-              <!-- 尾部 -->
-              <view>
-                <!-- 上边 -->
-                <view class="decoctControlBottom">
-                  <!-- 左边 -->
-                  <view>
-                    <text>开关</text>
-                  </view>
-                  <!-- 右边 -->
-                  <view style="display: flex;align-items: center">
-                    <text style="margin-right: 15px" v-if="decoctControlOnOffStatus">已开机</text>
-                    <text style="margin-right: 15px" v-if="!decoctControlOnOffStatus">未开机</text>
-                    <u-switch v-model="decoctControlOnOffStatus" @change="decoctControlOnOffChange"></u-switch>
-                  </view>
-                </view>
-
-                <view class="decoctControlBottom">
-                  <!-- 左边 -->
-                  <view>
-                    <text>启停开关</text>
-                  </view>
-                  <!-- 右边 -->
-                  <view style="display: flex;align-items: center">
-                    <text style="margin-right: 15px" v-if="!qitingTurn">未开启</text>
-                    <text style="margin-right: 15px" v-if="qitingTurn">已开启</text>
-                    <u-switch v-model="qitingTurn" @change="turnChange(1)"></u-switch>
-                  </view>
-                </view>
-
-                <view class="decoctControlBottom">
-                  <!-- 左边 -->
-                  <view>
-                    <text>包装开关</text>
-                  </view>
-                  <!-- 右边 -->
-                  <view style="display: flex;align-items: center">
-                    <text style="margin-right: 15px" v-if="!baozhuangTurn">未开启</text>
-                    <text style="margin-right: 15px" v-if="baozhuangTurn">已开启</text>
-                    <u-switch v-model="baozhuangTurn" @change="turnChange(2)"></u-switch>
-                  </view>
-                </view>
-
-                <view class="decoctControlBottom">
-                  <!-- 左边 -->
-                  <view>
-                    <text>清洗开关</text>
-                  </view>
-                  <!-- 右边 -->
-                  <view style="display: flex;align-items: center">
-                    <text style="margin-right: 15px" v-if="!qingxiTurn">未开启</text>
-                    <text style="margin-right: 15px" v-if="qingxiTurn">已开启</text>
-                    <u-switch v-model="qingxiTurn" @change="turnChange(3)"></u-switch>
-                  </view>
-                </view>
-
-
-<!--                &lt;!&ndash; 下边 &ndash;&gt;-->
-<!--                <view class="decoctControlBottom">-->
-<!--                  &lt;!&ndash; 左边 &ndash;&gt;-->
-<!--                  <view>-->
-<!--                    <text>模式</text>-->
-<!--                  </view>-->
-<!--                  &lt;!&ndash; 右边 &ndash;&gt;-->
-<!--                  <view style="display: flex;align-items: center">-->
-<!--                    <text class="packageControlBottomRight">包装</text>-->
-<!--                    <text class="packageControlBottomClear">清洗</text>-->
-<!--                  </view>-->
-<!--                </view>-->
-
-              </view>
-
-            </view>
-
-            <view class="action-btn">
-              <button @click="showDrawer" class="login-btn cu-btn block bg-blue lg round" style="flex: 0 0 auto;width: 55%;margin: 0 auto;margin-top:20px;">高级设置</button>
-            </view>
-            <uni-drawer ref="showLeft" :width="320" :maskClick="true" mode="left"  @change="change($event,'showLeft')">
-
-
-              <!--               <view class="item" style="padding-top:10rpx">-->
-              <!--                 <u-button v-if="deviceInfo.status==3"-->
-              <!--                           @tap="send(item)"-->
-              <!--                           text="发送"-->
-              <!--                           type="success"-->
-              <!--                           size="mini"-->
-              <!--                 ></u-button>-->
-              <!--                 <u-button v-if="deviceInfo.status!=3"-->
-              <!--                           @tap="send(item)"-->
-              <!--                           text="发送"-->
-              <!--                           type="info"-->
-              <!--                           size="mini"-->
-              <!--                 ></u-button>-->
-              <!--               </view>-->
-              <scroll-view style="height: 88%;" scroll-y="true">
-                <view>
-                  <view class="prop-item" v-if="firstTab">
-                    <view class="prop-item-left">温度校准</view>
-                    <view class="prop-item-right">
-                      <view style="width:120rpx;position: absolute;top:0rpx;">
-                        <button @click="temperNumber" class="login-btn cu-btn block bg-blue lg round send_btn">点击校准</button>
-                      </view>
-                    </view>
-                  </view>
-                  <view class="prop-item" v-if="!firstTab">
-                    <view class="prop-item-left">容量校准</view>
-                    <view class="prop-item-right">
-                      <view style="width:120rpx;position: absolute;top:0rpx;">
-                        <button @click="volumeNumber" class="login-btn cu-btn block bg-blue lg round send_btn">点击校准</button>
-                      </view>
-                    </view>
-                  </view>
-                  <view class="prop-item">
-                    <view class="prop-item-left">恢复出厂</view>
-                    <view class="prop-item-right">
-                      <view style="width:120rpx;position: absolute;top:0rpx;">
-                        <button @click="reset" class="login-btn cu-btn block bg-blue lg round send_btn">点击恢复</button>
-                      </view>
-                    </view>
-                  </view>
-
-                  <view class="prop-item"  v-if="firstTab">
-                    <view class="prop-item-left">工作模式</view>
-                    <view class="prop-item-right">
-                      <view style="width:320rpx;position: absolute;top:0rpx;">
-                        <view style="display: flex;align-items: center">
-                          <text @click="setMode(1)" class="packageControlBottomClear" :class="workMode == 1?'active_btn':''" style="font-size: 10px;width: 50rpx;margin-right:5px">模式1</text>
-                          <text @click="setMode(2)" class="packageControlBottomClear" :class="workMode == 2?'active_btn':''" style="font-size: 10px;width: 50rpx;margin-right:5px">模式2</text>
-                          <text @click="setMode(3)" class="packageControlBottomClear" :class="workMode == 3?'active_btn':''" style="font-size: 10px;width: 50rpx;margin-right:5px">模式3</text>
-                        </view>
-                      </view>
-                    </view>
-                  </view>
-
-                  <view class="prop-item"  v-if="firstTab">
-                    <view class="prop-item-left">预约时间</view>
-                    <view class="prop-item-right">
-                      <view style="width:320rpx;position: absolute;top:0rpx;">
-                        <view style="display: flex;align-items: center">
-                          <view v-if="leftAppointmentTime>0" style="   width:600rpx;     left: -28%;position: absolute;top:0rpx;display:flex;margin-top: 5px;font-size: 12px;">
-                            预约剩余时间:{{leftAppointmentTime}}min
-                            <button @click="cancelPlan" class="login-btn cu-btn block bg-blue lg round " style="margin-top:0px;width: 160rpx;height: 40rpx ;
-    font-size: 10px ;margin-left:5px">取消预约</button>
-                          </view>
-
-                          <view  v-if="leftAppointmentTime==0" style="width:300rpx;position: absolute;top:0rpx;display: flex;flex-direction: row">
-                            <u-input customStyle="position: relative;width: 50px;left: 0px;top:5px;height: 40rpx;" placeholder="请输入" v-model="planTime"></u-input>
-                            <view style="margin-top: 6px;">min</view>
-                            <button @click="plan" class="login-btn cu-btn block bg-blue lg round " style="margin-left:10rpx;width: 160rpx;height: 40rpx ;
-    font-size: 10px ;
-    margin-top: 5px;">预约煎药</button>
-                          </view>
-                        </view>
-                      </view>
-                    </view>
-                  </view>
-
-                  <view class="prop-item">
-                    <view class="prop-item-left">锁定设备</view>
-                    <view class="prop-item-right">
-                      <view style="width:320rpx;position: absolute;top:0rpx;">
-                        <view style="display: flex;align-items: center">
-                          <view v-if="lock.value == 0" style="margin-top: 4px;">
-                            <text class="packageControlBottomClear"  style="font-size: 10px;width: 70rpx;margin-right:5px">未锁定</text>
-                            <text @click="lockCtrl(0)" class="packageControlBottomRight"  style="font-size: 10px;width: 70rpx;margin-right:5px">点击锁定</text>
-                          </view>
-
-                          <view v-if="lock.value == 1" style="margin-top: 4px;">
-                            <text class="packageControlBottomClear"  style="font-size: 10px;width: 70rpx;margin-right:5px;background: darkred">已锁定</text>
-                            <text @click="lockCtrl(1)" class="packageControlBottomClear"  style="font-size: 10px;width: 70rpx;margin-right:5px;background: #EC6D2F">点击解锁</text>
-                          </view>
-
-                        </view>
-                      </view>
-                    </view>
-                  </view>
-
-                </view>
-
-
-              </scroll-view>
-              <button @click="closeDrawer" class="login-btn cu-btn block bg-blue lg round">关闭</button>
-            </uni-drawer>
-
-
-
-
-          </view>
-
-
-        </view>
+  <view class="content"  >
+    <view class="header" :style='"background-image:url("+imgUrl+"/detail/bg.png);background-repeat: no-repeat;background-size: 100% 200%;"'>
 
 
+      <view style="position: relative;top:10px;width: 400rpx;height: 600rpx;">
 
 
+        <u-image :src="imgUrl+'/detail/product.png'"/>
       </view>
       </view>
 
 
-
-      <u-picker @cancel="show=null" :show="show!=null" :columns="columns" @confirm="confirmItemData" keyName="text"></u-picker>
-      <u-modal @cancel="cancel" :show="showErrDlg" title="异常上报" :showCancelButton="true" @confirm="doReportError" >
-        <view class="slot-content">
-
-          <view style="margin:10px">
-            <textarea auto-height	="true"  v-model="errorMsg" placeholder="请输入异常内容" ></textarea>
+    </view>
 
 
 
 
-          </view>
-        </view>
-      </u-modal>
 
 
-      <!--      <u-modal  :show="showTimeDlg" title="查看时长"  @confirm="closeTime" >-->
-      <!--        <view class="slot-content">-->
-      <!--            <view v-if="timeobj!=null && deviceInfo.status == 3">本次运行时长:{{ timeobj.runtime }}</view>-->
-      <!--          <view v-if="timeobj!=null ">累计时长:{{ timeobj.alltime }}</view>-->
 
 
-      <!--             <view v-if="timeobj!=null ">平均每天运行时长:{{ timeobj.avgtime }}</view>-->
+      </view>
 
 
-      <!--        </view>-->
-      <!--      </u-modal>-->
-    </view>
-  </view>
 </template>
 </template>
 
 
 <script>
 <script>
 import { getDetail,getDeviceStatus,cacheJsonThingsModel,reportError ,getDeviceRunTime} from '@/api/device/device.js'
 import { getDetail,getDeviceStatus,cacheJsonThingsModel,reportError ,getDeviceRunTime} from '@/api/device/device.js'
-import UButton from "../../uni_modules/uview-ui/components/u-button/u-button";
-import UForm from "../../uni_modules/uview-ui/components/u--form/u--form";
-import UInput from "../../uni_modules/uview-ui/components/u--input/u--input";
-import UImage from "../../uni_modules/uview-ui/components/u--image/u--image";
+import config from '@/config'
 export default {
 export default {
-  components: {UImage, UInput, UForm, UButton},
   data(){
   data(){
     return {
     return {
       planTime:10,
       planTime:10,
@@ -640,6 +94,7 @@ export default {
       workMode:1,
       workMode:1,
       leftAppointmentTime:0,
       leftAppointmentTime:0,
       leftJianyaoTime:0,
       leftJianyaoTime:0,
+      imgUrl:"",
     }
     }
   },
   },
   onLoad: function(opt) {
   onLoad: function(opt) {
@@ -647,6 +102,7 @@ export default {
     // this.id = 61;
     // this.id = 61;
     this.connectMqtt();
     this.connectMqtt();
     this.getDetail();
     this.getDetail();
+    this.imgUrl = config.imgUrl
   },
   },
   destroyed() {
   destroyed() {
     // 取消订阅主题
     // 取消订阅主题
@@ -1828,6 +1284,8 @@ uni-col{
   background: white;
   background: white;
   padding:0px 20rpx;
   padding:0px 20rpx;
   position: relative;
   position: relative;
+  height: 100vh;
+  position: relative;
 
 
 }
 }
 .content {
 .content {

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 2105 - 0
pages/device/detail1.vue