0214
/
ALOps_sys1
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

【web】 厂商设备接口对接

Browse Source
dev
Wangxin 9 months ago
parent d138851e5e
commit e051cd04cc
4 changed files with 72 additions and 63 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      ALOps_sys_fe/alops-ui/src/api/device/deviceManufacturer.js
  2. 117
      ALOps_sys_fe/alops-ui/src/views/device/deviceManufacturer/index.vue
  3. 5
      ALOps_sys_fe/alops-ui/src/views/device/deviceType/index.vue
  4. 5
      ALOps_sys_fe/alops-ui/src/views/device/files/index.vue

2
ALOps_sys_fe/alops-ui/src/api/device/deviceManufacturer.js
Unescape View File

@ -12,7 +12,7 @@ export function getDict() {
// 查询列表
export function list(query) {
return request({
url: api + 'queryByVO',
url: api + 'query',
method: 'get',
params: query
})

117
ALOps_sys_fe/alops-ui/src/views/device/deviceManufacturer/index.vue
Unescape View File

@ -12,9 +12,6 @@
<el-form-item label="联系人" prop="contactBy">
<el-input v-model="queryParams.contactBy" placeholder="请输入联系人" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="联系电话" prop="contactWay">
<el-input v-model="queryParams.contactWay" placeholder="请输入联系电话" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -25,7 +22,7 @@
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['device:deviceManufacturer:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['device:deviceManufacturer:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
@ -33,22 +30,32 @@
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['device:deviceManufacturer:export']">导出</el-button>
</el-col>
</el-col> -->
</el-row>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="ID" align="center" key="Id" prop="Id" />
<el-table-column
label="序号"
width="60"
type="index"
></el-table-column>
<el-table-column label="厂商名称" align="center" key="name" prop="name" width="120" />
<el-table-column label="联系人" align="center" key="contactBy" prop="contactBy" width="120" />
<el-table-column label="联系方式" align="center" key="contactWay" prop="contactWay" width="120" />
<el-table-column label="创建人" align="center" key="CreateBy" prop="CreateBy" width="120" />
<el-table-column label="描述" align="center" key="description" prop="description" width="120" />
<el-table-column label="创建人" align="center" key="createBy" prop="createBy" width="120" />
<el-table-column label="创建日期" align="center" prop="CreateDate" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.CreateDate) }}</span>
<span>{{ parseTime(scope.row.createDate) }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" key="status" prop="status" width="120" >
<template slot-scope="scope">
<span>{{ scope.row.status ? '正常' : '停用' }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" key="Status" prop="Status" width="120" />
<el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['device:deviceManufacturer:edit']">修改</el-button>
@ -68,12 +75,12 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="厂商名称" prop="name">
<el-input v-model="form.name" placeholder="请输入用户昵称" maxlength="30" />
<el-input v-model="form.name" placeholder="请输入联系人" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系人" prop="contactBy">
<el-input v-model="form.contactBy" placeholder="请输入手机号码" maxlength="30" />
<el-input v-model="form.contactBy" placeholder="请输入联系人" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -81,6 +88,18 @@
<el-input v-model="form.contactWay" placeholder="请输入手机号码" maxlength="11" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="启用状态" clearable>
<el-option v-for="dict in statusSelections" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="介绍" prop="description">
<el-input v-model="form.description" placeholder="请输入介绍" type="textarea" :rows="3" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
@ -163,6 +182,11 @@ export default {
children: "children",
label: "label"
},
statusSelections: [
{ label: "正常", value: 1 },
{ label: "停用", value: 0 }
],
// 用户导入参数
upload: {
// 是否显示弹出层（用户导入）
@ -183,38 +207,28 @@ export default {
pageNum: 1,
pageSize: 10,
name: undefined,
contactBy: undefined,
status: undefined,
deptId: undefined
contactBy: undefined
},
// 表单校验
rules: {
name: [
{ required: true, message: "用户名称不能为空", trigger: "blur" },
{ min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
],
nickName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" }
],
password: [
{ required: true, message: "用户密码不能为空", trigger: "blur" },
{ min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
{ pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
],
email: [
{
type: "email",
message: "请输入正确的邮箱地址",
trigger: ["blur", "change"]
}
{ required: true, message: "厂商名称不能为空", trigger: "blur" },
{ min: 2, max: 20, message: '厂商名称长度必须介于 2 和 20 之间', trigger: 'blur' }
],
contactBy: [
{ required: true, message: "联系人不能为空", trigger: "blur" }
],
contactWay: [
{ required: true, message: "联系方式不能为空", trigger: "blur" },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: "blur"
}
]
],
status: [
{ required: true, message: "状态不能为空", trigger: "blur" }
],
}
}
},
@ -275,7 +289,7 @@ export default {
handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用"
this.$modal.confirm('确认要"' + text + '""' + row.name + '"用户吗？').then(function() {
return changeUserStatus(row.Id, row.status)
return changeUserStatus(row.id, row.status)
}).then(() => {
this.$modal.msgSuccess(text + "成功")
}).catch(function() {
@ -290,7 +304,7 @@ export default {
// 表单重置
reset() {
this.form = {
Id: undefined,
id: undefined,
deptId: undefined,
name: undefined,
nickName: undefined,
@ -298,7 +312,7 @@ export default {
contactBy: undefined,
email: undefined,
sex: undefined,
status: "0",
status: undefined,
remark: undefined,
postIds: [],
roleIds: []
@ -314,13 +328,11 @@ export default {
resetQuery() {
this.dateRange = []
this.resetForm("queryForm")
this.queryParams.deptId = undefined
this.$refs.tree.setCurrentKey(null)
this.handleQuery()
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.Id)
this.ids = selection.map(item => item.id)
this.single = selection.length != 1
this.multiple = !selection.length
},
@ -340,28 +352,15 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset()
getUser().then(response => {
this.postOptions = response.posts
this.roleOptions = response.roles
this.open = true
this.title = "添加用户"
this.form.password = this.initPassword
})
this.title = "添加厂商"
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const Id = row.Id || this.ids
getUser(Id).then(response => {
this.form = response.data
this.postOptions = response.posts
this.roleOptions = response.roles
this.$set(this.form, "postIds", response.postIds)
this.$set(this.form, "roleIds", response.roleIds)
this.form = {...row}
this.open = true
this.title = "修改用户"
this.form.password = ""
})
this.title = "修改厂商"
},
/** 重置密码按钮操作 */
handleResetPwd(row) {
@ -377,21 +376,21 @@ export default {
}
},
}).then(({ value }) => {
resetUserPwd(row.Id, value).then(response => {
resetUserPwd(row.id, value).then(response => {
this.$modal.msgSuccess("修改成功，新密码是：" + value)
})
}).catch(() => {})
},
/** 分配角色操作 */
handleAuthRole: function(row) {
const Id = row.Id
this.$router.push("/system/user-auth/role/" + Id)
const id = row.id
this.$router.push("/system/user-auth/role/" + id)
},
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.Id != undefined) {
if (this.form.id != undefined) {
update(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.open = false
@ -409,7 +408,7 @@ export default {
},
/** 删除按钮操作 */
handleDelete(row) {
const Ids = row.Id || this.ids
const Ids = row.id || this.ids
this.$modal.confirm('是否确认删除用户编号为"' + Ids + '"的数据项？').then(function() {
return del(Ids)
}).then(() => {

5
ALOps_sys_fe/alops-ui/src/views/device/deviceType/index.vue
Unescape View File

@ -26,6 +26,11 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column
label="序号"
width="60"
type="index"
></el-table-column>
<el-table-column label="类型编号" align="center" key="id" prop="id"/>
<el-table-column label="设备类型名称" align="center" key="name" prop="name" :show-overflow-tooltip="true" />
<el-table-column label="描述" align="center" key="description" prop="description" :show-overflow-tooltip="true" />

5
ALOps_sys_fe/alops-ui/src/views/device/files/index.vue
Unescape View File

@ -48,6 +48,11 @@
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column
label="序号"
width="60"
type="index"
></el-table-column>
<el-table-column label="设备编号" align="center" key="id" prop="id" />
<el-table-column label="设备名称" align="center" key="name" prop="name" :show-overflow-tooltip="true" />
<el-table-column label="设备版本" align="center" key="version" prop="version" :show-overflow-tooltip="true" />

Write Preview
Loading…
Cancel
Save