bonus
/
SafetyAlertSystem-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
jjLv 2024-11-06 09:04:09 +08:00
parent 2ccca80cff
commit 0786c144c2
7 changed files with 205 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/TableModelTwo/index.vue
View File

@ -177,6 +177,9 @@
{{ scope.row[item.t_props] || '-' }}
</template>
</template>
<template #header>
<span style="color:red;">*</span>{{item.t_label}}
</template>
</el-table-column>
<el-table-column
align="center"
@ -388,6 +391,9 @@ export default {
this.dynamicWidth = this.getOperatorWidth()
},
methods: {
// getColumnLabel(item){
// return '<span style="color: red">*</span>' +item.t_label;
// },
/** 获取列表数据 */
async getTableList() {
if (this.queryParams.time && this.queryParams.time.length !== 0) {

76
src/views/base/device/components/form-device.vue
View File

@ -15,6 +15,7 @@
clearable
filterable
placeholder="请选择设备类型"
@change="deviceChange"
>
<el-option
v-for="item in deviceTypeRange"
@ -116,13 +117,13 @@ export default {
},
async mounted() {
this.open = true
await this.getRanges()
if (this.editParams) {
await Object.assign(this.deviceParams, this.editParams)
this.subSort = 2
} else {
this.subSort = 1
}
await this.getRanges()
this.open = false
},
data() {
@ -147,7 +148,7 @@ export default {
{
required: true,
message: '请选择设备类型',
trigger: 'change',
trigger: 'blur',
},
],
devName: [
@ -177,7 +178,7 @@ export default {
{
required: true,
message: '请选择预警配置',
trigger: 'change',
trigger: 'blur',
},
],
devStatus: [
@ -217,7 +218,7 @@ export default {
async getRanges() {
// 获取设备类型下拉选
const params = {'dictType': 'dev_type'}
const paramsTwo = {'isAll': 0}
let deviceTypeRes = await queryDeviceTypeApi(params)
this.deviceTypeRange = deviceTypeRes.data.map(item => {
return {
@ -225,7 +226,6 @@ export default {
value: item.dictCode+''
}
})
console.log(this.deviceTypeRange)
// 获取所属边带下拉选
let bdIdRes = await queryBdIdApi()
this.bdIdRange = bdIdRes.data.map(item => {
@ -234,14 +234,68 @@ export default {
value: item.id
}
})
// 获取预警配置下拉选
let configRes = await queryConfigApi(paramsTwo)
this.configRange = configRes.data.map(item => {
return {
label: item.configName+" "+item.typeName,
value: item.id,
if(this.subSort==1){
const paramsTwo = {'isAll': 0}
let configRes = await queryConfigApi(paramsTwo)
this.configRange = configRes.data.map((item) => {
return {
label: item.configName+" "+item.typeName,
value: item.id,
};
});
}
if(this.subSort==2){
console.log('this.deviceParams.devType',this.deviceParams.devType)
const paramsTwo = {'isAll': 0,'configuType':this.deviceParams.devType}
let configRes = await queryConfigApi(paramsTwo)
this.configRange = configRes.data.map((item) => {
return {
label: item.configName+" "+item.typeName,
value: item.id,
};
});
}
// // 获取预警配置下拉选
// let configRes = await queryConfigApi(paramsTwo)
// this.configRange = configRes.data.map(item => {
// return {
// label: item.configName+" "+item.typeName,
// value: item.id,
// }
// })
},
deviceChange(e){
console.log('e',e)
this.deviceTypeRange.forEach(item=>{
if (e === item.value) {
this.deviceParams.configId=null;
if(this.subSort==2){
const paramsTwo = {'isAll': 0,'configuType':e}
let configRes = queryConfigApi(paramsTwo).then(configRes=>{
this.configRange = configRes.data.map((item) => {
return {
label: item.configName+" "+item.typeName,
value: item.id,
};
});
})
}
if(this.subSort==1){
const paramsTwo = {'isAll': 0,'configuType': e}
let configRes = queryConfigApi(paramsTwo).then(configRes=>{
this.configRange = configRes.data.map((item) => {
return {
label: item.configName+" "+item.typeName,
value: item.id,
};
});
})
}
}
})
},
/** 改变树结构 */
changeTree(leaf) {

6
src/views/base/edgeInsert/components/form-insert.vue
View File

@ -79,7 +79,7 @@
</el-row>
</el-form>
<TableModel
<TableModelTwo
:columnsList="columnsListInsert"
ref="tableRef"
@transIdList="getIdList"
@ -125,7 +125,7 @@
placeholder="请输入"
></el-input>
</template>
</TableModel>
</TableModelTwo>
<div style="display: flex; justify-content: right">
<el-button type="success" @click="onSubmit">确认</el-button>
@ -312,7 +312,7 @@ export default {
}
if(this.subSort==2){
// 获取工程下拉选
let projRes = queryProjApi({
let projRes = await queryProjApi({
isAll: 0
}).then(projRes =>{
this.projRange = projRes.data.map((item) => {

138
src/views/base/warning/components/form-warning.vue
View File

@ -78,6 +78,19 @@
</el-form-item>
</el-col>
</el-form-item>
<el-form-item label="风速(m/s)" required>
<el-col :span="11">
<el-form-item prop="configVal6Min">
<el-input :maxlength="50" v-model="projectParams1.configVal6Min" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col style="display: flex; justify-content: center" class="line" :span="2">-</el-col>
<el-col :span="11">
<el-form-item prop="configVal6Max">
<el-input :maxlength="50" v-model="projectParams1.configVal6Max" placeholder="请输入" />
</el-form-item>
</el-col>
</el-form-item>
</el-form>
<!-- 表单 2 -->
<el-form
@ -291,6 +304,8 @@ export default {
configVal4Max: undefined, // PM2.5 max
configVal5Min: undefined, // PM10 min
configVal5Max: undefined, // PM10 max
configVal6Min: undefined, // 风速 min
configVal6Max: undefined, // 风速 max
},
projectParams2: {
configName: undefined, // 配置名称
@ -360,6 +375,10 @@ export default {
},
{
validator: (rule, value, callback) => {
const valueTemp = parseFloat(value);
if(valueTemp<this.projectParams1.configVal1Min){
return callback(new Error('不可小于最小值'));
}
if (value === '' || value === null) {
return callback(new Error('请正确输入温度阈值(小数点后最多保留两位)'));
}
@ -367,7 +386,6 @@ export default {
if(!regexTwo.test(value)){
return callback(new Error('请勿输入非数字'));
}
const valueTemp = parseFloat(value);
if(valueTemp.toString().includes('.')==true){
if (valueTemp.toString().split(".")[1].length>2) {
callback(new Error('请正确输入温度阈值(小数点后最多保留两位)'));
@ -426,6 +444,10 @@ export default {
},
{
validator: (rule, value, callback) => {
const valueTemp = parseFloat(value);
if(valueTemp<this.projectParams1.configVal2Min){
return callback(new Error('不可小于最小值'));
}
if (value === '' || value === null) {
return callback(new Error('请输入0~100内的数据且小数点后最多保留两位'));
}
@ -433,7 +455,6 @@ export default {
if(!regexTwo.test(value)){
return callback(new Error('请勿输入非数字'));
}
const valueTemp = parseFloat(value);
if(valueTemp.toString().includes('.')==true){
if (valueTemp < 0 || valueTemp > 100 ||valueTemp.toString().split(".")[1].length>2) {
callback(new Error('请输入0~100内的数据且小数点后最多保留两位'));
@ -492,6 +513,10 @@ export default {
},
{
validator: (rule, value, callback) => {
const valueTemp = parseFloat(value);
if(valueTemp<this.projectParams1.configVal3Min){
return callback(new Error('不可小于最小值'));
}
if (value === '' || value === null) {
return callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
}
@ -499,7 +524,6 @@ export default {
if(!regexTwo.test(value)){
return callback(new Error('请勿输入非数字'));
}
const valueTemp = parseFloat(value);
if(valueTemp.toString().includes('.')==true){
if (valueTemp < 0 ||valueTemp.toString().split(".")[1].length>2) {
callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
@ -558,6 +582,10 @@ export default {
},
{
validator: (rule, value, callback) => {
const valueTemp = parseFloat(value);
if(valueTemp<this.projectParams1.configVal4Min){
return callback(new Error('不可小于最小值'));
}
if (value === '' || value === null) {
return callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
}
@ -565,7 +593,7 @@ export default {
if(!regexTwo.test(value)){
return callback(new Error('请勿输入非数字'));
}
const valueTemp = parseFloat(value);
if(valueTemp.toString().includes('.')==true){
if (valueTemp < 0 ||valueTemp.toString().split(".")[1].length>2) {
callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
@ -622,6 +650,42 @@ export default {
message: '请输入PM10阈值',
trigger: 'blur',
},
{
validator: (rule, value, callback) => {
const valueTemp = parseFloat(value);
if(valueTemp<this.projectParams1.configVal5Min){
return callback(new Error('不可小于最小值'));
}
if (value === '' || value === null) {
return callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
}
const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
if(!regexTwo.test(value)){
return callback(new Error('请勿输入非数字'));
}
if(valueTemp.toString().includes('.')==true){
if (valueTemp < 0 ||valueTemp.toString().split(".")[1].length>2) {
callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
} else {
callback();
}
}else{
if (valueTemp < 0 ) {
callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
} else {
callback();
}
}
trigger: 'blur'
}
}
],
configVal6Min: [
{
required: true,
message: '请输入风速阈值',
trigger: 'blur',
},
{
validator: (rule, value, callback) => {
if (value === '' || value === null) {
@ -649,6 +713,42 @@ export default {
}
}
],
configVal6Max: [
{
required: true,
message: '请输入风速阈值',
trigger: 'blur',
},
{
validator: (rule, value, callback) => {
const valueTemp = parseFloat(value);
if(valueTemp<this.projectParams1.configVal6Min){
return callback(new Error('不可小于最小值'));
}
if (value === '' || value === null) {
return callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
}
const regexTwo = /^[+-]?(\d+(\.\d*)?|\.\d*[1-9]\d*)$/;
if(!regexTwo.test(value)){
return callback(new Error('请勿输入非数字'));
}
if(valueTemp.toString().includes('.')==true){
if (valueTemp < 0 ||valueTemp.toString().split(".")[1].length>2) {
callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
} else {
callback();
}
}else{
if (valueTemp < 0 ) {
callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
} else {
callback();
}
}
trigger: 'blur'
}
}
],
},
projectParams2Rules: {
configName: [
@ -700,6 +800,10 @@ export default {
},
{
validator: (rule, value, callback) => {
const valueTemp = parseFloat(value);
if(valueTemp<this.projectParams2.configVal1Min){
return callback(new Error('不可小于最小值'));
}
if (value === '' || value === null) {
return callback(new Error('请输入0~90内的数据且小数点后最多保留两位'));
}
@ -707,7 +811,6 @@ export default {
if(!regexTwo.test(value)){
return callback(new Error('请勿输入非数字'));
}
const valueTemp = parseFloat(value);
if(valueTemp.toString().includes('.')==true){
if (valueTemp < 0 || valueTemp > 90 ||valueTemp.toString().split(".")[1].length>2) {
callback(new Error('请输入0~90内的数据且小数点后最多保留两位'));
@ -776,6 +879,10 @@ export default {
},
{
validator: (rule, value, callback) => {
const valueTemp = parseFloat(value);
if(valueTemp<this.projectParams3.configVal1Min){
return callback(new Error('不可小于最小值'));
}
if (value === '' || value === null) {
return callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
}
@ -783,7 +890,6 @@ export default {
if(!regexTwo.test(value)){
return callback(new Error('请勿输入非数字'));
}
const valueTemp = parseFloat(value);
if(valueTemp.toString().includes('.')==true){
if (valueTemp < 0 ||valueTemp.toString().split(".")[1].length>2) {
callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
@ -852,6 +958,10 @@ export default {
},
{
validator: (rule, value, callback) => {
const valueTemp = parseFloat(value);
if(valueTemp<this.projectParams4.configVal1Min){
return callback(new Error('不可小于最小值'));
}
if (value === '' || value === null) {
return callback(new Error('请输入0~100内的数据且小数点后最多保留两位'));
}
@ -859,7 +969,6 @@ export default {
if(!regexTwo.test(value)){
return callback(new Error('请勿输入非数字'));
}
const valueTemp = parseFloat(value);
if(valueTemp.toString().includes('.')==true){
if (valueTemp < 0 || valueTemp > 100 ||valueTemp.toString().split(".")[1].length>2) {
callback(new Error('请输入0~100内的数据且小数点后最多保留两位'));
@ -918,6 +1027,10 @@ export default {
},
{
validator: (rule, value, callback) => {
const valueTemp = parseFloat(value);
if(valueTemp<this.projectParams4.configVal2Min){
return callback(new Error('不可小于最小值'));
}
if (value === '' || value === null) {
return callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
}
@ -925,7 +1038,6 @@ export default {
if(!regexTwo.test(value)){
return callback(new Error('请勿输入非数字'));
}
const valueTemp = parseFloat(value);
if(valueTemp.toString().includes('.')==true){
if (valueTemp < 0 ||valueTemp.toString().split(".")[1].length>2) {
callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
@ -984,6 +1096,10 @@ export default {
},
{
validator: (rule, value, callback) => {
const valueTemp = parseFloat(value);
if(valueTemp<this.projectParams4.configVal3Min){
return callback(new Error('不可小于最小值'));
}
if (value === '' || value === null) {
return callback(new Error('请输入0~100内的数据且小数点后最多保留两位'));
}
@ -991,7 +1107,6 @@ export default {
if(!regexTwo.test(value)){
return callback(new Error('请勿输入非数字'));
}
const valueTemp = parseFloat(value);
if(valueTemp.toString().includes('.')==true){
if (valueTemp < 0 || valueTemp > 100 ||valueTemp.toString().split(".")[1].length>2) {
callback(new Error('请输入0~100内的数据且小数点后最多保留两位'));
@ -1050,6 +1165,10 @@ export default {
},
{
validator: (rule, value, callback) => {
const valueTemp = parseFloat(value);
if(valueTemp<this.projectParams4.configVal4Min){
return callback(new Error('不可小于最小值'));
}
if (value === '' || value === null) {
return callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
}
@ -1057,7 +1176,6 @@ export default {
if(!regexTwo.test(value)){
return callback(new Error('请输入大于零的数据且小数点后最多保留两位'));
}
const valueTemp = parseFloat(value);
if(valueTemp.toString().includes('.')==true){
if (valueTemp < 0 ||valueTemp.toString().split(".")[1].length>2) {
callback(new Error('请输入大于零的数据且小数点后最多保留两位'));

1
src/views/base/warning/config.js
View File

@ -9,6 +9,7 @@ export const columnsList = [
{ t_props: 'configVal3Str', t_label: '噪声', },
{ t_props: 'configVal4Str', t_label: 'PM2.5', },
{ t_props: 'configVal5Str', t_label: 'PM10', },
{ t_props: 'configVal6Str', t_label: '风速', },
]
export const dialogConfig = {

1
src/views/base/warning/index.vue
View File

@ -100,6 +100,7 @@ export default {
{ t_props: 'configVal3Str', t_label: '噪声', },
{ t_props: 'configVal4Str', t_label: 'PM2.5', },
{ t_props: 'configVal5Str', t_label: 'PM10', },
{ t_props: 'configVal6Str', t_label: '风速', },
]
break;
case 117:

2
src/views/login1.vue
View File

@ -125,7 +125,7 @@
<router-link v-if="CONFIG.IS_OPEN_REGISTER" to="/register">
<el-link>注册账号</el-link>
</router-link>
<el-checkbox v-model="loginForm.rememberMe">记住密码</el-checkbox>
<!-- <el-checkbox v-model="loginForm.rememberMe">记住密码</el-checkbox> -->
</div>
<el-form-item style="width: 100%;">
<el-button v-if="!isAdmin"