|
|
@@ -70,7 +70,11 @@
|
|
|
|
|
|
<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="summary" keyName="tabName" @change="getDeviceStatus"></u-tabs>-->
|
|
|
+
|
|
|
+ <u-tabs lineWidth="80" :activeStyle="{ color: '#3E9CFC' }" :list="summary" :current="current" keyName="tabName" @change="getNewDeviceStatus"></u-tabs>
|
|
|
+
|
|
|
+
|
|
|
<view>
|
|
|
<uni-row class="demo-uni-row">
|
|
|
<uni-col :span="12">
|
|
|
@@ -110,70 +114,317 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
-->
|
|
|
- <view class="demo-uni-row" v-if="deviceInfo.status == 3">
|
|
|
- <view span="12" style="width: 50vw; float: left;">
|
|
|
- <uni-card v-if="power.value > 0" extra="设备开关" thumbnail="/static/images/device/opened.png" @click="changeProp('PowerControl',0)">
|
|
|
- <text>已开启,点击图标关闭</text>
|
|
|
- <!-- <text>已开启</text>-->
|
|
|
- <!-- <u-image src="/static/images/device/opened.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
- </uni-card>
|
|
|
- <uni-card v-else extra="设备开关" thumbnail="/static/images/device/closed.png" @click="changeProp('PowerControl',1)">
|
|
|
- <text>已关闭,点击图标开启</text>
|
|
|
- <!-- <text>已关闭</text>-->
|
|
|
- <!-- <u-image src="/static/images/device/opened.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
- </uni-card>
|
|
|
+<!-- <view class="demo-uni-row" v-if="deviceInfo.status != 3">-->
|
|
|
+<!-- <view span="12" style="width: 50vw; float: left;">-->
|
|
|
+<!-- <uni-card v-if="power.value > 0" extra="设备开关" thumbnail="/static/images/device/opened.png" @click="changeProp('PowerControl',0)">-->
|
|
|
+<!-- <text>已开启,点击图标关闭</text>-->
|
|
|
+<!-- <!– <text>已开启</text>–>-->
|
|
|
+<!-- <!– <u-image src="/static/images/device/opened.png" width="200rpx" height="200rpx"></u-image>–>-->
|
|
|
+<!-- </uni-card>-->
|
|
|
+<!-- <uni-card v-else extra="设备开关" thumbnail="/static/images/device/closed.png" @click="changeProp('PowerControl',1)">-->
|
|
|
+<!-- <text>已关闭,点击图标开启</text>-->
|
|
|
+<!-- <!– <text>已关闭</text>–>-->
|
|
|
+<!-- <!– <u-image src="/static/images/device/opened.png" width="200rpx" height="200rpx"></u-image>–>-->
|
|
|
+<!-- </uni-card>-->
|
|
|
+<!-- </view>-->
|
|
|
+
|
|
|
+<!-- <view span="12" style="width: 50vw; float: left;">-->
|
|
|
+<!-- <uni-card v-if="lock.value > 0" extra="设备锁定" thumbnail="/static/images/device/locked.png" @click="changeProp('LockControl',0)" >-->
|
|
|
+<!-- <text>已上锁,点击图标解锁</text>-->
|
|
|
+<!-- <!– <text>已上锁</text>–>-->
|
|
|
+<!-- <!– <u-image src="/static/images/device/locked.png" width="200rpx" height="200rpx"></u-image>–>-->
|
|
|
+<!-- </uni-card>-->
|
|
|
+
|
|
|
+<!-- <uni-card v-else extra="设备锁定" thumbnail="/static/images/device/unlocked.png" @click="changeProp('LockControl',1)" >-->
|
|
|
+<!-- <text>未上锁,点击图标上锁</text>-->
|
|
|
+<!-- <!– <text>未上锁</text>–>-->
|
|
|
+<!-- <!– <u-image src="/static/images/device/locked.png" width="200rpx" height="200rpx"></u-image>–>-->
|
|
|
+<!-- </uni-card>-->
|
|
|
+<!-- </view>-->
|
|
|
+<!-- <view style="clear: both"></view>-->
|
|
|
+<!-- </view>-->
|
|
|
+
|
|
|
+ <!-- 煎药控制 -->
|
|
|
+ <view class="demo-uni-row" v-if="DecoctControlStatus">
|
|
|
+ <!-- 子tab -->
|
|
|
+ <view style="width:70%;margin:0 auto">
|
|
|
+ <u-tabs :list="subDecoctTabList" :current="subCurrent" @change="changeSub"></u-tabs>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <!-- 设备和锁定开关 -->
|
|
|
+ <view class="demo-uni-row clearfix">
|
|
|
+ <view span="12" style="width: 50vw; float: left;">
|
|
|
+ <uni-card v-if="power.value > 0" extra="设备开关" thumbnail="/static/images/device/opened.png" @click="changeProp('PowerControl',0)">
|
|
|
+ <text>已开启,点击图标关闭</text>
|
|
|
+ <!-- <text>已开启</text>-->
|
|
|
+ <!-- <u-image src="/static/images/device/opened.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
+ </uni-card>
|
|
|
+ <uni-card v-else extra="设备开关" thumbnail="/static/images/device/closed.png" @click="changeProp('PowerControl',1)">
|
|
|
+ <text>已关闭,点击图标开启</text>
|
|
|
+ <!-- <text>已关闭</text>-->
|
|
|
+ <!-- <u-image src="/static/images/device/opened.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
+ </uni-card>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view span="12" style="width: 50vw; float: left;">
|
|
|
+ <uni-card v-if="lock.value > 0" extra="设备锁定" thumbnail="/static/images/device/locked.png" @click="changeProp('LockControl',0)" >
|
|
|
+ <text>已上锁,点击图标解锁</text>
|
|
|
+ <!-- <text>已上锁</text>-->
|
|
|
+ <!-- <u-image src="/static/images/device/locked.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
+ </uni-card>
|
|
|
+
|
|
|
+ <uni-card v-else extra="设备锁定" thumbnail="/static/images/device/unlocked.png" @click="changeProp('LockControl',1)" >
|
|
|
+ <text>未上锁,点击图标上锁</text>
|
|
|
+ <!-- <text>未上锁</text>-->
|
|
|
+ <!-- <u-image src="/static/images/device/locked.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
+ </uni-card>
|
|
|
+ </view>
|
|
|
+ <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">
|
|
|
+ <text>温度设置</text>
|
|
|
+ <u-input placeholder="请输入"></u-input>
|
|
|
+ <view class="addTemperature">
|
|
|
+ <u-button class="addTemperatureBtn" @click="addTemperature"></u-button>
|
|
|
+<!-- <uni-icons custom-prefix="iconfont" type="icon-zengjia-huoyue" size="30"></uni-icons>-->
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="subTemperature">
|
|
|
+ <u-button class="subTemperatureBtn" @click="subTemperature"></u-button>
|
|
|
+<!-- <uni-icons custom-prefix="iconfont" type="icon-jianshao-huoyue" size="30"></uni-icons>-->
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <!-- 右边 -->
|
|
|
+ <view class="decoctControlTopRight">
|
|
|
+ <text>时间设置</text>
|
|
|
+ <u-input placeholder="请输入"></u-input>
|
|
|
+ <view class="addTime">
|
|
|
+ <u-button class="addTimeBtn"></u-button>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="subTime">
|
|
|
+ <u-button class="subTimeBtn"></u-button>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <!-- 下边部份 -->
|
|
|
+ <view class="decoctControlTop">
|
|
|
+ <!-- 左边 -->
|
|
|
+ <view class="decoctControlTopLeft">
|
|
|
+ <text>当前温度</text>
|
|
|
+ <u-input placeholder="请输入"></u-input>
|
|
|
+ <view class="addTemperature">
|
|
|
+ <u-button class="addTemperatureBtn"></u-button>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="subTime">
|
|
|
+ <u-button class="subTimeBtn"></u-button>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <!-- 右边 -->
|
|
|
+ <view class="decoctControlTopRight">
|
|
|
+ <text>高温时间</text>
|
|
|
+ <u-input placeholder="请输入"></u-input>
|
|
|
+ <view class="addTemperature">
|
|
|
+ <u-button class="addTemperatureBtn"></u-button>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="subTime">
|
|
|
+ <u-button class="subTimeBtn"></u-button>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
|
|
|
- <view span="12" style="width: 50vw; float: left;">
|
|
|
- <uni-card v-if="lock.value > 0" extra="设备锁定" thumbnail="/static/images/device/locked.png" @click="changeProp('LockControl',0)" >
|
|
|
- <text>已上锁,点击图标解锁</text>
|
|
|
- <!-- <text>已上锁</text>-->
|
|
|
- <!-- <u-image src="/static/images/device/locked.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
- </uni-card>
|
|
|
-
|
|
|
- <uni-card v-else extra="设备锁定" thumbnail="/static/images/device/unlocked.png" @click="changeProp('LockControl',1)" >
|
|
|
- <text>未上锁,点击图标上锁</text>
|
|
|
- <!-- <text>未上锁</text>-->
|
|
|
- <!-- <u-image src="/static/images/device/locked.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
- </uni-card>
|
|
|
+ <!-- 尾部 -->
|
|
|
+ <view>
|
|
|
+ <!-- 上边 -->
|
|
|
+ <view class="decoctControlBottom" >
|
|
|
+ <!-- 左边 -->
|
|
|
+ <view>
|
|
|
+ <text>开关状态</text>
|
|
|
+ </view>
|
|
|
+ <!-- 右边 -->
|
|
|
+ <view style="display: flex;align-items: center">
|
|
|
+ <text style="margin-right: 15px">已开机</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">煎药中</text>
|
|
|
+ <u-switch v-model="decoctControlStatus" @change="decoctControlChange"></u-switch>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
</view>
|
|
|
- <view style="clear: both"></view>
|
|
|
+
|
|
|
</view>
|
|
|
|
|
|
- <view class="demo-uni-row" v-if="deviceInfo.status != 3">
|
|
|
- <view span="12" style="width: 50vw; float: left;">
|
|
|
- <uni-card v-if="power.value > 0" extra="设备开关" thumbnail="/static/images/device/opened.png" @click="changeProp('PowerControl',0)">
|
|
|
- <text>已开启,点击图标关闭</text>
|
|
|
- <!-- <text>已开启</text>-->
|
|
|
- <!-- <u-image src="/static/images/device/opened.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
- </uni-card>
|
|
|
- <uni-card v-else extra="设备开关" thumbnail="/static/images/device/closed.png" @click="changeProp('PowerControl',1)">
|
|
|
- <text>已关闭,点击图标开启</text>
|
|
|
- <!-- <text>已关闭</text>-->
|
|
|
- <!-- <u-image src="/static/images/device/opened.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
- </uni-card>
|
|
|
+ <!-- 包装控制 -->
|
|
|
+ <view class="demo-uni-row" v-if="PackagControlStatus">
|
|
|
+
|
|
|
+ <view class="demo-uni-row clearfix">
|
|
|
+ <view span="12" style="width: 50vw; float: left;">
|
|
|
+ <uni-card v-if="power.value > 0" extra="设备开关" thumbnail="/static/images/device/opened.png" @click="changeProp('PowerControl',0)">
|
|
|
+ <text>已开启,点击图标关闭</text>
|
|
|
+ <!-- <text>已开启</text>-->
|
|
|
+ <!-- <u-image src="/static/images/device/opened.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
+ </uni-card>
|
|
|
+ <uni-card v-else extra="设备开关" thumbnail="/static/images/device/closed.png" @click="changeProp('PowerControl',1)">
|
|
|
+ <text>已关闭,点击图标开启</text>
|
|
|
+ <!-- <text>已关闭</text>-->
|
|
|
+ <!-- <u-image src="/static/images/device/opened.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
+ </uni-card>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view span="12" style="width: 50vw; float: left;">
|
|
|
+ <uni-card v-if="lock.value > 0" extra="设备锁定" thumbnail="/static/images/device/locked.png" @click="changeProp('LockControl',0)" >
|
|
|
+ <text>已上锁,点击图标解锁</text>
|
|
|
+ <!-- <text>已上锁</text>-->
|
|
|
+ <!-- <u-image src="/static/images/device/locked.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
+ </uni-card>
|
|
|
+
|
|
|
+ <uni-card v-else extra="设备锁定" thumbnail="/static/images/device/unlocked.png" @click="changeProp('LockControl',1)" >
|
|
|
+ <text>未上锁,点击图标上锁</text>
|
|
|
+ <!-- <text>未上锁</text>-->
|
|
|
+ <!-- <u-image src="/static/images/device/locked.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
+ </uni-card>
|
|
|
+ </view>
|
|
|
+ <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">
|
|
|
+ <text>封边温度</text>
|
|
|
+ <u-input placeholder="请输入"></u-input>
|
|
|
+ <view class="addTemperature">
|
|
|
+ <u-button class="addTemperatureBtn"></u-button>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="subTime">
|
|
|
+ <u-button class="subTimeBtn"></u-button>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <!-- 右边 -->
|
|
|
+ <view class="decoctControlTopRight">
|
|
|
+ <text>封口温度</text>
|
|
|
+ <u-input placeholder="请输入"></u-input>
|
|
|
+ <view class="addTemperature">
|
|
|
+ <u-button class="addTemperatureBtn"></u-button>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="subTime">
|
|
|
+ <u-button class="subTimeBtn"></u-button>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <!-- 下边部份 -->
|
|
|
+ <view class="decoctControlTop">
|
|
|
+ <!-- 左边 -->
|
|
|
+ <view class="decoctControlTopLeft">
|
|
|
+ <text>包装容量</text>
|
|
|
+ <u-input placeholder="请输入"></u-input>
|
|
|
+ <view class="addTemperature">
|
|
|
+ <u-button class="addTemperatureBtn"></u-button>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="subTime">
|
|
|
+ <u-button class="subTimeBtn"></u-button>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <!-- 右边 -->
|
|
|
+ <view style="width:40%;line-height: 2;text-align: center;margin: 0 15px;position: relative">
|
|
|
+ <text>包装数量</text>
|
|
|
+ <u-input placeholder="请输入"></u-input>
|
|
|
+ <view class="addTemperature">
|
|
|
+ <u-button class="addTemperatureBtn"></u-button>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <view class="subTime" >
|
|
|
+ <u-button class="subTimeBtn"></u-button>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
|
|
|
- <view span="12" style="width: 50vw; float: left;">
|
|
|
- <uni-card v-if="lock.value > 0" extra="设备锁定" thumbnail="/static/images/device/locked.png" @click="changeProp('LockControl',0)" >
|
|
|
- <text>已上锁,点击图标解锁</text>
|
|
|
- <!-- <text>已上锁</text>-->
|
|
|
- <!-- <u-image src="/static/images/device/locked.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
- </uni-card>
|
|
|
-
|
|
|
- <uni-card v-else extra="设备锁定" thumbnail="/static/images/device/unlocked.png" @click="changeProp('LockControl',1)" >
|
|
|
- <text>未上锁,点击图标上锁</text>
|
|
|
- <!-- <text>未上锁</text>-->
|
|
|
- <!-- <u-image src="/static/images/device/locked.png" width="200rpx" height="200rpx"></u-image>-->
|
|
|
- </uni-card>
|
|
|
+ <!-- 尾部 -->
|
|
|
+ <view>
|
|
|
+ <!-- 上边 -->
|
|
|
+ <view class="decoctControlBottom">
|
|
|
+ <!-- 左边 -->
|
|
|
+ <view>
|
|
|
+ <text>开关</text>
|
|
|
+ </view>
|
|
|
+ <!-- 右边 -->
|
|
|
+ <view style="display: flex;align-items: center">
|
|
|
+ <text style="margin-right: 15px">已开机</text>
|
|
|
+ <u-switch v-model="packageControlOnOffStatus" @change="packageControlOnOffChange"></u-switch>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
+ <!-- 下边 -->
|
|
|
+ <view class="decoctControlBottom">
|
|
|
+ <!-- 左边 -->
|
|
|
+ <view>
|
|
|
+ <text>模式</text>
|
|
|
+ </view>
|
|
|
+ <!-- 右边 -->
|
|
|
+ <view style="display: flex;align-items: center">
|
|
|
+ <text class="packageControlBottomRight">包装</text>
|
|
|
+ <text class="packageControlBottomClear">清洗</text>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
</view>
|
|
|
- <view style="clear: both"></view>
|
|
|
+
|
|
|
</view>
|
|
|
|
|
|
<view class="action-btn">
|
|
|
- <button @click="showDrawer" class="login-btn cu-btn block bg-blue lg round">查看更多属性</button>
|
|
|
+ <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')">
|
|
|
+ <uni-drawer ref="showLeft" :width="320" :maskClick="true" mode="left" @change="change($event,'showLeft')">
|
|
|
|
|
|
|
|
|
<!-- <view class="item" style="padding-top:10rpx">-->
|
|
|
@@ -336,6 +587,18 @@ export default {
|
|
|
components: {UImage, UInput, UForm, UButton},
|
|
|
data(){
|
|
|
return {
|
|
|
+ decoctControlStatus:true,
|
|
|
+ decoctControlOnOffStatus:true,
|
|
|
+ packageControlOnOffStatus:true,
|
|
|
+ subDecoctTabList:[
|
|
|
+ {name:'子煎药1'},
|
|
|
+ {name:'子煎药2'},
|
|
|
+ {name:'子煎药3'},
|
|
|
+ ],
|
|
|
+ DecoctControlStatus:true,
|
|
|
+ PackagControlStatus:false,
|
|
|
+ subCurrent:0,
|
|
|
+ current:0,
|
|
|
inputStyle:{height:'44rpx','fontSize':'20rpx'},
|
|
|
modelKey:['PowerControl','LockControl'],
|
|
|
power:{
|
|
|
@@ -353,7 +616,10 @@ export default {
|
|
|
value:"",
|
|
|
deviceInfo:{},
|
|
|
id:0,
|
|
|
- summary:[],
|
|
|
+ summary:[
|
|
|
+ {tabName:"煎药控制"},
|
|
|
+ {tabName:"包装控制"},
|
|
|
+ ],
|
|
|
activeName:0,
|
|
|
childId:"",
|
|
|
oneToMul:false,
|
|
|
@@ -381,6 +647,34 @@ export default {
|
|
|
clearTimeout(this.checkTimer);
|
|
|
},
|
|
|
methods:{
|
|
|
+ addTemperature(){
|
|
|
+ console.log("增加煎药温度")
|
|
|
+ },
|
|
|
+ subTemperature(){
|
|
|
+ console.log("减少煎药温度")
|
|
|
+ },
|
|
|
+ decoctControlChange(){
|
|
|
+ if(this.decoctControlStatus){
|
|
|
+ console.log("煎药打开")
|
|
|
+ }else{
|
|
|
+ console.log("煎药关闭")
|
|
|
+ }
|
|
|
+ },
|
|
|
+ decoctControlOnOffChange(){
|
|
|
+ if(this.decoctControlOnOffStatus){
|
|
|
+ console.log("煎药开关打开")
|
|
|
+ }else{
|
|
|
+ console.log("煎药开关关闭")
|
|
|
+ }
|
|
|
+ },
|
|
|
+ packageControlOnOffChange(){
|
|
|
+ if(this.packageControlOnOffStatus){
|
|
|
+ console.log("包装控制打开")
|
|
|
+ }else{
|
|
|
+ console.log("包装控制关闭")
|
|
|
+ }
|
|
|
+
|
|
|
+ },
|
|
|
// 抽屉状态发生变化触发
|
|
|
change(e, type) {
|
|
|
console.log(e);
|
|
|
@@ -563,7 +857,7 @@ export default {
|
|
|
latitude: self.deviceInfo.latitude,
|
|
|
longitude: self.deviceInfo.longitude};
|
|
|
self.sysDept = self.deviceInfo.sysDept;
|
|
|
- self.parseSummay(res.data.summary)
|
|
|
+ //self.parseSummay(res.data.summary)
|
|
|
self.mqttSubscribe(res.data);
|
|
|
self.getDeviceStatus();
|
|
|
self.seeTime();
|
|
|
@@ -576,7 +870,7 @@ export default {
|
|
|
this.childId = 0;
|
|
|
}else{
|
|
|
this.activeName = e.index;
|
|
|
- this.childId = this.summary[this.activeName].id;
|
|
|
+ //this.childId = this.summary[this.activeName].id;
|
|
|
}
|
|
|
getDeviceStatus(this.id,this.childId).then(res=>{
|
|
|
let data =res.data;
|
|
|
@@ -584,6 +878,36 @@ export default {
|
|
|
self.parseStatusData(data)
|
|
|
});
|
|
|
},
|
|
|
+ getNewDeviceStatus(item){
|
|
|
+ /*{
|
|
|
+ "tabName": "包装控制",
|
|
|
+ "rect": {
|
|
|
+ "id": "",
|
|
|
+ "dataset": {},
|
|
|
+ "left": 82,
|
|
|
+ "right": 164,
|
|
|
+ "top": 205,
|
|
|
+ "bottom": 249,
|
|
|
+ "width": 82,
|
|
|
+ "height": 44
|
|
|
+ },
|
|
|
+ "index": 1
|
|
|
+ }
|
|
|
+ */
|
|
|
+ if(item.index == 0){
|
|
|
+ this.DecoctControlStatus = true;
|
|
|
+ this.PackagControlStatus = false;
|
|
|
+ }
|
|
|
+
|
|
|
+ if(item.index == 1){
|
|
|
+ this.DecoctControlStatus = false;
|
|
|
+ this.PackagControlStatus = true;
|
|
|
+ }
|
|
|
+
|
|
|
+ },
|
|
|
+ changeSub(item){
|
|
|
+ console.log(item);
|
|
|
+ },
|
|
|
parseEnumList(){
|
|
|
let enumList = this.deviceInfo.enumList;
|
|
|
for (let enumListElement of enumList) {
|
|
|
@@ -1127,4 +1451,143 @@ input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{
|
|
|
color:#666;
|
|
|
font-size:12px;
|
|
|
}
|
|
|
+
|
|
|
+.clearfix::after {
|
|
|
+ content: "";
|
|
|
+ display: block;
|
|
|
+ clear: both;
|
|
|
+}
|
|
|
+.decoctControlHeader {
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ font-weight: 600;
|
|
|
+}
|
|
|
+.decoctControlTop {
|
|
|
+ display: flex;
|
|
|
+ height: 120px;
|
|
|
+ border-bottom:1px #B2B2B2 dotted;
|
|
|
+}
|
|
|
+.decoctControlTopLeft {
|
|
|
+ width:40%;
|
|
|
+ line-height: 2;
|
|
|
+ text-align: center;
|
|
|
+ margin: 0 15px;
|
|
|
+ position: relative;
|
|
|
+}
|
|
|
+.addTemperature {
|
|
|
+ border-radius:5px;
|
|
|
+ position:absolute;
|
|
|
+ background-color: dodgerblue;
|
|
|
+ color:white;
|
|
|
+ width: 30px;
|
|
|
+ height: 30px;
|
|
|
+ left:15px;
|
|
|
+ top:71px;
|
|
|
+}
|
|
|
+.addTemperatureBtn {
|
|
|
+ border-radius:10px;
|
|
|
+ position:absolute;
|
|
|
+ clip-path: polygon(50% 0,100% 100%,0 100%);
|
|
|
+ transform: scale(0.5);
|
|
|
+ left: 0;
|
|
|
+ top:0;
|
|
|
+ bottom: 0;
|
|
|
+ right: 0;
|
|
|
+ margin: auto;
|
|
|
+}
|
|
|
+.subTemperature {
|
|
|
+ border-radius:5px;
|
|
|
+ position:absolute;
|
|
|
+ background-color: dodgerblue;
|
|
|
+ color:white;
|
|
|
+ width: 30px;
|
|
|
+ height: 30px;
|
|
|
+ right:15px;
|
|
|
+ top:71px;
|
|
|
+ transform: rotate(180deg);
|
|
|
+}
|
|
|
+.subTemperatureBtn {
|
|
|
+ border-radius:10px;
|
|
|
+ position:absolute;
|
|
|
+ clip-path: polygon(50% 0,100% 100%,0 100%);
|
|
|
+ transform: scale(0.5);
|
|
|
+ left: 0;
|
|
|
+ top:0;
|
|
|
+ bottom: 0;
|
|
|
+ right: 0;
|
|
|
+ margin: auto;
|
|
|
+}
|
|
|
+.decoctControlTopRight {
|
|
|
+ width:40%;
|
|
|
+ line-height: 2;
|
|
|
+ text-align: center;
|
|
|
+ margin: 0 15px;
|
|
|
+ position: relative;
|
|
|
+}
|
|
|
+.decoctControlBottom {
|
|
|
+ border-bottom:1px #B2B2B2 dotted;
|
|
|
+ width:85vw;
|
|
|
+ margin:0 auto;
|
|
|
+ padding:10px;
|
|
|
+ display: flex;
|
|
|
+ justify-content:space-between;
|
|
|
+ align-items: center;
|
|
|
+}
|
|
|
+.addTime {
|
|
|
+ border-radius:5px;
|
|
|
+ position:absolute;
|
|
|
+ background-color: dodgerblue;
|
|
|
+ color:white;
|
|
|
+ width: 30px;
|
|
|
+ height: 30px;
|
|
|
+ left:15px;
|
|
|
+ top:71px;
|
|
|
+}
|
|
|
+.addTimeBtn {
|
|
|
+ border-radius:10px;
|
|
|
+ position:absolute;
|
|
|
+ clip-path: polygon(50% 0,100% 100%,0 100%);
|
|
|
+ transform: scale(0.5);
|
|
|
+ left: 0;
|
|
|
+ top:0;
|
|
|
+ bottom: 0;
|
|
|
+ right: 0;
|
|
|
+ margin: auto;
|
|
|
+}
|
|
|
+.subTime {
|
|
|
+ border-radius:5px;
|
|
|
+ position:absolute;
|
|
|
+ background-color: dodgerblue;
|
|
|
+ color:white;
|
|
|
+ width: 30px;
|
|
|
+ height: 30px;
|
|
|
+ right:15px;
|
|
|
+ top:71px;
|
|
|
+ transform: rotate(180deg);
|
|
|
+}
|
|
|
+.subTimeBtn {
|
|
|
+ border-radius:10px;
|
|
|
+ position:absolute;
|
|
|
+ clip-path: polygon(50% 0,100% 100%,0 100%);
|
|
|
+ transform: scale(0.5);
|
|
|
+ left: 0;
|
|
|
+ top:0;
|
|
|
+ bottom: 0;
|
|
|
+ right: 0;
|
|
|
+ margin: auto;
|
|
|
+}
|
|
|
+.packageControlBottomRight {
|
|
|
+ border-radius:5px;
|
|
|
+ padding:5px 10px;
|
|
|
+ margin-right: 15px;
|
|
|
+ background-color: #3c9cff;
|
|
|
+ color: #fff;
|
|
|
+}
|
|
|
+.packageControlBottomClear {
|
|
|
+ border-radius:5px;
|
|
|
+ padding:5px 10px;
|
|
|
+ background-color: #B2B2B2;
|
|
|
+ color: #fff;
|
|
|
+}
|
|
|
+
|
|
|
</style>
|
