图片修改

pages/device/detail.vue

@@ -7,12 +7,19 @@
           <u-button @click="reportError" color="#EC6D2F" text="上报异常" type="error" size="mini"></u-button>
         </view>
 
-        <view style="position: absolute;right:52rpx;top:116rpx;">
+        <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}}
 
@@ -27,7 +34,7 @@
         </view>
         <view class="prop-text">
           <text class="text-left">二维码ID：</text>
-          <text class="text-right">{{deviceInfo.qrcodeId}}</text>
+          <text class="text-right">{{deviceInfo.qrcodeId==null?"未绑定":deviceInfo.qrcodeId}}</text>
         </view>
 
 
@@ -75,31 +82,46 @@
                </uni-col>
              </uni-row>
 
-             <view class="prop-item">
-               <view class="prop-item-left">开机</view>
-               <view class="prop-item-right"> <u-switch inactiveColor="lightgray" activeColor="rgb(96,195,113)" v-model="power.value" :loading ="power.loading" @change="changeProp('PowerControl')"></u-switch>
+             <view v-if="deviceInfo.status == 3">
+               <view class="prop-item">
+                 <view class="prop-item-left">开机</view>
+                 <view class="prop-item-right"> <u-switch inactiveColor="lightgray" activeColor="rgb(96,195,113)" v-model="power.value" :loading ="power.loading" @change="changeProp('PowerControl')"></u-switch>
+                 </view>
+               </view>
+               <view class="prop-item">
+                 <view class="prop-item-left">锁定</view>
+                 <view class="prop-item-right">
+                   <u-switch inactiveColor="lightgray" activeColor="rgb(96,195,113)" v-model="lock.value" :loading ="lock.loading" @change="changeProp('LockControl')"></u-switch>
+                 </view>
                </view>
              </view>
-             <view class="prop-item">
-               <view class="prop-item-left">锁定</view>
-               <view class="prop-item-right">
-                 <u-switch inactiveColor="lightgray" activeColor="rgb(96,195,113)" v-model="lock.value" :loading ="lock.loading" @change="changeProp('LockControl')"></u-switch>
+             <view v-if="deviceInfo.status != 3">
+               <view class="prop-item">
+                 <view class="prop-item-left">开机</view>
+                 <view class="prop-item-right"> <u-switch inactiveColor="lightgray" activeColor="rgb(96,195,113)" value="0" :loading ="power.loading" @change="changeProp('PowerControl')"></u-switch>
+                 </view>
+               </view>
+               <view class="prop-item">
+                 <view class="prop-item-left">锁定</view>
+                 <view class="prop-item-right">
+                   <u-switch inactiveColor="lightgray" activeColor="rgb(96,195,113)" value="0" :loading ="lock.loading" @change="changeProp('LockControl')"></u-switch>
+                 </view>
                </view>
              </view>
              <view v-for="item in inputProp"  v-if="checkCommonProp(item)">
                <view class="prop-item">
                  <view class="prop-item-left">{{item.name}}</view>
                  <view class="prop-item-right">
-                   <view v-if="item.type === 'integer'" style="width:240rpx;position: absolute;left: -260rpx;top: -10rpx;">
-                     <u-input placeholder="请输入整数"   v-model="item.shadow">
+                   <view v-if="item.type === 'integer'" style="width:240rpx;position: absolute;left: -260rpx;top: 10rpx;;">
+                     <u-input :customStyle="inputStyle" fontSize="20rpx"  placeholder="请输入整数"   v-model="item.shadow">
                      </u-input>
                    </view>
                    <view style="padding:0 10rpx;width:260rpx;position: absolute;left: -270rpx;top: -10rpx;" v-if="item.type === 'string'">
-                     <u-input  placeholder="请输入字符串"  v-model="item.shadow">
+                     <u-input :customStyle="inputStyle" fontSize="20rpx"  placeholder="请输入字符串"  v-model="item.shadow">
                      </u-input>
                    </view>
                    <view style="padding:0 10rpx;width:260rpx;position: absolute;left: -270rpx;top: -10rpx;" v-if="item.type === 'array'">
-                     <u-input  placeholder="请使用英文逗号分隔的字符串"  v-model="item.shadow">
+                     <u-input :customStyle="inputStyle" fontSize="20rpx" placeholder="请使用英文逗号分隔的字符串"  v-model="item.shadow">
                      </u-input>
                    </view>
                    <view style="padding:0 10rpx;position: absolute;left: -300rpx;top: -10rpx;" v-if="item.type === 'enum'">
@@ -115,7 +137,7 @@
                      </u-cell>
 
                    </view>
-                   <view class="item" style="padding-top:14rpx">
+                   <view class="item" style="padding-top:10rpx">
                      <u-button v-if="deviceInfo.status==3"
                                @tap="send(item)"
                                text="发送"
@@ -382,6 +404,7 @@ export default {
   components: {UImage, UInput, UForm, UButton},
   data(){
       return {
+        inputStyle:{height:'44rpx','fontSize':'20rpx'},
         modelKey:['PowerControl','LockControl'],
         power:{
           loading:true,
@@ -1011,7 +1034,7 @@ export default {
 
 }
 .prop-card{
-  width: 29%;
+  width: 28%;
   height: 100rpx;
   text-align: center;
   display: inline-block;
@@ -1062,4 +1085,8 @@ export default {
   right:10rpx;
   top:10rpx;
 }
+input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{
+  color:#666;
+  font-size:12px;
+}
 </style>

pages/mine/index.vue

@@ -1,32 +1,32 @@
 <template>
   <view class="mine-container" :style="{height: `${windowHeight}px`}">
     <!--顶部个人信息栏-->
-    <view class="header-section">
+    <view class="header-section" style="position: relative">
       <view class="flex padding justify-between">
         <view class="flex align-center">
           <view v-if="!avatar" class="cu-avatar xl round bg-white">
             <view class="iconfont icon-people text-gray icon"></view>
           </view>
-          <image v-if="avatar" @click="handleToAvatar" :src="avatar" class="cu-avatar xl round" mode="widthFix">
+          <image style="position: relative;top:24rpx;" v-if="avatar" @click="handleToAvatar" :src="avatar" class="cu-avatar xl round" mode="widthFix">
           </image>
 
           <view v-if="!name" @click="handleToLogin" class="login-tip">
             点击登录
           </view>
           <view v-if="name" @click="handleToInfo" class="user-info">
-            <view class="u_title">
+            <view class="u_title" style="font-size: 32rpx">
               用户名：{{ name }}
             </view>
           </view>
         </view>
-        <view @click="handleToInfo" class="flex align-center">
-          <text>个人信息</text>
+        <view @click="handleToInfo" class="flex align-center" style="width: 180rpx;position: absolute;right:-6rpx;top:130rpx;">
+          <text sytle="font-size:24rpx">个人信息</text>
           <view class="iconfont icon-right"></view>
         </view>
 
       </view>
-      <view v-if="user != null"  class="login-tip" style="text-align: left;padding-left:164rpx">
-        {{ user.dept.deptName }}
+      <view v-if="user != null"  style="position: absolute;bottom: 80rpx;text-align: left;padding-left:184rpx;font-size: 32rpx">
+        单&nbsp;&nbsp;&nbsp;&nbsp;位：{{ user.dept.deptName }}
       </view>
     </view>
 
@@ -63,12 +63,12 @@
 <!--            <view>常见问题</view>-->
 <!--          </view>-->
 <!--        </view>-->
-        <view class="list-cell list-cell-arrow" @click="handleAbout">
-          <view class="menu-item-box">
-            <view class="iconfont icon-aixin menu-icon"></view>
-            <view>关于我们</view>
-          </view>
-        </view>
+<!--        <view class="list-cell list-cell-arrow" @click="handleAbout">-->
+<!--          <view class="menu-item-box">-->
+<!--            <view class="iconfont icon-aixin menu-icon"></view>-->
+<!--            <view>关于我们</view>-->
+<!--          </view>-->
+<!--        </view>-->
         <view class="list-cell list-cell-arrow" @click="handleToSetting">
           <view class="menu-item-box">
             <view class="iconfont icon-setting menu-icon"></view>

pages/work/index.vue

@@ -1,18 +1,20 @@
 <template>
   <view class="work-container">
     <!-- 轮播图 -->
+  <view style="padding:0 26rpx;">
     <uni-swiper-dot class="uni-swiper-dot-box" :info="data" :current="current" field="content">
       <swiper class="swiper-box" :current="swiperDotIndex" @change="changeSwiper">
         <swiper-item v-for="(item, index) in data" :key="index">
           <view class="swiper-item" @click="clickBannerItem(item)">
-            <image :src="item.image" mode="aspectFill" :draggable="false" />
+            <image :src="item.image" mode="aspectFill" :draggable="false" style="border-radius: 12rpx" />
           </view>
         </swiper-item>
       </swiper>
     </uni-swiper-dot>
+  </view>
     <view style="box-sizing: border-box;margin-top:20rpx;padding:0 20rpx">
 
-      <view class="grid-item-box" v-if="hasRole(['admin'])" @click="goPage('user')" style="background-image: url('/static/images/icons/bg.png');background-size: 100% 100%">
+      <view class="grid-item-box" v-if="hasRole(['admin'])" @click="goPage('user')" style="background-image: url('https://hyscancode.oss-cn-hangzhou.aliyuncs.com/jianyaoji/images/icons/bg.png');background-size: 100% 100%">
         <view class="grid-image">
           <u-image :showLoading="true" src="/static/images/icons/user.png" width="80rpx" height="80rpx" ></u-image>
         </view>
@@ -22,7 +24,7 @@
         </view>
       </view>
 
-      <view class="grid-item-box" v-if="isCompanyUser()" @click="goPage('deptuser')" style="background-image: url('/static/images/icons/bg.png');background-size: 100% 100%">
+      <view class="grid-item-box" v-if="isCompanyUser()" @click="goPage('deptuser')" style="background-image: url('https://hyscancode.oss-cn-hangzhou.aliyuncs.com/jianyaoji/images/icons/bg.png');background-size: 100% 100%">
           <view class="grid-image">
             <u-image :showLoading="true" src="/static/images/icons/user.png" width="80rpx" height="80rpx" ></u-image>
           </view>
@@ -32,7 +34,7 @@
           </view>
       </view>
 
-      <view class="grid-item-box" v-if="isCompanyUser()" @click="goPage('device')"  style="background-image: url('/static/images/icons/bg.png');background-size: 100% 100%">
+      <view class="grid-item-box" v-if="isCompanyUser()" @click="goPage('device')"  style="background-image: url('https://hyscancode.oss-cn-hangzhou.aliyuncs.com/jianyaoji/images/icons/bg.png');background-size: 100% 100%">
         <view class="grid-image">
           <u-image :showLoading="true" src="/static/images/icons/device.png" width="80rpx" height="80rpx" ></u-image>
         </view>
@@ -43,7 +45,7 @@
       </view>
 
 
-      <view class="grid-item-box" @click="goPage('wifi')"  style="background-image: url('/static/images/icons/bg.png');background-size: 100% 100%">
+      <view class="grid-item-box" @click="goPage('wifi')"  style="background-image: url('https://hyscancode.oss-cn-hangzhou.aliyuncs.com/jianyaoji/images/icons/bg.png');background-size: 100% 100%">
         <view class="grid-image">
           <u-image :showLoading="true" src="/static/images/icons/wifi.png" width="80rpx" height="80rpx" ></u-image>
         </view>
@@ -53,7 +55,7 @@
         </view>
       </view>
 
-      <view class="grid-item-box" v-if="isCompanyUser()" @click="scanCode()"  style="background-image: url('/static/images/icons/bg.png');background-size: 100% 100%">
+      <view class="grid-item-box" v-if="isCompanyUser()" @click="scanCode()"  style="background-image: url('https://hyscancode.oss-cn-hangzhou.aliyuncs.com/jianyaoji/images/icons/bg.png');background-size: 100% 100%">
         <view class="grid-image">
           <u-image :showLoading="true" src="/static/images/icons/bind.png" width="80rpx" height="80rpx" ></u-image>
         </view>
@@ -64,7 +66,7 @@
       </view>
 
 
-      <view class="grid-item-box" v-if="hasRole(['admin'])" @click="goPage('scan')"  style="background-image: url('/static/images/icons/bg.png');background-size: 100% 100%">
+      <view class="grid-item-box" v-if="hasRole(['admin'])" @click="goPage('scan')"  style="background-image: url('https://hyscancode.oss-cn-hangzhou.aliyuncs.com/jianyaoji/images/icons/bg.png');background-size: 100% 100%">
         <view class="grid-image">
           <u-image :showLoading="true" src="/static/images/icons/bind.png" width="80rpx" height="80rpx" ></u-image>
         </view>
@@ -75,7 +77,7 @@
       </view>
 
 
-      <view class="grid-item-box" @click="watchDevice"  style="background-image: url('/static/images/icons/bg.png');background-size: 100% 100%">
+      <view class="grid-item-box" @click="watchDevice"  style="background-image: url('https://hyscancode.oss-cn-hangzhou.aliyuncs.com/jianyaoji/images/icons/bg.png');background-size: 100% 100%">
         <view class="grid-image">
           <u-image :showLoading="true" src="/static/images/icons/scan.png" width="80rpx" height="80rpx" ></u-image>
         </view>
@@ -86,7 +88,7 @@
       </view>
 
 
-      <view class="grid-item-box" v-if="isCompanyUser()" @click="goPage('alert')"  style="background-image: url('/static/images/icons/bg.png');background-size: 100% 100%">
+      <view class="grid-item-box" v-if="isCompanyUser()" @click="goPage('alert')"  style="background-image: url('https://hyscancode.oss-cn-hangzhou.aliyuncs.com/jianyaoji/images/icons/bg.png');background-size: 100% 100%">
         <view class="grid-image">
           <u-image :showLoading="true" src="/static/images/icons/alert.png" width="80rpx" height="80rpx" ></u-image>
         </view>
@@ -97,7 +99,7 @@
       </view>
 
 
-      <view class="grid-item-box" v-if="isCompanyUser()" @click="goPage('alert')"  style="background-image: url('/static/images/icons/bg.png');background-size: 100% 100%">
+      <view class="grid-item-box" v-if="isCompanyUser()" @click="goPage('alert')"  style="background-image: url('https://hyscancode.oss-cn-hangzhou.aliyuncs.com/jianyaoji/images/icons/bg.png');background-size: 100% 100%">
         <view class="grid-image">
           <u-image :showLoading="true" src="/static/images/icons/error.png" width="80rpx" height="80rpx" ></u-image>
         </view>
@@ -107,7 +109,7 @@
         </view>
       </view>
 
-      <view class="grid-item-box" @click="goPage('reset')" v-if="hasRole(['admin'])"  style="background-image: url('/static/images/icons/bg.png');background-size: 100% 100%">
+      <view class="grid-item-box" @click="goPage('reset')" v-if="hasRole(['admin'])"  style="background-image: url('https://hyscancode.oss-cn-hangzhou.aliyuncs.com/jianyaoji/images/icons/bg.png');background-size: 100% 100%">
         <view class="grid-image">
           <u-image :showLoading="true" src="/static/images/icons/reset.png" width="80rpx" height="80rpx" ></u-image>
         </view>
@@ -118,7 +120,7 @@
       </view>
 
 
-      <view class="grid-item-box" @click="goPage('time')"  style="background-image: url('/static/images/icons/bg.png');background-size: 100% 100%">
+      <view class="grid-item-box" @click="goPage('time')"  style="background-image: url('https://hyscancode.oss-cn-hangzhou.aliyuncs.com/jianyaoji/images/icons/bg.png');background-size: 100% 100%">
         <view class="grid-image">
           <u-image :showLoading="true" src="/static/images/icons/rank.png" width="80rpx" height="80rpx" ></u-image>
         </view>
@@ -159,7 +161,7 @@ export default {
         show:false,
         scanDevice:{},
         data: [{
-            image: '/static/images/banner/banner01.jpg'
+            image: '/static/images/banner/banner01.png'
           },
           // {
           //   image: '/static/images/banner/banner02.jpg'