xiaomeng
/
wszhyWx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xiaomeng:23974d3ca955a14a34bfbff66f070f48af8df08d
Branches Tags
xiaomeng:portal
xiaomeng:pc-master
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1
...
compare: xiaomeng:c2b346a609c8469abb5eb9c3ea192df6e409d710
Branches Tags
xiaomeng:portal
xiaomeng:pc-master
xiaomeng:wx-program
xiaomeng:mini-program
xiaomeng:fix
xiaomeng:master
xiaomeng:wxmaster
xiaomeng:main
xiaomeng:0.0.1

4 Commits
23974d3ca9 ... c2b346a609

Author SHA1 Message Date
xiaomeng c2b346a609 Merge pull request 'pc-master' (#175) from pc-master into portal 
Reviewed-on: #175
 2024-09-26 06:35:31 +00:00
sunmeng 087cd181a8 1 2024-09-26 14:24:49 +08:00
sunmeng b046acdac0 1 2024-09-26 14:20:45 +08:00
sunmeng 6e44d0b852 Revert "1" 
This reverts commit f2aac96998.
 2024-09-26 14:13:19 +08:00
15 changed files with 13 additions and 13 deletions
Show Stats Expand all files Collapse all files

BIN
src/assets/image/real-time-39.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
src/assets/image/real-time-40.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
src/assets/image/real-time-41.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
src/assets/image/real-time-47.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
src/assets/image/real-time-48.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
src/assets/image/real-time-54.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
src/assets/image/real-time-55.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 16 KiB

8
src/views/manage/deviceInfoManage.vue
View File

@ -96,7 +96,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-dialog :close-on-click-modal="false" title="提示" top="10vh" :visible.sync="addModel" width="700px" class="vrcode-model manage-model" <el-dialog title="提示" top="10vh" :visible.sync="addModel" width="700px" class="vrcode-model manage-model"
:append-to-body="true"> :append-to-body="true">
<div class="vrcode-model-title"> <div class="vrcode-model-title">
编辑 编辑
@ -144,7 +144,7 @@
</span> </span>
</el-dialog> </el-dialog>
<!-- 施肥机的修改名字 --> <!-- 施肥机的修改名字 -->
<el-dialog :close-on-click-modal="false" title="提示" top="10vh" :visible.sync="changeName" width="760px" class="vrcode-model manage-model" <el-dialog title="提示" top="10vh" :visible.sync="changeName" width="760px" class="vrcode-model manage-model"
:append-to-body="true"> :append-to-body="true">
<div class="vrcode-model-title"> <div class="vrcode-model-title">
修改更多名称 修改更多名称
@ -255,7 +255,7 @@
</span> </span>
</el-dialog> </el-dialog>
<!-- 控制器编辑 --> <!-- 控制器编辑 -->
<el-dialog :close-on-click-modal="false" title="提示" top="10vh" :visible.sync="addModel1" width="564px" class="vrcode-model manage-model" <el-dialog title="提示" top="10vh" :visible.sync="addModel1" width="564px" class="vrcode-model manage-model"
:append-to-body="true"> :append-to-body="true">
<div class="vrcode-model-title"> <div class="vrcode-model-title">
编辑 编辑
@ -306,7 +306,7 @@
</span> </span>
</el-dialog> </el-dialog>
<!-- 智能灌溉 --> <!-- 智能灌溉 -->
<el-dialog :close-on-click-modal="false" title="提示" top="10vh" :visible.sync="changeName1" width="760px" class="vrcode-model manage-model" <el-dialog title="提示" top="10vh" :visible.sync="changeName1" width="760px" class="vrcode-model manage-model"
:append-to-body="true"> :append-to-body="true">
<div class="vrcode-model-title"> <div class="vrcode-model-title">
修改更多名称 修改更多名称

4
src/views/manage/deviceManage.vue
View File

@ -55,7 +55,7 @@
</el-pagination> </el-pagination>
</div> </div>
<el-dialog :close-on-click-modal="false" title="控制器权限管理" :append-to-body="true" :visible.sync="roleModel" width="70%"> <el-dialog title="控制器权限管理" :append-to-body="true" :visible.sync="roleModel" width="70%">
<div class="model-title">控制器权限管理</div> <div class="model-title">控制器权限管理</div>
<div class="model-sel scroll"> <div class="model-sel scroll">
<div v-for="item, index in selDevicestatus" :key="index"> <div v-for="item, index in selDevicestatus" :key="index">
@ -69,7 +69,7 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog :close-on-click-modal="false" title="提示" top="10vh" :visible.sync="addModel1" width="564px" class="vrcode-model manage-model" <el-dialog title="提示" top="10vh" :visible.sync="addModel1" width="564px" class="vrcode-model manage-model"
:append-to-body="true"> :append-to-body="true">
<div class="vrcode-model-title"> <div class="vrcode-model-title">
添加设备 添加设备

2
src/views/manage/deviceSet.vue
View File

@ -38,7 +38,7 @@
</el-table> </el-table>
</div> </div>
<el-dialog title="提示" top="15vh" :visible.sync="addModel" width="564px" class="vrcode-model manage-model" <el-dialog title="提示" top="15vh" :visible.sync="addModel" width="564px" class="vrcode-model manage-model"
:append-to-body="true" :close-on-click-modal="false"> :append-to-body="true">
<div class="vrcode-model-title"> <div class="vrcode-model-title">
编辑 编辑
</div> </div>

2
src/views/manage/deviceStatusSet.vue
View File

@ -36,7 +36,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-dialog :close-on-click-modal="false" title="提示" top="15vh" :visible.sync="addModel" width="564px" class="vrcode-model manage-model" :append-to-body="true"> <el-dialog title="提示" top="15vh" :visible.sync="addModel" width="564px" class="vrcode-model manage-model" :append-to-body="true">
<div class="vrcode-model-title"> <div class="vrcode-model-title">
编辑 编辑
</div> </div>

2
src/views/manage/mobileControl.vue
View File

@ -42,7 +42,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-dialog :close-on-click-modal="false" title="提示" top="10vh" :visible.sync="addModel" width="564px" class="vrcode-model manage-model" <el-dialog title="提示" top="10vh" :visible.sync="addModel" width="564px" class="vrcode-model manage-model"
:append-to-body="true"> :append-to-body="true">
<div class="vrcode-model-title"> <div class="vrcode-model-title">
编辑 编辑

2
src/views/manage/userInfoControl.vue
View File

@ -43,7 +43,7 @@
layout="->,total, sizes, prev, pager, next, jumper" :total="total"> layout="->,total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination> </el-pagination>
</div> </div>
<el-dialog :close-on-click-modal="false" title="提示" top="10vh" :visible.sync="passwordModel" width="460px" class="vrcode-model manage-model" <el-dialog title="提示" top="10vh" :visible.sync="passwordModel" width="460px" class="vrcode-model manage-model"
:append-to-body="true"> :append-to-body="true">
<div class="vrcode-model-title"> <div class="vrcode-model-title">
修改密码 修改密码

2
src/views/manage/videoManage.vue
View File

@ -24,7 +24,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-dialog :close-on-click-modal="false" title="提示" top="10vh" :visible.sync="addModel" width="560px" class="vrcode-model manage-model" :append-to-body="true"> <el-dialog title="提示" top="10vh" :visible.sync="addModel" width="560px" class="vrcode-model manage-model" :append-to-body="true">
<div class="vrcode-model-title"> <div class="vrcode-model-title">
编辑 编辑
</div> </div>

2
src/views/manage/weatherData.vue
View File

@ -34,7 +34,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-dialog :close-on-click-modal="false" title="提示" top="10vh" :visible.sync="addModel" width="564px" class="vrcode-model manage-model" <el-dialog title="提示" top="10vh" :visible.sync="addModel" width="564px" class="vrcode-model manage-model"
:append-to-body="true"> :append-to-body="true">
<div class="vrcode-model-title"> <div class="vrcode-model-title">
{{ modelName }} {{ modelName }}