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

Reviewed-on: #94
portal
xiaomeng 2024-01-15 07:25:43 +00:00
commit b39b70c4db
5 changed files with 18 additions and 7 deletions

View File

@ -2693,6 +2693,13 @@
border: 2px solid rgba(0, 186, 255, 0.6); border: 2px solid rgba(0, 186, 255, 0.6);
} }
.vrcode-model .model-return-btn {
position: absolute;
right: 30px;
top: 30px;
z-index: 999;
}
.vrcode-model .vrcode-model-title { .vrcode-model .vrcode-model-title {
width: 100%; width: 100%;
height: 43px; height: 43px;

File diff suppressed because one or more lines are too long

View File

@ -2874,7 +2874,12 @@
} }
.vrcode-model { .vrcode-model {
.model-return-btn{
position: absolute;
right: 30px;
top: 30px;
z-index: 999;
}
.vrcode-model-title { .vrcode-model-title {
width: 100%; width: 100%;
height: 43px; height: 43px;

View File

@ -262,6 +262,7 @@
<el-dialog title="控制器短信报警规则" class="vrcode-model" top="5vh" :append-to-body="true" :visible.sync="warnModel" <el-dialog title="控制器短信报警规则" class="vrcode-model" top="5vh" :append-to-body="true" :visible.sync="warnModel"
width="1200px"> width="1200px">
<el-button class="model-return-btn" type="primary" @click="returnWarn"> </el-button>
<div class="vrcode-model-title vrcode-model-title-282">控制器短信报警规则</div> <div class="vrcode-model-title vrcode-model-title-282">控制器短信报警规则</div>
<div class="warning-model "> <div class="warning-model ">
<div class="title-tips">新建报警规则</div> <div class="title-tips">新建报警规则</div>
@ -355,9 +356,7 @@
</el-table> </el-table>
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="returnWarn"> </el-button>
</span>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>

View File

@ -11,13 +11,13 @@
<span></span> <span></span>
</div> </div>
<div class="input-main"> <div class="input-main">
<span>施肥机状况</span> <span>控制器状况</span>
<input v-model="inputData['1164']" disabled type="text" placeholder="0"> <input v-model="inputData['1164']" disabled type="text" placeholder="0">
<span></span> <span></span>
</div> </div>
<div class="input-main-80" style="width: auto;"> <div class="input-main-80" style="width: auto;">
<span>施肥机剩余使用时间</span> <span>控制器剩余使用时间</span>
<input v-model="inputData['1165']" disabled type="text" placeholder="0"> <input v-model="inputData['1165']" disabled type="text" placeholder="0">
<span></span> <span></span>
</div> </div>