Skip to content

H
haoban-operation-4
Commit 14b3ca27 by caoyanzhi
Options

好办运维后台

parent c340dd20
Showing with 76 additions and 22 deletions
src/api/permission.js
......@@ -13,6 +13,8 @@ const api = {
addOperationItem: '/add-operation-item', // 添加操作项
editOperationItem: '/edit-operation-item', // 编辑操作项
delOperationItem: '/del-operation-item', // 删除操作项
haobanVersionList: '/haoban-version-list', // 获取好办版本列表
appVersionList: '/app-version-list', // 获取应用版本列表
}
export default getFetch(api, '/hb-manage-web');
src/views/enterprise/enterprise-detail.vue
......@@ -69,19 +69,6 @@ import api from '@/api/enterprise.js';
const { getEnterpriseDetail, refreshEnterpriseInfo } = api;
/**
* 企业信息
* 应用可见范围字段
*/
/**
* 好办自建应用
* 缺少模块数据
*/
/**
* 授权信息
* 列表，缺少logo字段
* 弹窗，缺少授权范围数据
*/
export default {
name: 'enterprise-detail',
data() {
......
src/views/permission/menu-config/menu-list.vue
......@@ -14,7 +14,7 @@
<el-table-column label="节点名称" prop="menuName" :formatter="(row, col, val) => val || '--'"></el-table-column>
<el-table-column label="页面code" prop="code" :formatter="(row, col, val) => val || '--'"></el-table-column>
<el-table-column label="父级code" prop="parentCode" :formatter="(row, col, val) => val || '--'"></el-table-column>
<el-table-column label="应用版本" prop="hbVersion" :formatter="(row, col, val) => val || '--'"></el-table-column>
<el-table-column :label="appType == 1 ? '好办版本' : '应用版本'" prop="hbVersion" :formatter="formatVersion"></el-table-column>
<el-table-column label="操作" width="320px">
<template slot-scope="{ row }">
<el-button type="text" @click="onEditMenu(row)">编辑</el-button>
......@@ -30,9 +30,14 @@
width="600px"
@closed="onEditMenuClose">
<el-form :model="editMenu" :rules="editMenuRules" ref="editMenu" label-width="95px">
<el-form-item label="应用版本" prop="hbVersion">
<el-form-item label="好办版本" prop="hbVersion" v-if="appType == 1">
<el-select v-model="editMenu.hbVersion" style="width: 440px">
<el-option label="免费版" value="1"></el-option>
<el-option v-for="el in haobanVersionList" :key="el.versionCode" :value="versionCode" :label="el.version"></el-option>
</el-select>
</el-form-item>
<el-form-item label="应用版本" prop="hbVersion" v-else>
<el-select v-model="editMenu.hbVersion" style="width: 440px">
<el-option v-for="el in appVersionList" :key="el.versionCode" :value="versionCode" :label="el.version"></el-option>
</el-select>
</el-form-item>
<el-form-item label="节点名称" prop="menuName">
......@@ -116,7 +121,7 @@
<script>
import api from '@/api/permission.js';
const { getMenuList, addMenu, editMenu, delMenu } = api;
const { getMenuList, addMenu, editMenu, delMenu, haobanVersionList, appVersionList } = api;
// 主要功能
// 搜索 done
// 收起、展开节点 done
......@@ -135,6 +140,8 @@ export default {
},
data() {
return {
haobanVersionList: [],
appVersionList: [],
search: '', // 查询条件
expand: false, // 是否展示子节点 true：展示 false：不展示
showTable: true,
......@@ -167,9 +174,18 @@ export default {
},
mounted() {
this.menuList = [];
// this.getMenuList();
// this.initData()
},
methods: {
initData() {
haobanVersionList().then(res => {
this.haobanVersionList = res.result || [];
})
appVersionList().then(res => {
this.appVersionList = res.result || [];
})
this.getMenuList();
},
// 获取节点列表数据
getMenuList() {
const params = {
......@@ -181,6 +197,22 @@ export default {
this.menuList = this.flatDataToTree(res.result || []);
})
},
// 列表显示 格式化版本
formatVersion(row, col, val) {
let result = '--';
if (this.appType == 1) {
this.haobanVersionList.some(callback);
} else {
this.appVersionList.some(callback);
}
function callback(el) {
if (el.versionCode == val) {
result = el.version;
}
return el.versionCode == val;
}
return result;
},
// 收起、展开子节点
onExpandChange() {
this.showTable = false;
......
src/views/permission/operation-list/operation-table.vue
......@@ -13,7 +13,7 @@
<el-table-column label="操作项名称" prop="operationItemName" :formatter="(row, col, val) => val || '--'"></el-table-column>
<el-table-column label="操作项code" prop="operationItemCode" :formatter="(row, col, val) => val || '--'"></el-table-column>
<el-table-column label="页面code" prop="menuCode" :formatter="(row, col, val) => val || '--'"></el-table-column>
<el-table-column label="好办版本" prop="version" :formatter="(row, col, val) => val || '--'"></el-table-column>
<el-table-column :label="appType == 1 ? '好办版本' : '应用版本'" prop="version" :formatter="formatVersion"></el-table-column>
<el-table-column label="操作">
<template slot-scope="{ row }">
<el-button type="text" @click="onEdit(row)">编辑</el-button>
......@@ -41,8 +41,15 @@
<el-form-item label="节点code">
<el-input :value="editOperation.menuCode" style="width:440px" disabled></el-input>
</el-form-item>
<el-form-item label="应用版本" prop="version">
<el-select v-model="editOperation.version" style="width: 440px"></el-select>
<el-form-item label="好办版本" prop="version" v-if="appType == 1">
<el-select v-model="editOperation.version" style="width: 440px">
<el-option v-for="el in haobanVersionList" :key="el.versionCode" :value="el.versionCode" :label="el.version"></el-option>
</el-select>
</el-form-item>
<el-form-item label="应用版本" prop="version" v-else>
<el-select v-model="editOperation.version" style="width: 440px">
<el-option v-for="el in appVersionList" :key="el.versionCode" :value="el.versionCode" :label="el.version"></el-option>
</el-select>
</el-form-item>
<el-form-item label="操作项名称" prop="operationItemName">
<el-input
......@@ -91,7 +98,7 @@
<script>
import api from '@/api/permission.js';
const { getOperationItemList, addOperationItem, editOperationItem, delOperationItem, getMenuList } = api;
const { getOperationItemList, addOperationItem, editOperationItem, delOperationItem, getMenuList, haobanVersionList, appVersionList } = api;
// 搜索，翻页 done
// 新建、编辑操作项 done
// 删除操作项 done
......@@ -106,6 +113,10 @@ export default {
menuList: [],
// 平铺的节点列表
flatMenuList: [],
// 好办版本列表
haobanVersionList: [],
// 应用版本列表
appVersionList: [],
search: '',
// 分页相关的数据
pager: {
......@@ -148,6 +159,12 @@ export default {
getMenuList({ appType: this.appType }).then(res => {
this.menuList = this.flatDataToTree(res.result || []);
})
haobanVersionList().then(res => {
this.haobanVersionList = res.result || [];
})
appVersionList().then(res => {
this.appVersionList = res.result || [];
})
},
// 获取操作项列表
getOperationList() {
......@@ -176,6 +193,22 @@ export default {
this.pager.currentPage = currentPage;
this.getOperationList();
},
// 列表显示 格式化版本号信息
formatVersion(row, col, val) {
let result = '--';
if (this.appType == 1) {
this.haobanVersionList.some(callback);
} else {
this.appVersionList.some(callback);
}
function callback(el) {
if (el.versionCode == val) {
result = el.version;
}
return el.versionCode == val;
}
return result;
},
// 编辑操作项 打开弹窗
onEdit(operationData) {
const { operationItemId, menuId, menuCode, operationItemName, operationItemCode, operationItemUrl, authItemFlag, roleRange, version } = operationData;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment