Skip to content

H
haoban-operation-4
Commit 3f632606 by caoyanzhi
Options

update: 修改代码，遵守代码规范

parent be67b6e1
Showing with 212 additions and 186 deletions
package.json
......@@ -17,7 +17,6 @@
"clipboard": "^2.0.4",
"core-js": "^2.6.5",
"element-ui": "^2.13.2",
"sass": "^1.26.10",
"vue": "^2.6.10",
"vue-router": "^3.0.3",
"vuex": "^3.0.1"
......@@ -37,6 +36,7 @@
"less-loader": "^5.0.0",
"lint-staged": "^8.1.5",
"qs": "^6.7.0",
"sass": "^1.26.10",
"sass-loader": "^9.0.2",
"style-resources-loader": "^1.3.3",
"stylus": "^0.54.5",
......
src/api/enterprise.js
......@@ -5,6 +5,6 @@ let api = {
getEnterpriseDetail: '/enterprise-detail', // 获取企业详情
refreshEnterpriseInfo: '/setting/wx-enterprise-info-flush', // 刷新企业信息
storeRangeDetail: '/store-range-detail', // 查询绑定信息
}
};
export default getFetch(api, '/hb-manage-operation-web');
src/api/get-fetch.js
import { request } from '@/utils/request.js';
export default function getFetch (api, baseUrl) {
export default function getFetch(api, baseUrl) {
api = api || {};
let keys = Object.keys(api);
keys.forEach(key => {
......@@ -8,6 +8,6 @@ export default function getFetch (api, baseUrl) {
if (typeof opt === 'string') opt = { url: opt };
opt.url = `${baseUrl}${opt.url}`;
api[key] = params => request(opt, params);
})
});
return api;
}
src/api/index.js
......@@ -5,16 +5,16 @@ let api = {
getUserInfo: '/user/userinfo',
// 登出
getLoginOut: '/logout'
}
};
let api1 = {
isLogin: {
url: '/login',
useIntercept: false
}
}
};
api = getFetch(api, '/gic-operation-web');
api1 = getFetch(api1, '/hb-manage-operation-web')
api1 = getFetch(api1, '/hb-manage-operation-web');
export default { ...api, ...api1 };
\ No newline at end of file
src/api/permission.js
......@@ -15,6 +15,6 @@ const api = {
delOperationItem: '/del-operation-item', // 删除操作项
haobanVersionList: '/haoban-version-list', // 获取好办版本列表
appVersionList: '/app-version-list', // 获取应用版本列表
}
};
export default getFetch(api, '/hb-manage-operation-web');
src/common/js/public.js
......@@ -8,12 +8,12 @@
*/
// 防抖
export function _debounce(fn, delay) {
var delay = delay || 200;
var timer;
delay = delay || 200;
let timer;
// console.log(fn)
return function() {
var that = this;
var args = arguments;
let that = this;
let args = arguments;
if (timer) {
clearTimeout(timer);
}
......@@ -25,13 +25,13 @@ export function _debounce(fn, delay) {
}
// 节流
export function _throttle(fn, interval) {
var last;
var timer;
var interval = interval || 200;
let last;
let timer;
interval = interval || 200;
return function() {
var that = this;
var args = arguments;
var now = +new Date();
let that = this;
let args = arguments;
let now = +new Date();
if (last && now - last < interval) {
clearTimeout(timer);
timer = setTimeout(function() {
......@@ -48,6 +48,7 @@ export function _throttle(fn, interval) {
/**
* 手机号格式化
* @param {String} phone
* @return {string}
*/
export function formatPhone(phone) {
phone = phone.toString();
......@@ -75,11 +76,13 @@ export function formatDate(time) {
/**
* 千位分割
* @param {number} num
* @return {string}
*/
export function formatNum(num) {
let number = num.toString().split('.'); // 分隔小数点
let dot = '0.' + (number[1] || 0);
var reg = /\d{1,3}(?=(\d{3})+$)/g;
let reg = /\d{1,3}(?=(\d{3})+$)/g;
return (
(number[0] + '').replace(reg, '$&,') +
'.' +
......
src/common/js/strlen.js
......@@ -14,6 +14,8 @@
export default {
/**
* 一个汉字算两个字符,一个英文字母或数字算一个字符
* @param {string} val
* @return {number}
*/
getByteLen: function(val) {
let valStr = val == '' || val == null ? '' : val;
......@@ -30,6 +32,8 @@ export default {
},
/**
* 一个汉字算一个字,一个英文字母或数字算半个字
* @param {string} val
* @return {number}
*/
getZhLen: function(val) {
let valStr = val == '' || val == null ? '' : val;
......@@ -45,26 +49,29 @@ export default {
return Math.ceil(len);
},
/*暂无用*/
/* 暂无用*/
cutStr: function(str, len, type) {
let char_length = 0;
let charLength = 0;
for (let i = 0; i < str.length; i++) {
let son_str = str.charAt(i);
let sonStr = str.charAt(i);
if (type == 1) {
encodeURI(son_str).length > 2 ? (char_length += 1) : (char_length += 0.5);
encodeURI(sonStr).length > 2 ? (charLength += 1) : (charLength += 0.5);
}
if (type == 2) {
char_length += 1;
charLength += 1;
}
if (char_length >= len) {
let sub_len = char_length == len ? i + 1 : i;
return str.substr(0, sub_len);
if (charLength >= len) {
let subLen = charLength == len ? i + 1 : i;
return str.substr(0, subLen);
}
}
},
/**
* 限制字数用, 一个汉字算一个字,两个英文/字母算一个字
* @param {string} val
* @param {number} max
* @return {string}
*/
getByteVal: function(val, max) {
let valStr = val == '' || val == null ? '' : val;
......@@ -81,6 +88,9 @@ export default {
/**
* 限制字符数用, 一个汉字算两个字符,一个英文/字母算一个字符
* @param {string} val
* @param {number} max
* @return {string}
*/
getCharVal: function(val, max) {
let valStr = val == '' || val == null ? '' : val;
......@@ -97,6 +107,8 @@ export default {
/**
* 正则校验,校验非负数字
* @param {string|number} v
* @return {boolean}
*/
regPos: function(v) {
let regTest = /^\d+(\.\d+)?$/;
......
src/common/js/time-format.js
......@@ -17,31 +17,31 @@ export default {
* var storeBusinessTime="10:00-22:00" to
*/
timeToDate: function(val) {
var date = new Date()
var y = date.getFullYear();
var m = date.getMonth() +1;
var day = date.getDate();
let date = new Date();
let y = date.getFullYear();
let m = date.getMonth() + 1;
let day = date.getDate();
var d = []; var newArr = [];
var dArr = val.split('-');
dArr.forEach(function(ele,index){
newArr.push(ele.split(':'))
})
d = [new Date(y,m,day,newArr[0][0],newArr[0][1]),new Date(y,m,day,newArr[1][0],newArr[1][1])]
let d = []; let newArr = [];
let dArr = val.split('-');
dArr.forEach(function(ele, index){
newArr.push(ele.split(':'));
});
d = [ new Date(y, m, day, newArr[0][0], newArr[0][1]), new Date(y, m, day, newArr[1][0], newArr[1][1]) ];
return d;
},
dateToTime(val) {
console.log(val)
console.log(val);
// (0-9)年月数字的显示
function formatDig(num) {
return num > 9 ? '' + num : '0' + num;
}
var t;
var t1 = formatDig(new Date(val[0]).getHours())+':'+formatDig(new Date(val[0]).getMinutes())
var t2 = formatDig(new Date(val[1]).getHours())+':'+formatDig(new Date(val[1]).getMinutes())
t= t1+'-'+t2
let t;
let t1 = formatDig(new Date(val[0]).getHours()) + ':' + formatDig(new Date(val[0]).getMinutes());
let t2 = formatDig(new Date(val[1]).getHours()) + ':' + formatDig(new Date(val[1]).getMinutes());
t = t1 + '-' + t2;
return t;
}
}
};
src/filters/index.js
......@@ -35,7 +35,8 @@ const dateFormat = function(timeSpan, format) {
/**
* 时间戳---> 年-月-日 时:分:秒
* @param timestamp
* @param {timestamp} data
* @return {undefined|string}
*/
const formatTimeStamp = function(data) {
if (!data) {
......@@ -53,7 +54,8 @@ const formatTimeStamp = function(data) {
/**
* 时间戳---> 年.月.日 时:分:秒
* @param timestamp
* @param {timestamp} data
* @return {undefined|string}
*/
const formatTimeYmdHms = function(data) {
if (!data) {
......@@ -71,7 +73,8 @@ const formatTimeYmdHms = function(data) {
/**
* 时间戳---> 年-月
* @param timestamp
* @param {timestamp} data timestamp
* @return {undefined|string}
*/
const timeStampToYm = function(data) {
if (!data) {
......@@ -85,7 +88,8 @@ const timeStampToYm = function(data) {
/**
* 时间戳---> 年-月-日
* @param timestamp
* @param {timestamp} data
* @return {undefined|string}
*/
const timeStampToYmd = function(data) {
if (!data) {
......@@ -100,7 +104,8 @@ const timeStampToYmd = function(data) {
/**
* 时间戳---> 时:分:秒
* @param timestamp
* @param {timestamp} data
* @return {undefined|string}
*/
const timeStampToHms = function(data) {
if (!data) {
......@@ -115,26 +120,27 @@ const timeStampToHms = function(data) {
/**
* 时间戳---> *天*小时*分
* @param timestamp
* @param {timestamp} date
* @return {undefined|string}
*/
const timeStampSpace = function(date) {
if (!date) {
return;
}
let date2 = new Date();
let date3 = new Date(Number(date)).getTime() - date2.getTime(); //时间差的毫秒数
let date3 = new Date(Number(date)).getTime() - date2.getTime(); // 时间差的毫秒数
if (date3 < 0) {
return '';
}
//计算出相差天数
// 计算出相差天数
let days = Math.floor(date3 / (24 * 3600 * 1000));
//计算出小时数
let leave1 = date3 % (24 * 3600 * 1000); //计算天数后剩余的毫秒数
// 计算出小时数
let leave1 = date3 % (24 * 3600 * 1000); // 计算天数后剩余的毫秒数
let hours = Math.floor(leave1 / (3600 * 1000));
//计算相差分钟数
let leave2 = leave1 % (3600 * 1000); //计算小时数后剩余的毫秒数
// 计算相差分钟数
let leave2 = leave1 % (3600 * 1000); // 计算小时数后剩余的毫秒数
let minutes = Math.floor(leave2 / (60 * 1000));
//计算相差秒数
// 计算相差秒数
// let leave3 = leave2 % (60 * 1000); //计算分钟数后剩余的毫秒数
// let seconds = Math.round(leave3 / 1000);
return `${days}天${hours}小时${minutes}分`;
......@@ -142,7 +148,8 @@ const timeStampSpace = function(date) {
/**
* 手机号格式化
* @param {String} phone
* @param {string} phone
* @return {string}
*/
const formatPhoneNum = function(phone) {
if (!phone) {
......@@ -154,7 +161,8 @@ const formatPhoneNum = function(phone) {
/**
* 姓名格式化
* @param {String} phone
* @param {string} name
* @return {string}
*/
const formatName = function(name) {
if (!name) {
......@@ -166,7 +174,8 @@ const formatName = function(name) {
/**
* 毫秒---> *时*分*秒
* @param timestamp
* @param {timestamp} msTime
* @return {string}
*/
const formatTime = function(msTime) {
if (!msTime) {
......
src/layout/aside-menu.vue
......@@ -58,7 +58,7 @@ export default {
if (Array.isArray(item.nodeChildren) && item.nodeChildren.length > 0) {
item.collapsFlag = !item.collapsFlag;
} else {
this.$router.push({path: item.uri});
this.$router.push({ path: item.uri });
}
},
},
......@@ -78,12 +78,12 @@ export default {
function setCollapsFlag(arr) {
arr = arr.slice();
return arr.map(item => {
that.$set(item, 'collapsFlag', true)
that.$set(item, 'collapsFlag', true);
if (item.nodeChildren && item.nodeChildren.length > 0) {
item.nodeChildren = setCollapsFlag(item.nodeChildren);
}
return item;
})
});
}
}
}
......
src/layout/layout.vue
......@@ -24,7 +24,7 @@ export default {
return {
menu: [],
breadList: []
}
};
},
methods: {
updateAsideMenu(menu) {
......@@ -39,7 +39,7 @@ export default {
this.breadList = [];
}
}
}
};
</script>
<style lang="less" scoped>
......
src/layout/yw-header.vue
......@@ -37,7 +37,7 @@
</template>
<script>
import { origin, succCode } from '@/config'
import { origin, succCode } from '@/config';
import fetch from '@/api';
const { getUserInfo, getLoginOut, isLogin } = fetch;
export default {
......@@ -47,7 +47,7 @@ export default {
origin,
userInfo: {},
showUserInfo: false
}
};
},
created() {
this.getUserInfo();
......@@ -66,8 +66,8 @@ export default {
this.$emit('updateAsideMenu', result.menuTree || []);
}).catch(e => {
window.location.reload();
})
})
});
});
},
// 退出登录
onLoginOut() {
......@@ -75,11 +75,11 @@ export default {
getLoginOut().then(res => {
this.$message.success('退出成功');
window.location.href = '/operation-platform/#/';
})
})
});
});
}
}
}
};
</script>
<style lang="less" scoped>
......
src/main.js
......@@ -41,4 +41,4 @@ Object.keys(filters).forEach(key => {
new Vue({
router,
render: h => h(App)
}).$mount('#app')
}).$mount('#app');
src/router/routes.js
......@@ -61,4 +61,4 @@ export const routes = [
redirect: '/404',
hidden: true
}
]
];
src/utils/auth.js
const TokenKey = 'Admin-Token'
const TokenKey = 'Admin-Token';
export function getToken() {
return localStorage.getItem(TokenKey);
......
src/utils/clipboard.js
import Vue from 'vue'
import Clipboard from 'clipboard'
import Vue from 'vue';
import Clipboard from 'clipboard';
function clipboardSuccess() {
Vue.prototype.$message({
message: '复制成功',
type: 'success',
duration: 1500
})
});
}
function clipboardError() {
Vue.prototype.$message({
message: '复制失败',
type: 'error'
})
});
}
export default function handleClipboard(text, event) {
const clipboard = new Clipboard(event.target, {
text: () => text
})
});
clipboard.on('success', () => {
clipboardSuccess()
clipboard.off('error')
clipboard.off('success')
clipboard.destroy()
})
clipboardSuccess();
clipboard.off('error');
clipboard.off('success');
clipboard.destroy();
});
clipboard.on('error', () => {
clipboardError()
clipboard.off('error')
clipboard.off('success')
clipboard.destroy()
})
clipboard.onClick(event)
clipboardError();
clipboard.off('error');
clipboard.off('success');
clipboard.destroy();
});
clipboard.onClick(event);
}
src/utils/common.js
......@@ -3,13 +3,14 @@
* @param {string} uri 原始url
* @param {string} key 追加的key
* @param {string} value 追加的key的value
* @return {string}
*/
export const updateQueryStringParameter = (uri, key, value) => {
if (!value) {
return uri;
}
var re = new RegExp('([?&])' + key + '=.*?(&|$)', 'i');
var separator = uri.indexOf('?') !== -1 ? '&' : '?';
const re = new RegExp('([?&])' + key + '=.*?(&|$)', 'i');
const separator = uri.indexOf('?') !== -1 ? '&' : '?';
if (uri.match(re)) {
return uri.replace(re, '$1' + key + '=' + value + '$2');
} else {
......
src/utils/request.js
......@@ -28,7 +28,7 @@ const request = (opt, params) => {
useIntercept: true,
// 设置headers， 但是好像没效果，以后再说吧
headers: {}
}
};
requestConfig = Object.assign(requestConfig, opt);
if (requestConfig.useFormData) params = qs.stringify(params);
switch (requestConfig.method.toLowerCase()) {
......@@ -60,18 +60,18 @@ const request = (opt, params) => {
const response = error.response || {};
const { data, status } = response;
if (status === 401) {
let url = isPro ? '../operation-platform/' : 'https://four.gicdev.com/operation-platform/'
let url = isPro ? '../operation-platform/' : 'https://four.gicdev.com/operation-platform/';
window.location.href = url;
}
if (data && data.message) {
Message({
message: data.message,
type: 'warning'
})
});
}
reject(error);
})
});
});
}
};
export {axios, request};
export { axios, request };
src/views/enterprise/enterprise-detail.vue
......@@ -103,7 +103,7 @@ export default {
data: [],
selected: []
}
}
};
},
created() {
const { enterpriseId } = this.$route.query;
......@@ -118,7 +118,7 @@ export default {
getEnterpriseDetail() {
getEnterpriseDetail({ wxEnterpriseId: this.enterpriseId }).then(res => {
Object.assign(this.enterpriseDetail, res.result);
})
});
},
onRefresh() {
refreshEnterpriseInfo().then(this.getEnterpriseDetail);
......@@ -134,25 +134,25 @@ export default {
return result.length > 0 ? result.join('/') : '--';
},
getBindDetail(storeData, type) {
const { wxEnterpriseId, enterpriseId } = storeData
const { wxEnterpriseId, enterpriseId } = storeData;
const params = {
wxEnterpriseId,
enterpriseId,
operationType: type, // 0 门店绑定 1门店分享
}
};
this.bindInfo.show = true;
this.bindInfo.type = type;
storeRangeDetail(params).then(res => {
this.bindInfo.data = res.result || [];
this.bindInfo.selected = this.bindInfo.data.map(el => el.id);
})
});
},
onBindInfoClose() {
this.bindInfo.data = [];
this.bindInfo.selected = [];
}
}
}
};
</script>
<style lang="less" scoped>
......
src/views/enterprise/enterprise-list.vue
......@@ -82,13 +82,13 @@ export default {
// 分页相关的数据
pager: {
total: 0,
pageSizes: [20, 40, 60, 80],
pageSizes: [ 20, 40, 60, 80 ],
pageSize: 20,
currentPage: 1
},
// 企业列表
enterpriseList: []
}
};
},
created() {
this.getEnterpriseList();
......@@ -104,12 +104,12 @@ export default {
bindFlag,
pageSize,
pageNum: currentPage
}
};
getEnterpriseList(params).then(res => {
const { totalCount, result } = res.result || {};
this.pager.total = totalCount || 0;
this.enterpriseList = result || [];
})
});
},
onSearch() {
this.pager.currentPage = 1;
......@@ -130,7 +130,7 @@ export default {
result = el.label;
}
return el.value == val;
})
});
return result;
},
toEnterpriseDetail(enterpriseData) {
......@@ -138,7 +138,7 @@ export default {
this.$router.push(`/enterprise-detail?enterpriseId=${wxEnterpriseId}`);
}
}
}
};
</script>
<style scoped>
......
src/views/error-page/403.vue
......@@ -14,13 +14,13 @@
</template>
<script>
import img_403 from '@/assets/403_images/error_403.svg';
import img403 from '@/assets/403_images/error_403.svg';
export default {
name: 'Page403',
data() {
return {
img_403
img403
};
},
computed: {
......
src/views/error-page/404.vue
......@@ -14,13 +14,13 @@
</template>
<script>
import img_404 from '@/assets/404_images/error_404.svg';
import img404 from '@/assets/404_images/error_404.svg';
export default {
name: 'Page404',
data() {
return {
img_404
img404
};
},
computed: {
......
src/views/error-page/500.vue
......@@ -14,13 +14,13 @@
</template>
<script>
import img_500 from '@/assets/500_images/error_500.svg';
import img500 from '@/assets/500_images/error_500.svg';
export default {
name: 'Page500',
data() {
return {
img_500
img500
};
},
computed: {
......
src/views/error-page/gic-error.vue
......@@ -22,13 +22,13 @@
</template>
<script>
import img_404 from '@/assets/gic-error.png';
import img404 from '@/assets/gic-error.png';
export default {
name: 'Page404',
data() {
return {
img_404
img404
};
},
computed: {
......
src/views/error-page/index.vue
......@@ -22,9 +22,9 @@
</template>
<script>
import img_403 from '@/assets/403_images/error_403.svg';
import img_404 from '@/assets/404_images/error_404.svg';
import img_500 from '@/assets/500_images/error_500.svg';
import img403 from '@/assets/403_images/error_403.svg';
import img404 from '@/assets/404_images/error_404.svg';
import img500 from '@/assets/500_images/error_500.svg';
export default {
name: 'Index',
......@@ -33,9 +33,9 @@ export default {
imgSrc: '',
message: '',
srcList: {
403: img_403,
404: img_404,
500: img_500
403: img403,
404: img404,
500: img500
},
msgList: {
403: '抱歉，你无权访问该页面',
......@@ -45,8 +45,8 @@ export default {
};
},
mounted() {
var that = this;
var path = that.$route.path.split('/')[1];
let that = this;
let path = that.$route.path.split('/')[1];
that.imgSrc = that.srcList[path];
that.message = that.msgList[path];
}
......
src/views/permission/menu-config.vue
......@@ -24,9 +24,9 @@ export default {
data() {
return {
activeName: 'first'
}
};
}
}
};
</script>
<style lang="less" scoped>
......
src/views/permission/menu-config/menu-list.vue
......@@ -133,7 +133,7 @@ const { getMenuList, addMenu, editMenu, delMenu, haobanVersionList, appVersionLi
export default {
name: 'MenuList',
props: {
appType: [String, Number]
appType: [ String, Number ]
},
data() {
return {
......@@ -162,24 +162,24 @@ export default {
roleRange: 1, // 1管理员适用2管理员和门店适用3门店适用
},
editMenuRules: {
hbVersion: [{ required: true, message: '请选择好办版本', trigger: 'change' }],
menuName: [{ required: true, message: '页面名称不能为空', trigger: 'blur' }],
code: [{ required: true, message: '页面code不能为空', trigger: 'blur' }]
hbVersion: [ { required: true, message: '请选择好办版本', trigger: 'change' } ],
menuName: [ { required: true, message: '页面名称不能为空', trigger: 'blur' } ],
code: [ { required: true, message: '页面code不能为空', trigger: 'blur' } ]
}
}
};
},
mounted() {
this.menuList = [];
this.initData()
this.initData();
},
methods: {
initData() {
haobanVersionList().then(res => {
this.haobanVersionList = res.result || [];
})
});
appVersionList().then(res => {
this.appVersionList = res.result || [];
})
});
this.getMenuList();
},
// 获取节点列表数据
......@@ -188,10 +188,10 @@ export default {
menuId: '',
appType: this.appType,
keyword: this.search
}
};
getMenuList(params).then(res => {
this.menuList = this.flatDataToTree(res.result || []);
})
});
},
// 收起、展开子节点
onExpandChange() {
......@@ -199,7 +199,7 @@ export default {
this.$nextTick(() => {
this.expand = !this.expand;
this.showTable = true;
})
});
},
// 新建节点、新建子节点、编辑节点弹窗打开
onEditMenu(menuData, isSubMenu) {
......@@ -246,7 +246,7 @@ export default {
openType: 0,
menuFlag: 1,
roleRange: 1
})
});
this.$nextTick(this.$refs.editMenu.clearValidate);
},
// 新建节点、新建子节点、编辑节点弹窗保存
......@@ -263,7 +263,7 @@ export default {
openType,
menuFlag,
roleRange
}
};
if (parentId) {
params.parentId = parentId;
}
......@@ -283,7 +283,7 @@ export default {
this.$message.success(msg);
this.getMenuList();
}
})
});
},
// 删除节点
onDelMenu(menuData) {
......@@ -292,13 +292,13 @@ export default {
delMenu({ menuId }).then(res => {
this.$message.success('删除成功！');
this.getMenuList();
})
})
});
});
},
// 跳转到权限项列表页
toPermissionList(menuData) {
const { menuId } = menuData;
this.$router.push(`/permission-list?menuId=${menuId}&appType=${this.appType}`)
this.$router.push(`/permission-list?menuId=${menuId}&appType=${this.appType}`);
},
flatDataToTree(data) {
return data.filter(el => {
......@@ -308,8 +308,8 @@ export default {
el.children = children; // 如果存在子级，则给父级添加一个children属性，并赋值
}
return el.parentId == 0;
})
});
},
}
}
};
</script>
src/views/permission/operation-list.vue
......@@ -24,14 +24,14 @@ export default {
data() {
return {
activeName: 'first'
}
};
},
created() {
const { type } = this.$route.query;
const tabs = ['', 'first', 'second', 'third', 'fourth'];
const tabs = [ '', 'first', 'second', 'third', 'fourth' ];
this.activeName = tabs[type > 0 && type < 5 ? type : 1] ;
}
}
};
</script>
<style lang="less" scoped>
......
src/views/permission/operation-list/operation-table.vue
......@@ -112,7 +112,7 @@ const { getOperationItemList, addOperationItem, editOperationItem, delOperationI
export default {
name: 'OperationTable',
props: {
appType: [String, Number]
appType: [ String, Number ]
},
data() {
return {
......@@ -128,7 +128,7 @@ export default {
// 分页相关的数据
pager: {
total: 0,
pageSizes: [20, 40, 60, 80],
pageSizes: [ 20, 40, 60, 80 ],
pageSize: 20,
currentPage: 1
},
......@@ -149,12 +149,12 @@ export default {
version: ''
},
editOperationRule: {
menuId: [{ required: true, message: '请选择节点', trigger: 'change' }],
version: [{ required: true, message: '请选择版本', trigger: 'change' }],
operationItemName: [{ required: true, message: '操作项名称不能为空', trigger: 'blur' }],
operationItemCode: [{ required: true, message: '操作项code不能为空', trigger: 'blur' }],
menuId: [ { required: true, message: '请选择节点', trigger: 'change' } ],
version: [ { required: true, message: '请选择版本', trigger: 'change' } ],
operationItemName: [ { required: true, message: '操作项名称不能为空', trigger: 'blur' } ],
operationItemCode: [ { required: true, message: '操作项code不能为空', trigger: 'blur' } ],
}
}
};
},
created() {
this.initData();
......@@ -165,13 +165,13 @@ export default {
getMenuList({ appType: this.appType }).then(res => {
this.flatMenuList = res.result || [];
this.menuList = this.flatDataToTree(res.result || []);
})
});
haobanVersionList().then(res => {
this.haobanVersionList = res.result || [];
})
});
appVersionList().then(res => {
this.appVersionList = res.result || [];
})
});
},
// 获取操作项列表
getOperationList() {
......@@ -181,12 +181,12 @@ export default {
pageNum: currentPage,
pageSize,
appType: this.appType
}
};
getOperationItemList(params).then(res => {
const { totalCount, result } = res.result || {};
this.pager.total = totalCount || 0;
this.operationList = result || [];
})
});
},
onSearch() {
this.pager.currentPage = 1;
......@@ -221,8 +221,8 @@ export default {
if (el.menuId == menuId && el.parentId > 0) {
result = getFullId(menuList, el.parentId).concat(result);
}
return el.menuId == menuId
})
return el.menuId == menuId;
});
return result;
}
},
......@@ -239,7 +239,7 @@ export default {
roleRange: '1',
version: '',
appType: ''
})
});
this.$nextTick(this.$refs.editOperation.clearValidate);
},
onMenuChange(menuIds) {
......@@ -248,7 +248,7 @@ export default {
if (el.menuId == menuId) {
this.editOperation.menuCode = el.code;
}
return el.menuId == menuId
return el.menuId == menuId;
});
},
// 新建、编辑操作项 弹窗保存
......@@ -265,7 +265,7 @@ export default {
authItemFlag,
roleRange,
version
}
};
this.editOperation.loading = true;
if (operationItemId) {
......@@ -280,7 +280,7 @@ export default {
this.editOperation.show = false;
this.getOperationList();
}
})
});
},
// 删除操作项
onDel(operationData) {
......@@ -292,8 +292,8 @@ export default {
this.pager.currentPage--;
}
this.getOperationList();
})
})
});
});
},
flatDataToTree(data) {
return data.filter(el => {
......@@ -303,8 +303,8 @@ export default {
el.children = children; // 如果存在子级，则给父级添加一个children属性，并赋值
}
return el.parentId == 0;
})
});
},
}
}
};
</script>
src/views/permission/permission-list.vue
......@@ -55,8 +55,8 @@ export default {
data() {
return {
bread: [
{ path: '/menu-config', name: '权限配置'},
{ name: '权限项'}
{ path: '/menu-config', name: '权限配置' },
{ name: '权限项' }
],
menuId: '',
appType: '',
......@@ -73,10 +73,10 @@ export default {
operationItemIds: [] // 包含的操作项id
},
editAuthRule: {
authItemName: [{ required: true, message: '权限项名称不能为空', trigger: 'blur' }],
operationItemIds: [{ required: true, message: '请至少选择一个操作项', trigger: 'change' }]
authItemName: [ { required: true, message: '权限项名称不能为空', trigger: 'blur' } ],
operationItemIds: [ { required: true, message: '请至少选择一个操作项', trigger: 'change' } ]
}
}
};
},
created() {
const { menuId, appType } = this.$route.query;
......@@ -86,7 +86,7 @@ export default {
this.menuId = menuId;
this.appType = appType;
this.initData();
this.$emit('updateBread', this.bread)
this.$emit('updateBread', this.bread);
},
methods: {
initData() {
......@@ -105,13 +105,13 @@ export default {
if (pageNum + 1 <= totalPage) {
this.getOperationItemList(pageNum + 1);
}
})
});
},
// 获取权限项列表
getAuthItemList() {
getAuthItemList({ menuId: this.menuId }).then(res => {
this.authList = res.result || [];
})
});
},
// 编辑权限项弹窗打开
onEditAuthOpen(authData) {
......@@ -121,7 +121,7 @@ export default {
operationItemIds: Array.isArray(operationItemList) ? operationItemList.map(el => el.operationItemId) : [],
authItemId,
authItemName,
})
});
},
// 新建、编辑权限项弹窗关闭
onEditAuthClose() {
......@@ -141,7 +141,7 @@ export default {
authItemName: emojiToStr(authItemName),
operationItemIds: operationItemIds.join(','),
menuId: this.menuId
}
};
this.editAuth.loading = true;
if (authItemId) {
params.authItemId = authItemId;
......@@ -154,7 +154,7 @@ export default {
this.editAuth.show = false;
this.getAuthItemList();
}
})
});
},
// 删除权限项
onDelAuth(authData) {
......@@ -163,13 +163,13 @@ export default {
delAuthItem({ authItemId }).then(res => {
this.$message.success('删除成功！');
this.getAuthItemList();
})
})
});
});
},
// 去操作项列表页
toOperationList() {
this.$router.push(`/operation-list?type=${this.appType}`);
}
}
}
};
</script>
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