cxc/rn-bms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

up

Browse Source
This commit is contained in:
hh
2020-11-27 16:13:28 +08:00
parent dc3cd2e8a9
commit 41e6b024ec
3 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/hardware/deviceList/index.vue
View File

@ -87,13 +87,13 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="设备SN" prop="deviceId">
<el-input v-model="form.deviceId" placeholder="请输入设备SN" />
<el-input :disabled="!!form.id" v-model="form.deviceId" placeholder="请输入设备SN" />
</el-form-item>
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="请输入设备名称" />
</el-form-item>
<el-form-item label="设备类型" prop="deviceType">
<el-select v-model="form.deviceType" clearable placeholder="请选择">
<el-select :disabled="!!form.id" v-model="form.deviceType" clearable placeholder="请选择">
<el-option v-for="item in deviceTypeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@ -108,19 +108,19 @@
<el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
</el-form-item> -->
<el-form-item label="产品" prop="productId">
<el-select v-model="form.productId" clearable placeholder="请选择">
<el-select :disabled="!!form.id" v-model="form.productId" clearable placeholder="请选择">
<el-option v-for="item in productSelectList" :key="item.id" :label="item.productName" :value="item.productId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="客户" prop="userId">
<el-select v-model="form.userId" clearable placeholder="请选择" @change="userIdChange">
<el-select :disabled="!!form.id" v-model="form.userId" clearable placeholder="请选择" @change="userIdChange">
<el-option v-for="item in userSelectList" :key="item.id" :label="item.nickName" :value="item.userId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目" prop="projectId">
<el-select v-model="form.projectId" clearable placeholder="请选择">
<el-select :disabled="!!form.id" v-model="form.projectId" clearable placeholder="请选择">
<el-option v-for="item in projectSelectList" :key="item.id" :label="item.projectName" :value="item.projectId">
</el-option>
</el-select>
@ -152,9 +152,9 @@
<!-- 节点列表弹框 -->
<el-dialog title="节点列表" :visible.sync="nodeDialog">
<el-row class="mb8">
<!-- <el-row class="mb8">
<el-button type="danger" icon="el-icon-delete" size="mini" :disabled="nodeMultiple" @click="batchHandleDeletenode">批量删除</el-button>
</el-row>
</el-row> -->
<!-- <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="nodeMultiple" @click="batchHandleDeletenode">批量删除</el-button> -->
<el-table :data="nodeData" @selection-change="nodeHandleSelectionChange">
<el-table-column type="selection" width="55" align="center">
@ -162,13 +162,13 @@
<el-table-column prop="deviceId" label="设备SN"></el-table-column>
<el-table-column prop="nodeId" label="节点SN"></el-table-column>
<el-table-column prop="nowVersion" label="节点版本"></el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdatenode(scope.row)">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleInitNode(scope.row)">初始化</el-button>
<el-button class="text-danger" size="mini" type="text" icon="el-icon-delete" @click="handleDeletenode(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
</el-dialog>
@ -187,6 +187,9 @@
<el-form-item label="节点SN" prop="nodeId">
<el-input v-model="nodeForm.nodeId" placeholder="请输入节点SN" />
</el-form-item>
<el-form-item label="初始版本" prop="nowVersion">
<el-input v-model="nodeForm.nowVersion" placeholder="请输入节点初始版本" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="saveNode">确 定</el-button>
@ -310,6 +313,9 @@ export default {
nodeDataId: [
{ required: true, message: "节点真正ID不能为空", trigger: "blur" },
],
nowVersion: [
{ required: true, message: "节点初始版本不能为空", trigger: "blur" },
],
}
};
},
@ -563,7 +569,12 @@ export default {
saveNode: function () {
deviceNodeSave(this.nodeForm).then((res) => {
if (200 == res.code) {
this.msgSuccess(this.title + "成功");
let msgDict = {
'-1': '存在节点，无法添加',
'0': '添加失败',
'1': '添加成功',
}
this.msgSuccess(msgDict[res.result]);
this.nodeOpen = false;
this.getList();
} else {
@ -574,6 +585,7 @@ export default {
/** 删除按钮操作 */
handleDelete (row) {
debugger
const ids = row.id || this.ids;
this.$confirm('是否确认删除?', "警告", {
confirmButtonText: "确定",

23
src/views/hardware/productList/index.vue
View File

@ -34,7 +34,7 @@
<el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center">
</el-table-column>
<el-table-column prop="productId" align="center" label="产品ID">
<el-table-column prop="productId" align="center" label="产品SN">
</el-table-column>
<el-table-column prop="productName" align="center" label="产品名称">
</el-table-column>
@ -69,8 +69,8 @@
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="产品ID" prop="productId">
<el-input v-model="form.productId" placeholder="请输入产品ID" />
<el-form-item label="产品SN" prop="productId">
<el-input :disabled="!!form.id" v-model="form.productId" placeholder="请输入产品SN" />
</el-form-item>
<el-form-item label="产品名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入产品名称" />
@ -93,8 +93,8 @@
<!-- 添加节点参数配置对话框 -->
<el-dialog :title="title" :visible.sync="nodeOpen" width="500px" append-to-body>
<el-form ref="nodeForm" :model="nodeForm" :rules="nodeRules" label-width="100px">
<el-form-item label="产品ID" prop="productId">
<el-input v-model="nodeForm.productId" disabled placeholder="请输入产品ID" />
<el-form-item label="产品SN" prop="productId">
<el-input v-model="nodeForm.productId" disabled placeholder="请输入产品SN" />
</el-form-item>
<el-form-item label="节点名称" prop="nodeName">
<el-input v-model="nodeForm.nodeName" placeholder="请输入节点名称" />
@ -178,7 +178,7 @@ export default {
},
rules: {
productId: [
{ required: true, message: "产品ID不能为空", trigger: "blur" },
{ required: true, message: "产品SN不能为空", trigger: "blur" },
],
productName: [
{ required: true, message: "产品名称不能为空", trigger: "blur" },
@ -190,7 +190,7 @@ export default {
},
nodeRules: {
productId: [
{ required: true, message: "产品ID不能为空", trigger: "blur" },
{ required: true, message: "产品SN不能为空", trigger: "blur" },
],
nodeId: [
{ required: true, message: "节点ID不能为空", trigger: "blur" },
@ -337,7 +337,7 @@ export default {
if (200 == res.code) {
this.msgSuccess(this.title + "成功");
this.nodeOpen = false;
this.getList();
this.getListnode({ productId: this.nodeForm.productId });
} else {
this.msgError(res.msg);
}
@ -356,8 +356,13 @@ export default {
})
.then((res) => {
if (200 == res.code) {
let msgDict = {
'-1': '存在设备，无法删除',
'0': '删除失败',
'1': '删除成功',
}
this.getList();
this.msgSuccess("删除成功");
this.msgSuccess(msgDict[res.result]);
} else {
this.msgError(res.msg);
}

2
src/views/system/user/index.vue
View File

@ -105,7 +105,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归属部门" prop="deptId">
<el-form-item label="归属部门">
<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
</el-form-item>
</el-col>