up
This commit is contained in:
@ -80,15 +80,24 @@
|
|||||||
<el-form-item label="设备编码" prop="deviceCode">
|
<el-form-item label="设备编码" prop="deviceCode">
|
||||||
<el-input v-model="form.deviceCode" placeholder="请输入设备编码" />
|
<el-input v-model="form.deviceCode" placeholder="请输入设备编码" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="类型" prop="deviceType">
|
<el-form-item label="设备类型" prop="deviceType">
|
||||||
<el-input v-model="form.deviceType" placeholder="请输入设备类型" />
|
<el-input v-model="form.deviceType" placeholder="请输入设备类型" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="装置模型" prop="deviceModel">
|
<el-form-item label="设备型号" prop="deviceModel">
|
||||||
<el-input v-model="form.deviceModel" placeholder="请输入装置模型" />
|
<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-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>
|
||||||
<el-form-item label="国家行政区 省" prop="provinceCode">
|
<el-form-item label="国家行政区 省" prop="provinceCode">
|
||||||
<el-input v-model="form.provinceCode" />
|
<el-input v-model="form.provinceCode" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="国家行政区 市" prop="cityCode">
|
||||||
|
<el-input v-model="form.cityCode" />
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label="国家行政区 区" prop="areaCode">
|
<el-form-item label="国家行政区 区" prop="areaCode">
|
||||||
<el-input v-model="form.areaCode" />
|
<el-input v-model="form.areaCode" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -110,6 +119,7 @@ import {
|
|||||||
update,
|
update,
|
||||||
del,
|
del,
|
||||||
} from "@/api/hardware/device";
|
} from "@/api/hardware/device";
|
||||||
|
import { select as productSelect } from "@/api/hardware/product";
|
||||||
export default {
|
export default {
|
||||||
name: "DeviceList",
|
name: "DeviceList",
|
||||||
components: {
|
components: {
|
||||||
@ -117,6 +127,8 @@ export default {
|
|||||||
},
|
},
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
|
// 产品下拉列表
|
||||||
|
productSelectList: [],
|
||||||
// 选中数组
|
// 选中数组
|
||||||
ids: [],
|
ids: [],
|
||||||
// 非单个禁用
|
// 非单个禁用
|
||||||
@ -141,7 +153,7 @@ export default {
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
// 表单参数
|
// 表单参数
|
||||||
form: { },
|
form: {},
|
||||||
// 表格数据
|
// 表格数据
|
||||||
tableData: null,
|
tableData: null,
|
||||||
// 查询参数
|
// 查询参数
|
||||||
@ -159,10 +171,20 @@ export default {
|
|||||||
deviceType: [
|
deviceType: [
|
||||||
{ required: true, message: "设备编码不能为空", trigger: "blur" },
|
{ required: true, message: "设备编码不能为空", trigger: "blur" },
|
||||||
],
|
],
|
||||||
|
productId: [
|
||||||
|
{ required: true, message: "产品不能为空", trigger: "blur" },
|
||||||
|
],
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
created () {
|
created () {
|
||||||
|
productSelect().then(({ code, msg, select }) => {
|
||||||
|
if (code == 200) {
|
||||||
|
this.productSelectList = select;
|
||||||
|
} else {
|
||||||
|
this.$message.error(msg);
|
||||||
|
}
|
||||||
|
})
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
@ -258,7 +258,7 @@ export default {
|
|||||||
productId: "",
|
productId: "",
|
||||||
productType: "",
|
productType: "",
|
||||||
productName: "",
|
productName: "",
|
||||||
status: "0",
|
status: "",
|
||||||
};
|
};
|
||||||
this.nodeForm = {
|
this.nodeForm = {
|
||||||
productId: "",
|
productId: "",
|
||||||
|
@ -1,76 +1,82 @@
|
|||||||
<template>
|
<template>
|
||||||
<section class="app-container">
|
<section class="app-container">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col>
|
<el-col>
|
||||||
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
||||||
<el-form-item label="项目名称" prop="projectName">
|
<el-form-item label="项目名称" prop="projectName">
|
||||||
<el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable size="small" style="width: 240px"
|
<el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable size="small" style="width: 240px"
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter.native="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-row :gutter="10" class="mb8">
|
<el-row :gutter="10" class="mb8">
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button size="mini" type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['system:project:add']">增加</el-button>
|
<el-button size="mini" type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['system:project:add']">增加</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
|
<el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
|
||||||
v-hasPermi="['monitor:project:remove']">批量删除</el-button>
|
v-hasPermi="['monitor:project:remove']">批量删除</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
|
<el-table :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
|
||||||
<el-table-column type="selection" width="55" align="center">
|
<el-table-column type="selection" width="55" align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="projectName" align="center" label="项目名称">
|
<el-table-column prop="projectName" align="center" label="项目名称">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="createTime" align="center" label="创建时间">
|
<el-table-column prop="createTime" align="center" label="创建时间">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="status" align="center" label="状态">
|
<el-table-column prop="status" align="center" label="状态">
|
||||||
</el-table-column>
|
</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">
|
<template slot-scope="scope">
|
||||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:project:edit']">修改
|
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:project:edit']">
|
||||||
</el-button>
|
修改
|
||||||
<el-button class="text-danger" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
</el-button>
|
||||||
v-hasPermi="['system:project:remove']">删除</el-button>
|
<el-button class="text-danger" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
|
||||||
</template>
|
v-hasPermi="['system:project:remove']">删除</el-button>
|
||||||
</el-table-column>
|
</template>
|
||||||
</el-table>
|
</el-table-column>
|
||||||
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
|
</el-table>
|
||||||
@pagination="getList" />
|
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
|
||||||
</el-col>
|
@pagination="getList" />
|
||||||
<!-- 添加或修改参数配置对话框 -->
|
</el-col>
|
||||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
<!-- 添加或修改参数配置对话框 -->
|
||||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||||
<el-form-item label="项目名称" prop="projectName">
|
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||||
<el-input v-model="form.projectName" placeholder="请输入项目名称" />
|
<el-form-item label="项目名称" prop="projectName">
|
||||||
</el-form-item>
|
<el-input v-model="form.projectName" placeholder="请输入项目名称" />
|
||||||
<el-form-item label="创建时间" prop="createTime">
|
</el-form-item>
|
||||||
<el-input v-model="form.createTime" placeholder="请输入创建时间" />
|
<el-form-item label="客户" prop="userId">
|
||||||
</el-form-item>
|
<el-select v-model="form.userId" clearable placeholder="请选择" @change="userIdChange">
|
||||||
<el-form-item label="状态">
|
<el-option v-for="item in userSelectList" :key="item.id" :label="item.nickName" :value="item.userId">
|
||||||
<el-input v-model="form.status" />
|
</el-option>
|
||||||
</el-form-item>
|
</el-select>
|
||||||
</el-form>
|
</el-form-item>
|
||||||
<div slot="footer" class="dialog-footer">
|
<el-form-item label="状态">
|
||||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
<el-input v-model="form.status" />
|
||||||
<el-button @click="cancel">取 消</el-button>
|
</el-form-item>
|
||||||
</div>
|
</el-form>
|
||||||
</el-dialog>
|
<div slot="footer" class="dialog-footer">
|
||||||
</el-row>
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
</section>
|
<el-button @click="cancel">取 消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
|
</el-row>
|
||||||
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { list, info, add, update, del, select } from "@/api/hardware/project";
|
import { list, info, add, update, del, select } from "@/api/hardware/project";
|
||||||
|
import { userSelect } from "@/api/system/user";
|
||||||
export default {
|
export default {
|
||||||
name: "ProjectList",
|
name: "ProjectList",
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
|
userSelectList: [],
|
||||||
// 选中数组
|
// 选中数组
|
||||||
ids: [],
|
ids: [],
|
||||||
// 非多个禁用
|
// 非多个禁用
|
||||||
@ -95,11 +101,21 @@ export default {
|
|||||||
rules: {
|
rules: {
|
||||||
projectName: [
|
projectName: [
|
||||||
{ required: true, message: "项目名称不能为空", trigger: "blur" },
|
{ required: true, message: "项目名称不能为空", trigger: "blur" },
|
||||||
]
|
],
|
||||||
|
userId: [
|
||||||
|
{ required: true, message: "客户不能为空", trigger: "blur" },
|
||||||
|
],
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created () {
|
created () {
|
||||||
|
userSelect().then(({ code, msg, select }) => {
|
||||||
|
if (code == 200) {
|
||||||
|
this.userSelectList = select;
|
||||||
|
} else {
|
||||||
|
this.$message.error(msg);
|
||||||
|
}
|
||||||
|
})
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
@ -123,7 +139,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
// 表单重置
|
// 表单重置
|
||||||
reset() {
|
reset () {
|
||||||
this.form = {
|
this.form = {
|
||||||
projectName: "",
|
projectName: "",
|
||||||
createTime: "",
|
createTime: "",
|
||||||
@ -133,7 +149,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
// 取消按钮
|
// 取消按钮
|
||||||
cancel() {
|
cancel () {
|
||||||
this.open = false;
|
this.open = false;
|
||||||
this.reset();
|
this.reset();
|
||||||
},
|
},
|
||||||
@ -148,40 +164,40 @@ export default {
|
|||||||
|
|
||||||
/** 新增按钮操作 */
|
/** 新增按钮操作 */
|
||||||
handleAdd () {
|
handleAdd () {
|
||||||
this.reset();
|
this.reset();
|
||||||
this.open = true;
|
this.open = true;
|
||||||
this.title = "添加项目";
|
this.title = "添加项目";
|
||||||
},
|
},
|
||||||
|
|
||||||
/** 修改按钮操作 */
|
/** 修改按钮操作 */
|
||||||
handleUpdate (row) {
|
handleUpdate (row) {
|
||||||
this.reset();
|
this.reset();
|
||||||
this.form = row;
|
this.form = row;
|
||||||
this.open = true;
|
this.open = true;
|
||||||
this.title = "修改项目";
|
this.title = "修改项目";
|
||||||
},
|
},
|
||||||
|
|
||||||
/** 删除按钮操作 */
|
/** 删除按钮操作 */
|
||||||
handleDelete (row) {
|
handleDelete (row) {
|
||||||
const ids = row.id || this.ids;
|
const ids = row.id || this.ids;
|
||||||
this.$confirm("是否确认删除?", "警告", {
|
this.$confirm("是否确认删除?", "警告", {
|
||||||
confirmButtonText: "确定",
|
confirmButtonText: "确定",
|
||||||
cancelButtonText: "取消",
|
cancelButtonText: "取消",
|
||||||
type: "warning",
|
type: "warning",
|
||||||
|
})
|
||||||
|
.then(() => {
|
||||||
|
return del(ids);
|
||||||
})
|
})
|
||||||
.then(() => {
|
.catch(() => { })
|
||||||
return del(ids);
|
.then((res) => {
|
||||||
})
|
if (200 == res.code) {
|
||||||
.catch(() => {})
|
this.getList();
|
||||||
.then((res) => {
|
this.msgSuccess("删除成功");
|
||||||
if (200 == res.code) {
|
} else {
|
||||||
this.getList();
|
this.msgSuccess(res.msg);
|
||||||
this.msgSuccess("删除成功");
|
}
|
||||||
} else {
|
})
|
||||||
this.msgSuccess(res.msg);
|
.catch((res) => { });
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch((res) => {});
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/** 提交按钮 */
|
/** 提交按钮 */
|
||||||
|
Reference in New Issue
Block a user