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

1

pull/47/head^2
孙萌 2023-11-21 14:51:31 +08:00
parent b1ba00f9c2
commit 44c1c8e2fb
5 changed files with 87 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/assets/css/main.css
View File

@ -2248,6 +2248,30 @@
align-items: center;
}
.vrcode-textarea {
width: 100%;
margin-bottom: 15px;
}
.vrcode-textarea .title {
font-size: 16px;
font-family: Microsoft YaHei;
margin-bottom: 7px;
}
.vrcode-textarea textarea {
width: 680px;
height: 160px;
background: rgba(90, 210, 255, 0.25);
border: 2px solid rgba(86, 209, 255, 0.5);
padding: 15px;
color: #fff;
}
.vrcode-textarea textarea::placeholder {
color: #92B1D0;
}
.vrcode-table .vrcode-btn {
margin-bottom: 20px;
}
@ -2266,6 +2290,11 @@
text-align: center;
}
.vrcode-table .vrcode-table-view.table-view :empty::before {
content: '--';
color: #fff;
}
.vrcode-table .vrcode-table-view.table-view .el-table .warning-row {
background: rgba(0, 180, 255, 0.2);
}
@ -2706,7 +2735,7 @@
.vrcode-model .el-dialog__body .vrcode-content .vrcode-view {
width: 100%;
padding: 30px 0 15px 0;
padding: 20px 0 15px 0;
border-bottom: 1px solid rgba(0, 180, 255, 0.35);
display: flex;
align-items: center;

2
src/assets/css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

28
src/assets/css/main.scss
View File

@ -2397,6 +2397,27 @@
align-items: center;
}
.vrcode-textarea{
width: 100%;
margin-bottom: 15px;
.title{
font-size: 16px;
font-family: Microsoft YaHei;
margin-bottom:7px;
}
textarea{
width: 680px;
height: 160px;
background: rgba(90,210,255,0.25);
border: 2px solid rgba(86,209,255,0.5);
padding: 15px;
color: #fff;
&::placeholder{
color: #92B1D0;
}
}
}
.vrcode-table{
.vrcode-btn{
margin-bottom: 20px;
@ -2413,7 +2434,10 @@
text-align: center;
}
:empty::before{
content:'--';
color:#fff;
}
.el-table .warning-row {
background: rgba(0, 180, 255, 0.2);
}
@ -2849,7 +2873,7 @@ color: #FFFFFF;
.vrcode-view {
width: 100%;
padding: 30px 0 15px 0;
padding: 20px 0 15px 0;
border-bottom: 1px solid rgba(0, 180, 255, .35);
display: flex;
align-items: center;

14
src/views/page/sensorSet-con.vue
View File

@ -166,6 +166,11 @@ export default {
var num = (data - 400) / 10
return num
},
countType4(data) {
var num = (data - 1000) / 10
return num
},
//反向计算提交
sendCountType1(data) {
@ -181,7 +186,11 @@ export default {
var num = (data * 10) + 400
return num
},
sendCountType4(data) {
var num = (data* 10)+1000
return num
},
//类型选择
handleCommand(command) {
this.typeList.forEach((el, index) => {
@ -212,6 +221,9 @@ export default {
} else if (el.countType == 3) {
this.inputData[20904 + (i * 5 + 2)] = this.countType3(this.inputData[20904 + (i * 5 + 2)])
this.inputData[20904 + (i * 5 + 4)] = this.countType3(this.inputData[20904 + (i * 5 + 4)])
} else if (el.countType == 4) {
this.inputData[20904 + (i * 5 + 2)] = this.countType4(this.inputData[20904 + (i * 5 + 2)])
this.inputData[20904 + (i * 5 + 4)] = this.countType4(this.inputData[20904 + (i * 5 + 4)])
}
}
@ -391,6 +403,8 @@ export default {
number1 = this.sendCountType2(number)
} else if (el.countType == 3) {
number1 = this.sendCountType3(number)
} else if (el.countType == 4) {
number1 = this.sendCountType4(number)
}
}
})

28
src/views/vrcode/agricultural.vue
View File

@ -129,18 +129,9 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="vrcode-radio">
<div class="radio-name">是否追溯</div>
<div class="radio-sel">
<img v-if="modelisTrue" class="sel" src="../../assets/image/radio.png" alt="">
<div v-else @click="modelisTrue=true" class="no-sel"></div>
<span>是</span>
</div>
<div class="radio-sel">
<img v-if="!modelisTrue" class="sel" src="../../assets/image/radio.png" alt="">
<div v-else @click="modelisTrue=false" class="no-sel"></div>
<span>否</span>
</div>
<div class="vrcode-textarea">
<div class="title">备注</div>
<textarea placeholder="输入您的备注信息" name="" id="" cols="30" rows="10"></textarea>
</div>
<div class="vrcode-selimage">
<div class="title">工作图片</div>
@ -160,6 +151,19 @@
@change="handleImageChange" />
</div>
</div>
<div class="vrcode-radio">
<div class="radio-name">是否追溯</div>
<div class="radio-sel">
<img v-if="modelisTrue" class="sel" src="../../assets/image/radio.png" alt="">
<div v-else @click="modelisTrue=true" class="no-sel"></div>
<span>是</span>
</div>
<div class="radio-sel">
<img v-if="!modelisTrue" class="sel" src="../../assets/image/radio.png" alt="">
<div v-else @click="modelisTrue=false" class="no-sel"></div>
<span>否</span>
</div>
</div>
</div>
</div>
<span slot="footer" class="dialog-footer">