Merge pull request '1' (#173) from pc-master into portal

Reviewed-on: #173
portal
xiaomeng 2024-09-13 07:52:44 +00:00
commit 67a2e0720e
8 changed files with 13 additions and 13 deletions

View File

@ -96,7 +96,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-dialog title="提示" top="10vh" :visible.sync="addModel" width="700px" class="vrcode-model manage-model" <el-dialog :close-on-click-modal="false" 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 title="提示" top="10vh" :visible.sync="changeName" width="760px" class="vrcode-model manage-model" <el-dialog :close-on-click-modal="false" 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 title="提示" top="10vh" :visible.sync="addModel1" width="564px" class="vrcode-model manage-model" <el-dialog :close-on-click-modal="false" 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 title="提示" top="10vh" :visible.sync="changeName1" width="760px" class="vrcode-model manage-model" <el-dialog :close-on-click-modal="false" 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">
修改更多名称 修改更多名称

View File

@ -55,7 +55,7 @@
</el-pagination> </el-pagination>
</div> </div>
<el-dialog title="控制器权限管理" :append-to-body="true" :visible.sync="roleModel" width="70%"> <el-dialog :close-on-click-modal="false" 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 title="提示" top="10vh" :visible.sync="addModel1" width="564px" class="vrcode-model manage-model" <el-dialog :close-on-click-modal="false" 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">
添加设备 添加设备

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"> :append-to-body="true" :close-on-click-modal="false">
<div class="vrcode-model-title"> <div class="vrcode-model-title">
编辑 编辑
</div> </div>

View File

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

View File

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

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 title="提示" top="10vh" :visible.sync="passwordModel" width="460px" class="vrcode-model manage-model" <el-dialog :close-on-click-modal="false" 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">
修改密码 修改密码
@ -72,7 +72,7 @@
<div class="vrcode-btn cancle-btn w-100" @click="passwordModel = false">取消</div> <div class="vrcode-btn cancle-btn w-100" @click="passwordModel = false">取消</div>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog title="提示" top="10vh" :visible.sync="addDeviceModel" width="460px" class="vrcode-model manage-model" <el-dialog title="提示" top="10vh" :visible.sync="addDeviceModel" width="460px" class="vrcode-model manage-model"
:append-to-body="true" :close-on-click-modal="false"> :append-to-body="true" :close-on-click-modal="false">
<div class="vrcode-model-title"> <div class="vrcode-model-title">
添加设备 添加设备

View File

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

View File

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