简柏林 / thingskit-app · Commits

Commit b8eaf498d5913ab2c93324f8081c3721042cc4b2

Authored by xp.Huang
2 parents 1ca0ecbc 88d19203

Merge branch 'sqy_dev' into 'main' 

提交更改的代码

See merge request huang/thingskit-app!45
Inline Side-by-side
Showing 8 changed files with 33 additions and 28 deletions
@@ -93,7 +93,7 @@ export default { @@ -93,7 +93,7 @@ export default {
93 background-color: #fff; 93 background-color: #fff;
94 color: #333; 94 color: #333;
95 border-radius: 20rpx; 95 border-radius: 20rpx;
96 - font-size: 30rpx; 96 + font-size: 15px;
97 margin-top: 30rpx; 97 margin-top: 30rpx;
98 padding: 30rpx; 98 padding: 30rpx;
99 } 99 }
@@ -108,11 +108,11 @@ export default { @@ -108,11 +108,11 @@ export default {
108 align-items: center; 108 align-items: center;
109 .detail-label { 109 .detail-label {
110 color: #333; 110 color: #333;
111 - font-size: 30rpx; 111 + font-size: 15px;
112 } 112 }
113 .detail-value { 113 .detail-value {
114 color: #666; 114 color: #666;
115 - font-size: 28rpx; 115 + font-size: 14px;
116 margin-left: 30rpx; 116 margin-left: 30rpx;
117 } 117 }
118 } 118 }
@@ -236,7 +236,7 @@ export default { @@ -236,7 +236,7 @@ export default {
236 .item { 236 .item {
237 padding: 30rpx; 237 padding: 30rpx;
238 view { 238 view {
239 - font-size: 28rpx; 239 + font-size: 14px;
240 margin-bottom: 10rpx; 240 margin-bottom: 10rpx;
241 } 241 }
242 .time { 242 .time {
@@ -247,7 +247,7 @@ export default { @@ -247,7 +247,7 @@ export default {
247 display: flex; 247 display: flex;
248 justify-content: space-between; 248 justify-content: space-between;
249 align-items: center; 249 align-items: center;
250 - font-size: 30rpx; 250 + font-size: 15px;
251 font-weight: 500; 251 font-weight: 500;
252 align-items: center; 252 align-items: center;
253 .item-right { 253 .item-right {
@@ -256,7 +256,7 @@ export default { @@ -256,7 +256,7 @@ export default {
256 align-items: center; 256 align-items: center;
257 width: 104rpx; 257 width: 104rpx;
258 height: 36rpx; 258 height: 36rpx;
259 - font-size: 20rpx; 259 + font-size: 10px;
260 border-radius: 20rpx; 260 border-radius: 20rpx;
261 } 261 }
262 .item-fail { 262 .item-fail {
@@ -276,7 +276,7 @@ export default { @@ -276,7 +276,7 @@ export default {
276 .filter-title { 276 .filter-title {
277 text-align: center; 277 text-align: center;
278 margin-top: 14px; 278 margin-top: 14px;
279 - font-size: 32rpx; 279 + font-size: 16px;
280 font-weight: 700; 280 font-weight: 700;
281 } 281 }
282 .button-group { 282 .button-group {
@@ -339,7 +339,7 @@ export default { @@ -339,7 +339,7 @@ export default {
339 339
340 <style lang="scss" scoped> 340 <style lang="scss" scoped>
341 .filter-button { 341 .filter-button {
342 - font-size: 24rpx; 342 + font-size: 12px;
343 width: 160rpx; 343 width: 160rpx;
344 height: 64rpx; 344 height: 64rpx;
345 border-radius: 32rpx; 345 border-radius: 32rpx;
@@ -366,7 +366,7 @@ export default { @@ -366,7 +366,7 @@ export default {
366 .item { 366 .item {
367 padding: 30rpx; 367 padding: 30rpx;
368 view { 368 view {
369 - font-size: 28rpx; 369 + font-size: 14px;
370 margin-bottom: 10rpx; 370 margin-bottom: 10rpx;
371 } 371 }
372 .time { 372 .time {
@@ -375,7 +375,7 @@ export default { @@ -375,7 +375,7 @@ export default {
375 .item-first { 375 .item-first {
376 display: flex; 376 display: flex;
377 justify-content: space-between; 377 justify-content: space-between;
378 - font-size: 30rpx; 378 + font-size: 15px;
379 font-weight: 500; 379 font-weight: 500;
380 align-items: center; 380 align-items: center;
381 .item-right { 381 .item-right {
@@ -397,7 +397,7 @@ export default { @@ -397,7 +397,7 @@ export default {
397 .filter-title { 397 .filter-title {
398 text-align: center; 398 text-align: center;
399 margin-top: 14px; 399 margin-top: 14px;
400 - font-size: 32rpx; 400 + font-size: 16px;
401 font-weight: 700; 401 font-weight: 700;
402 } 402 }
403 .button-group { 403 .button-group {
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 <view style="width: 100%; padding: 0 30rpx;"> 53 <view style="width: 100%; padding: 0 30rpx;">
54 <view style="text-align: center; font-weight:700;margin-bottom: 40rpx;">命令下发</view> 54 <view style="text-align: center; font-weight:700;margin-bottom: 40rpx;">命令下发</view>
55 <view class="u-flex"> 55 <view class="u-flex">
56 - <text style="color: #333; font-size: 28rpx;font-weight:700;margin-right: 30rpx;">下发类型:</text> 56 + <text style="color: #333; font-size: 14px;font-weight:700;margin-right: 30rpx;">下发类型:</text>
57 57
58 <u-radio-group v-model="commandType" placement="row"> 58 <u-radio-group v-model="commandType" placement="row">
59 <u-radio activeColor="#3388FF" label="OneWay" name="OneWay"></u-radio> 59 <u-radio activeColor="#3388FF" label="OneWay" name="OneWay"></u-radio>
@@ -172,11 +172,11 @@ export default { @@ -172,11 +172,11 @@ export default {
172 align-items: center; 172 align-items: center;
173 .detail-label { 173 .detail-label {
174 color: #333; 174 color: #333;
175 - font-size: 30rpx; 175 + font-size: 15px;
176 } 176 }
177 .detail-value { 177 .detail-value {
178 color: #666; 178 color: #666;
179 - font-size: 28rpx; 179 + font-size: 14px;
180 margin-left: 30rpx; 180 margin-left: 30rpx;
181 } 181 }
182 } 182 }
@@ -35,7 +35,7 @@ export default { @@ -35,7 +35,7 @@ export default {
35 display: flex; 35 display: flex;
36 justify-content: space-between; 36 justify-content: space-between;
37 color: #333; 37 color: #333;
38 - font-size: 32rpx; 38 + font-size: 16px;
39 font-family: PingFangSC-Medium, PingFang SC; 39 font-family: PingFangSC-Medium, PingFang SC;
40 font-weight: bold; 40 font-weight: bold;
41 .item-value { 41 .item-value {
@@ -44,7 +44,7 @@ export default { @@ -44,7 +44,7 @@ export default {
44 } 44 }
45 .item-time { 45 .item-time {
46 margin-top: 4rpx; 46 margin-top: 4rpx;
47 - font-size: 26rpx; 47 + font-size: 13px;
48 color: #999; 48 color: #999;
49 } 49 }
50 } 50 }
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 " 37 "
38 > 38 >
39 <view style="width: 450rpx; text-align: left"> 39 <view style="width: 450rpx; text-align: left">
40 - <text style="color: #333; font-size: 30rpx;font-weight: bold;">{{ item.name }}</text> 40 + <text style="color: #333; font-size: 15px;font-weight: bold;">{{ item.name }}</text>
41 </view> 41 </view>
42 <view style="width: 450rpx; text-align: left; margin-top: 10rpx"> 42 <view style="width: 450rpx; text-align: left; margin-top: 10rpx">
43 <view style="color: #666; font-size: 14px;display: flex;"> 43 <view style="color: #666; font-size: 14px;display: flex;">
@@ -194,6 +194,7 @@ export default { @@ -194,6 +194,7 @@ export default {
194 async onLoad(options) { 194 async onLoad(options) {
195 // 隐藏原生的tabbar 195 // 隐藏原生的tabbar
196 uni.hideTabBar(); 196 uni.hideTabBar();
  197 + this.page.num = 1;
197 const { deviceState } = options; 198 const { deviceState } = options;
198 this.deviceState = deviceState; 199 this.deviceState = deviceState;
199 if (deviceState) { 200 if (deviceState) {
@@ -371,7 +372,7 @@ export default { @@ -371,7 +372,7 @@ export default {
371 .filter-title { 372 .filter-title {
372 text-align: center; 373 text-align: center;
373 margin-top: 14px; 374 margin-top: 14px;
374 - font-size: 32rpx; 375 + font-size: 16px;
375 font-weight: 700; 376 font-weight: 700;
376 } 377 }
377 .button-group { 378 .button-group {
@@ -383,4 +384,4 @@ export default { @@ -383,4 +384,4 @@ export default {
383 } 384 }
384 } 385 }
385 } 386 }
386 -</style> 387 +</style>
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 <!-- 基础统计 --> 64 <!-- 基础统计 -->
65 <!-- 四宫格CSS最新网格布局--> 65 <!-- 四宫格CSS最新网格布局-->
66 <view class="grid-container"> 66 <view class="grid-container">
67 - <view class="grid-item"> 67 + <view class="grid-item" @click="showToastWip()">
68 <view class="item-center"> 68 <view class="item-center">
69 <view class="center"><image class="image" src="../../static/form.png"></image></view> 69 <view class="center"><image class="image" src="../../static/form.png"></image></view>
70 <view class="center-text"><text class="text text-muted">维修工单</text></view> 70 <view class="center-text"><text class="text text-muted">维修工单</text></view>
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 <view class="center-text"><text class="text text-muted" style="">摄像头管理</text></view> 76 <view class="center-text"><text class="text text-muted" style="">摄像头管理</text></view>
77 </view> 77 </view>
78 </view> 78 </view>
79 - <view class="grid-item"> 79 + <view class="grid-item" @click="showToastWip()">
80 <view class="item-center"> 80 <view class="item-center">
81 <view class="center"><image class="image" src="../../static/device.png"></image></view> 81 <view class="center"><image class="image" src="../../static/device.png"></image></view>
82 <view class="center-text"><text class="text text-muted">设备接入</text></view> 82 <view class="center-text"><text class="text text-muted">设备接入</text></view>
@@ -138,15 +138,21 @@ export default { @@ -138,15 +138,21 @@ export default {
138 } 138 }
139 }); 139 });
140 }, 140 },
  141 + showToastWip(){
  142 + uni.$u.toast('拼命开发中 ...')
  143 + },
141 openCamera() { 144 openCamera() {
142 - uni.navigateTo({  
143 - url: 'camera/camera'  
144 - }); 145 + // uni.navigateTo({
  146 + // url: 'camera/camera'
  147 + // });
  148 + this.showToastWip()
145 }, 149 },
146 openOrgStatus() { 150 openOrgStatus() {
147 // uni.navigateTo({ 151 // uni.navigateTo({
148 // url: 'configuration/configuration' 152 // url: 'configuration/configuration'
149 // }); 153 // });
  154 + this.showToastWip()
  155 +
150 }, 156 },
151 //告警状态查询 157 //告警状态查询
152 navigatorAlarmStatus(e) { 158 navigatorAlarmStatus(e) {
@@ -16,15 +16,13 @@ @@ -16,15 +16,13 @@
16 <view class="loginPhone"> 16 <view class="loginPhone">
17 <view class="form-row u-flex"> 17 <view class="form-row u-flex">
18 <view class="v-input"><input type="text" v-model="loginForm.username" maxlength="32" placeholder="请输入登录账号" /></view> 18 <view class="v-input"><input type="text" v-model="loginForm.username" maxlength="32" placeholder="请输入登录账号" /></view>
19 -  
20 <u-icon></u-icon> 19 <u-icon></u-icon>
21 </view> 20 </view>
22 21
23 <view class="form-row u-flex"> 22 <view class="form-row u-flex">
24 <view class="v-input"><input type="text" v-model="loginForm.password" maxlength="32" placeholder="请输入登录密码" :password="!showPassword" /></view> 23 <view class="v-input"><input type="text" v-model="loginForm.password" maxlength="32" placeholder="请输入登录密码" :password="!showPassword" /></view>
25 -  
26 - <view class="v-password" @click="showPasswordMode">  
27 - <u-icon color="#9a9a9a" width="18" height="15" :name="showPassword ? '/static/eye.png' : '/static/eye-hide.png'"></u-icon> 24 + <view class="v-password" style="padding: 30rpx;" @click="showPasswordMode">
  25 + <u-icon color="#9a9a9a" :name="showPassword ? '/static/eye.png' : '/static/eye-hide.png'"></u-icon>
28 </view> 26 </view>
29 27
30 <u-icon></u-icon> 28 <u-icon></u-icon>