kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2022-06-28 14:25:30 +08:00
parent d51918b713 51d2b8eaf9
commit 40ebb8630a
3 changed files with 60 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/conv/AppDeviceConfig/AppDeviceConfig.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<ai-list class="AppDeviceConfig"> <ai-list class="AppDeviceConfig">
<template slot="title"> <template slot="title">
<ai-title title="设备管理" :isShowBottomBorder="false" :fullname.sync="areaName" v-model="areaId" :instance="instance" @change="onAreaChange"></ai-title> <ai-title title="设备配置" :isShowBottomBorder="false" :fullname.sync="areaName" v-model="areaId" :instance="instance" @change="onAreaChange"></ai-title>
</template> </template>
<template slot="tabs"> <template slot="tabs">
<el-tabs v-model="currIndex"> <el-tabs v-model="currIndex">
@@ -20,7 +20,7 @@
export default { export default {
name: 'AppDeviceConfig', name: 'AppDeviceConfig',
label: '设备管理', label: '设备配置',
components: { components: {
eyeList, eyeList,

62
packages/conv/AppDeviceConfig/components/eyeList.vue
View File

@@ -3,8 +3,8 @@
<template slot="content"> <template slot="content">
<ai-search-bar bottomBorder> <ai-search-bar bottomBorder>
<template #left> <template #left>
<el-button type="primary" icon="iconfont iconAdd" size="small" @click="add('添加设备', {})">添加</el-button> <el-button type="primary" icon="iconfont iconAdd" size="small" @click="add('添加设备配置', {})">添加</el-button>
<el-button icon="el-icon-delete" class="delete-btn del-btn-list" :disabled="!Boolean(ids.length)" @click="remove(ids)">删除</el-button> <el-button icon="el-icon-delete" class="delete-btn del-btn-list" :disabled="!ids.length" @click="remove(ids)">删除</el-button>
</template> </template>
</ai-search-bar> </ai-search-bar>
<ai-table <ai-table
@@ -15,11 +15,12 @@
style="margin-top: 16px;" style="margin-top: 16px;"
:current.sync="search.current" :current.sync="search.current"
:size.sync="search.size" :size.sync="search.size"
@getList="getList"> @getList="getList"
@selection-change="v=>ids=v.map(e=>e.id)">
<el-table-column slot="options" width="140px" fixed="right" label="操作" align="center"> <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div class="table-options"> <div class="table-options">
<el-button type="text" @click="edit('编辑设备', row)">编辑</el-button> <el-button type="text" @click="edit('编辑设备配置', row)">编辑</el-button>
<el-button type="text" @click="refresh(row)">刷新</el-button> <el-button type="text" @click="refresh(row)">刷新</el-button>
<el-button type="text" @click="remove(row.id)">删除</el-button> <el-button type="text" @click="remove(row.id)">删除</el-button>
</div> </div>
@@ -28,31 +29,31 @@
</ai-table> </ai-table>
<ai-dialog :title="dialogTitle" :visible.sync="dialog" width="800px" @onConfirm="addForm" @closed="dialogForm={}"> <ai-dialog :title="dialogTitle" :visible.sync="dialog" width="800px" @onConfirm="addForm" @closed="dialogForm={}">
<el-form ref="addForm" :model="dialogForm" :rules="rules" size="small" label-width="160px"> <el-form ref="addForm" :model="dialogForm" :rules="rules" size="small" label-width="160px">
<el-form-item label="租户id" prop="corpId"> <el-form-item label="CorpId" prop="corpId">
<el-input v-model.trim="dialogForm.corpId" placeholder="请输入..." clearable :maxLength="50"/> <el-input v-model.trim="dialogForm.corpId" placeholder="请输入..." clearable :maxLength="50"/>
</el-form-item> </el-form-item>
<el-form-item required label="中移账号开启状态"> <el-form-item required label="状态">
<el-radio-group v-model="dialogForm.flag"> <el-radio-group v-model="dialogForm.flag">
<el-radio :label="0">关闭</el-radio> <el-radio :label="0">关闭</el-radio>
<el-radio :label="1">开启</el-radio> <el-radio :label="1">开启</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="中移账号appid"> <el-form-item label="AppId">
<el-input v-model.trim="dialogForm.appId" placeholder="请输入..." clearable :maxLength="50" /> <el-input v-model.trim="dialogForm.appId" placeholder="请输入..." clearable :maxLength="50" />
</el-form-item> </el-form-item>
<el-form-item label="中移账号rsa"> <el-form-item label="RSA">
<el-input v-model.trim="dialogForm.rsa" placeholder="请输入..." clearable :maxLength="500" type="textarea" :rows="5"/> <el-input v-model.trim="dialogForm.rsa" placeholder="请输入..." clearable :maxLength="500" type="textarea" :rows="5"/>
</el-form-item> </el-form-item>
<el-form-item label="中移账号secret"> <el-form-item label="SECRET">
<el-input v-model.trim="dialogForm.secret" placeholder="请输入..." clearable :maxLength="50" /> <el-input v-model.trim="dialogForm.secret" placeholder="请输入..." clearable :maxLength="50" />
</el-form-item> </el-form-item>
<el-form-item label="TOKEN信息"> <el-form-item label="TOKEN">
<el-input v-model.trim="dialogForm.token" placeholder="请输入..." clearable :maxLength="200" type="textarea" :rows="2"/> <el-input v-model.trim="dialogForm.token" placeholder="请输入..." clearable :maxLength="200" type="textarea" :rows="2"/>
</el-form-item> </el-form-item>
<el-form-item label="中移组织结构结点ids"> <el-form-item label="结点ids">
<el-input v-model.trim="dialogForm.orgIds" placeholder="请输入..." clearable :maxLength="50" /> <el-input v-model.trim="dialogForm.orgIds" placeholder="请输入..." clearable :maxLength="50" />
</el-form-item> </el-form-item>
<el-form-item label="中移账号版本号"> <el-form-item label="版本号">
<el-input v-model.trim="dialogForm.version" placeholder="请输入..." clearable :maxLength="50" /> <el-input v-model.trim="dialogForm.version" placeholder="请输入..." clearable :maxLength="50" />
</el-form-item> </el-form-item>
<el-form-item label="大喇叭账号"> <el-form-item label="大喇叭账号">
@@ -104,20 +105,20 @@
}, },
rules() { rules() {
return { return {
corpId: [{required: true, message: "请输入租户id"}], corpId: [{required: true, message: "请输入CorpId"}],
} }
}, },
colConfigs() { colConfigs() {
return [ return [
{type: "selection"}, {type: "selection"},
{ prop: 'corpId', label: '租户id' }, { prop: 'corpId', label: 'CorpId' },
{ prop: 'flag', align: 'center', label: '中移账号开启状态' }, { prop: 'flag', align: 'center', label: '状态' },
{ prop: 'appId', align: 'center', label: '中移账号appid' }, { prop: 'appId', align: 'center', label: 'AppId' },
{ prop: 'rsa', align: 'center', label: '中移账号rsa' }, { prop: 'rsa', align: 'center', label: 'RSA' },
{ prop: 'secret', align: 'center', label: '中移账号secret' }, { prop: 'secret', align: 'center', label: 'SECRET' },
{ prop: 'token', align: 'center', label: 'TOKEN信息' }, { prop: 'token', align: 'center', label: 'TOKEN' },
{ prop: 'orgIds', align: 'center', label: '中移组织结构结点ids' }, { prop: 'orgIds', align: 'center', label: '结点ids' },
{ prop: 'version', align: 'center', label: '中移账号版本号' }, { prop: 'version', align: 'center', label: '版本号' },
{ prop: 'dlbName', align: 'center', label: '大喇叭账号' }, { prop: 'dlbName', align: 'center', label: '大喇叭账号' },
{ prop: 'dlbPwd', align: 'center', label: '大喇叭密码' }, { prop: 'dlbPwd', align: 'center', label: '大喇叭密码' },
{ prop: 'dlbToken', align: 'center', label: '大喇叭Token' }, { prop: 'dlbToken', align: 'center', label: '大喇叭Token' },
@@ -139,6 +140,7 @@
this.instance.post(`/app/appzyaccountconfig/list`, null, { this.instance.post(`/app/appzyaccountconfig/list`, null, {
params: { params: {
...this.search, ...this.search,
type: 0
} }
}).then(res => { }).then(res => {
if (res.code == 0) { if (res.code == 0) {
@@ -166,7 +168,7 @@
this.dialog = true this.dialog = true
this.dialogTitle = title this.dialogTitle = title
this.dialogForm = item this.dialogForm = item
if(title == '添加设备') { if(title == '添加设备配置') {
this.dialogForm.flag = 1 this.dialogForm.flag = 1
this.dialogForm.version = '1.0.0' this.dialogForm.version = '1.0.0'
} }
@@ -174,7 +176,7 @@
addForm() { addForm() {
this.$refs.addForm.validate((valid) => { this.$refs.addForm.validate((valid) => {
if (valid) { if (valid) {
this.dialogForm.type = 1 this.dialogForm.type = 0
this.instance.post(`/app/appzyaccountconfig/addOrUpdate`, this.dialogForm).then((res) => { this.instance.post(`/app/appzyaccountconfig/addOrUpdate`, this.dialogForm).then((res) => {
if (res.code == 0) { if (res.code == 0) {
this.$message.success(`${this.dialogForm.id ? '编辑成功' : '添加成功'}`) this.$message.success(`${this.dialogForm.id ? '编辑成功' : '添加成功'}`)
@@ -187,14 +189,14 @@
} }
}); });
}, },
refresh() { refresh(row) {
this.$confirm('确定刷新该数据token？').then(() => { this.$confirm('确定刷新该数据token？').then(() => {
// this.instance.post(`/app/appzyaccountconfig/delete`).then(res => { this.instance.post(`/app/appzyaccountconfig/initQlyToken?id=${row.id}`).then(res => {
// if (res.code == 0) { if (res.code == 0) {
// this.$message.success('刷新成功！') this.$message.success('刷新成功！')
// this.getList() this.getList()
// } }
// }) })
}) })
}, },
} }

51
packages/conv/AppDeviceConfig/components/videoList.vue
View File

@@ -3,7 +3,7 @@
<template slot="content"> <template slot="content">
<ai-search-bar bottomBorder> <ai-search-bar bottomBorder>
<template #left> <template #left>
<el-button type="primary" icon="iconfont iconAdd" size="small" @click="add('添加设备', {})">添加</el-button> <el-button type="primary" icon="iconfont iconAdd" size="small" @click="add('添加设备配置', {})">添加</el-button>
<el-button icon="el-icon-delete" class="delete-btn del-btn-list" :disabled="!Boolean(ids.length)" @click="remove(ids)">删除</el-button> <el-button icon="el-icon-delete" class="delete-btn del-btn-list" :disabled="!Boolean(ids.length)" @click="remove(ids)">删除</el-button>
</template> </template>
</ai-search-bar> </ai-search-bar>
@@ -15,11 +15,12 @@
style="margin-top: 16px;" style="margin-top: 16px;"
:current.sync="search.current" :current.sync="search.current"
:size.sync="search.size" :size.sync="search.size"
@getList="getList"> @getList="getList"
@selection-change="v=>ids=v.map(e=>e.id)">
<el-table-column slot="options" width="140px" fixed="right" label="操作" align="center"> <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div class="table-options"> <div class="table-options">
<el-button type="text" @click="edit('编辑设备', row)">编辑</el-button> <el-button type="text" @click="edit('编辑设备配置', row)">编辑</el-button>
<el-button type="text" @click="refresh(row)">刷新</el-button> <el-button type="text" @click="refresh(row)">刷新</el-button>
<el-button type="text" @click="remove(row.id)">删除</el-button> <el-button type="text" @click="remove(row.id)">删除</el-button>
</div> </div>
@@ -28,22 +29,22 @@
</ai-table> </ai-table>
<ai-dialog :title="dialogTitle" :visible.sync="dialog" width="800px" @onConfirm="addForm" @closed="dialogForm={}"> <ai-dialog :title="dialogTitle" :visible.sync="dialog" width="800px" @onConfirm="addForm" @closed="dialogForm={}">
<el-form ref="addForm" :model="dialogForm" :rules="rules" size="small" label-width="160px"> <el-form ref="addForm" :model="dialogForm" :rules="rules" size="small" label-width="160px">
<el-form-item label="租户id" prop="corpId"> <el-form-item label="CorpId" prop="corpId">
<el-input v-model.trim="dialogForm.corpId" placeholder="请输入..." clearable :maxLength="50"/> <el-input v-model.trim="dialogForm.corpId" placeholder="请输入..." clearable :maxLength="50"/>
</el-form-item> </el-form-item>
<el-form-item required label="视联网账号开启状态"> <el-form-item required label="状态">
<el-radio-group v-model="dialogForm.flag"> <el-radio-group v-model="dialogForm.flag">
<el-radio :label="0">关闭</el-radio> <el-radio :label="0">关闭</el-radio>
<el-radio :label="1">开启</el-radio> <el-radio :label="1">开启</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="视联网地区ID"> <el-form-item label="用户ID">
<el-input v-model.trim="dialogForm.slwAreaId" placeholder="请输入..." clearable :maxLength="50" />
</el-form-item>
<el-form-item label="视联网用户ID">
<el-input v-model.trim="dialogForm.slwUserId" placeholder="请输入..." clearable :maxLength="50" /> <el-input v-model.trim="dialogForm.slwUserId" placeholder="请输入..." clearable :maxLength="50" />
</el-form-item> </el-form-item>
<el-form-item label="视联网TOKEN"> <el-form-item label="地区编码">
<el-input v-model.trim="dialogForm.slwAreaId" placeholder="请输入..." clearable :maxLength="50" />
</el-form-item>
<el-form-item label="TOKEN">
<el-input v-model.trim="dialogForm.slwToken" placeholder="请输入..." clearable :maxLength="50" /> <el-input v-model.trim="dialogForm.slwToken" placeholder="请输入..." clearable :maxLength="50" />
</el-form-item> </el-form-item>
<el-form-item label="大喇叭账号"> <el-form-item label="大喇叭账号">
@@ -95,17 +96,17 @@
}, },
rules() { rules() {
return { return {
corpId: [{required: true, message: "请输入租户id"}], corpId: [{required: true, message: "请输入CorpId"}],
} }
}, },
colConfigs() { colConfigs() {
return [ return [
{type: "selection"}, {type: "selection"},
{ prop: 'corpId', label: '租户id' }, { prop: 'corpId', label: 'CorpId' },
{ prop: 'flag', align: 'center', label: '视联网账号开启状态' }, { prop: 'flag', align: 'center', label: '状态' },
{ prop: 'slwAreaId', align: 'center', label: '视联网地区ID' }, { prop: 'slwUserId', align: 'center', label: '用户ID' },
{ prop: 'slwUserId', align: 'center', label: '视联网用户ID' }, { prop: 'slwAreaId', align: 'center', label: '地区编码' },
{ prop: 'slwToken', align: 'center', label: '视联网TOKEN' }, { prop: 'slwToken', align: 'center', label: 'TOKEN' },
{ prop: 'dlbName', align: 'center', label: '大喇叭账号' }, { prop: 'dlbName', align: 'center', label: '大喇叭账号' },
{ prop: 'dlbPwd', align: 'center', label: '大喇叭密码' }, { prop: 'dlbPwd', align: 'center', label: '大喇叭密码' },
{ prop: 'dlbToken', align: 'center', label: '大喇叭Token' }, { prop: 'dlbToken', align: 'center', label: '大喇叭Token' },
@@ -127,6 +128,7 @@
this.instance.post(`/app/appzyaccountconfig/list`, null, { this.instance.post(`/app/appzyaccountconfig/list`, null, {
params: { params: {
...this.search, ...this.search,
type: 1
} }
}).then(res => { }).then(res => {
if (res.code == 0) { if (res.code == 0) {
@@ -154,9 +156,8 @@
this.dialog = true this.dialog = true
this.dialogTitle = title this.dialogTitle = title
this.dialogForm = item this.dialogForm = item
if(title == '添加设备') { if(title == '添加设备配置') {
this.dialogForm.flag = 1 this.dialogForm.flag = 1
this.dialogForm.version = '1.0.0'
} }
}, },
addForm() { addForm() {
@@ -175,14 +176,14 @@
} }
}); });
}, },
refresh() { refresh(row) {
this.$confirm('确定刷新该数据token？').then(() => { this.$confirm('确定刷新该数据token？').then(() => {
// this.instance.post(`/app/appzyaccountconfig/delete`).then(res => { this.instance.post(`/app/appzyaccountconfig/initSlwToken?id=${row.id}`).then(res => {
// if (res.code == 0) { if (res.code == 0) {
// this.$message.success('刷新成功！') this.$message.success('刷新成功！')
// this.getList() this.getList()
// } }
// }) })
}) })
}, },
} }