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

bug修复

This commit is contained in:
jjLv 2024-09-23 14:43:32 +08:00
parent ac0db8a9d2
commit 55c8edbd5b
6 changed files with 52 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,10 +26,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备名称" prop="devName"> <el-form-item label="设备名称" prop="devName">
<el-input v-model="deviceParams.devName" :maxlength="15" placeholder="请输入" /> <el-input v-model="deviceParams.devName" :maxlength="15" placeholder="请输入设备名称" />
</el-form-item> </el-form-item>
<el-form-item label="设备编码" prop="devCode"> <el-form-item label="设备编码" prop="devCode">
<el-input v-model="deviceParams.devCode" :maxlength="15" placeholder="请输入" /> <el-input v-model="deviceParams.devCode" :maxlength="15" placeholder="请输入设备编码" />
</el-form-item> </el-form-item>
<el-form-item label="所属边带" prop="bdId"> <el-form-item label="所属边带" prop="bdId">
@ -83,7 +83,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item style="display: flex; justify-content: right">
<el-button type="success" @click="onSubmit">确认</el-button> <el-button type="success" @click="onSubmit">确认</el-button>
<el-button <el-button
@click=" @click="

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

@ -2,6 +2,7 @@
<!-- 工程管理 新增、编辑 表单组件 --> <!-- 工程管理 新增、编辑 表单组件 -->
<div> <div>
<el-form <el-form
v-loading="open"
label-width="100px" label-width="100px"
size="medium" size="medium"
ref="projectParamsRef" ref="projectParamsRef"
@ -114,10 +115,25 @@
</el-row> </el-row>
</el-form> </el-form>
<!-- <div style="display: flex; justify-content: right"> <!-- <div style="display: flex; justify-content: right">
<el-button type="danger" @click="onReturn">驳回</el-button> <el-button type="danger" @click="onReturn">驳回</el-button>
<el-button type="success" @click="onSubmit">同意</el-button> <el-button type="success" @click="onSubmit">同意</el-button> -->
</div>--> <!-- <el-button
@click="
() => {
this.$emit('closeDialog')
}
"
>驳回</el-button -->
<!-- </div> -->
<div style="display: flex; justify-content: right">
<el-button type="success"
@click="
() => {
this.$emit('closeDialogAll')
}
">确定</el-button>
</div>
</div> </div>
</template> </template>
@ -142,16 +158,17 @@ export default {
}, },
components: {}, components: {},
created() { created() {
this.getRanges(); // this.getRanges();
}, },
mounted() { async mounted() {
console.log(this.editParams); this.open = true;
await this.getRanges();
if (this.editParams) { if (this.editParams) {
Object.assign(this.projectParams, this.editParams); await Object.assign(this.projectParams, this.editParams);
// this.projectParams.auditUserName = this.editParams.auditUserName // this.projectParams.auditUserName = this.editParams.auditUserName
// this.projectParams.remarks = '' // this.projectParams.remarks = ''
// 查询所属设备 // 查询所属设备
queryEdgeDeviceByIdApi(this.editParams.id) await queryEdgeDeviceByIdApi(this.editParams.id)
.then((res) => { .then((res) => {
console.log(res, "列表数据---"); console.log(res, "列表数据---");
res.rows.forEach((item) => { res.rows.forEach((item) => {
@ -166,10 +183,12 @@ export default {
} else { } else {
this.subSort = 1; this.subSort = 1;
} }
this.open = false;
}, },
data() { data() {
return { return {
columnsListInsertTwo, columnsListInsertTwo,
open: false,
exportList: [], exportList: [],
subSort: "", // 提交类型：新增 1 / 修改 2 subSort: "", // 提交类型：新增 1 / 修改 2
projectParams: { projectParams: {

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

@ -2,6 +2,7 @@
<!-- 工程管理 新增、编辑 表单组件 --> <!-- 工程管理 新增、编辑 表单组件 -->
<div> <div>
<el-form <el-form
v-loading="open"
label-width="100px" label-width="100px"
size="medium" size="medium"
ref="projectParamsRef" ref="projectParamsRef"
@ -127,15 +128,16 @@ export default {
}, },
components: {}, components: {},
created() { created() {
this.getRanges(); // this.getRanges();
}, },
mounted() { async mounted() {
console.log(this.editParams); this.open = true
await this.getRanges();
if (this.editParams) { if (this.editParams) {
Object.assign(this.projectParams, this.editParams); await Object.assign(this.projectParams, this.editParams);
this.projectParams.remarks = ""; this.projectParams.remarks = "";
// 查询所属设备 // 查询所属设备
queryEdgeDeviceByIdApi(this.editParams.id) await queryEdgeDeviceByIdApi(this.editParams.id)
.then((res) => { .then((res) => {
res.rows.forEach((item) => { res.rows.forEach((item) => {
this.$refs.tableRef.tableList.unshift(item); this.$refs.tableRef.tableList.unshift(item);
@ -148,10 +150,12 @@ export default {
} else { } else {
this.subSort = 1; this.subSort = 1;
} }
this.open = false
}, },
data() { data() {
return { return {
columnsListInsertTwo, columnsListInsertTwo,
open: false,
exportList: [], exportList: [],
subSort: "", // 提交类型：新增 1 / 修改 2 subSort: "", // 提交类型：新增 1 / 修改 2
projectParams: { projectParams: {

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

@ -2,6 +2,7 @@
<!-- 工程管理 新增、编辑 表单组件 --> <!-- 工程管理 新增、编辑 表单组件 -->
<div> <div>
<el-form <el-form
v-loading="open"
label-width="100px" label-width="100px"
size="medium" size="medium"
ref="projectParamsRef" ref="projectParamsRef"
@ -145,14 +146,15 @@ export default {
}, },
components: {}, components: {},
created() { created() {
this.getRanges(); // this.getRanges();
}, },
mounted() { async mounted() {
console.log(this.editParams); this.open = true
await this.getRanges();
if (this.editParams) { if (this.editParams) {
Object.assign(this.projectParams, this.editParams); await Object.assign(this.projectParams, this.editParams);
// 查询所属设备 // 查询所属设备
queryEdgeDeviceByIdApi(this.editParams.id) await queryEdgeDeviceByIdApi(this.editParams.id)
.then((res) => { .then((res) => {
res.rows.forEach((item) => { res.rows.forEach((item) => {
this.$refs.tableRef.tableList.unshift(item); this.$refs.tableRef.tableList.unshift(item);
@ -164,10 +166,12 @@ export default {
} else { } else {
this.subSort = 1; this.subSort = 1;
} }
this.open = false
}, },
data() { data() {
return { return {
columnsListInsert, columnsListInsert,
open: false,
exportList: [], exportList: [],
subSort: "", // 提交类型：新增 1 / 修改 2 subSort: "", // 提交类型：新增 1 / 修改 2
projectParams: { projectParams: {

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

@ -8,11 +8,11 @@
:model="warnAlertParams" :model="warnAlertParams"
:rules="warnAlertParamsRules" :rules="warnAlertParamsRules"
> >
<el-form-item label="预警处置" prop="remarks"> <el-form-item label="预警处置" prop="remarks" >
<el-input v-model="warnAlertParams.remarks" :maxlength="15" placeholder="请输入预警处置内容" /> <el-input v-model="warnAlertParams.remarks" :maxlength="15" placeholder="请输入预警处置内容" style="width: 550px;"/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item style="display: flex; justify-content: right">
<el-button type="success" @click="onSubmit">确认</el-button> <el-button type="success" @click="onSubmit">确认</el-button>
<el-button <el-button
@click=" @click="

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

@ -31,6 +31,7 @@
@click="handleWarnData(data)" @click="handleWarnData(data)"
>处理</el-button >处理</el-button
> >
<span v-else></span>
</template> </template>
<template slot="warnName" slot-scope="{ data }"> <template slot="warnName" slot-scope="{ data }">
<span v-if="data.warnName == null || data.warnName === ''">无</span> <span v-if="data.warnName == null || data.warnName === ''">无</span>