Skip to content

D
dcxy-manage-shell
Commit d4b0897e by 姜雷
Options

Merge branch 'test' into 'master'

Test See merge request !181
parents c740451b 1783eefb
Showing with 39 additions and 30 deletions
babel.config.js
...@@ -3,7 +3,7 @@ if (process.env.NODE_ENV === 'production') { ...@@ -3,7 +3,7 @@ if (process.env.NODE_ENV === 'production') {
removeConsolePlugin.push([ removeConsolePlugin.push([
'transform-remove-console', 'transform-remove-console',
{ {
exclude: ['error', 'warn'], exclude: ['error', 'warn', 'table'],
}, },
]); ]);
} }
......
public/index.html
...@@ -4,22 +4,12 @@ ...@@ -4,22 +4,12 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
<meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Expires" content="0" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" /> <meta name="viewport" content="width=device-width,initial-scale=1.0" />
<link rel="icon" href="<%= BASE_URL %>ic_logo.ico" /> <link rel="icon" href="<%= BASE_URL %>ic_logo.ico" />
<script src="<%= BASE_URL %>system.js"></script> <script src="<%= BASE_URL %>system.js"></script>
<script src="https://unpkg.com/vue@2.6.10/dist/vue.js"></script> <script src="https://unpkg.com/vue@2.6.10/dist/vue.js"></script>
<script src="https://unpkg.com/vuex@3.1.0/dist/vuex.js"></script> <script src="https://unpkg.com/vuex@3.1.0/dist/vuex.js"></script>
<script src="https://unpkg.com/vue-router@3.0.1/dist/vue-router.js"></script> <script src="https://unpkg.com/vue-router@3.0.1/dist/vue-router.js"></script>
<link rel="stylesheet" href="<%= VUE_APP_SUBSYSTEM %>/customerManage/lib/customerManage.css" />
<link rel="stylesheet" href="<%= VUE_APP_SUBSYSTEM %>/baseManage/lib/baseManage.css" />
<link rel="stylesheet" href="<%= VUE_APP_SUBSYSTEM %>/systemManage/lib/systemManage.css" />
<link rel="stylesheet" href="<%= VUE_APP_SUBSYSTEM %>/operateManage/lib/operateManage.css" />
<link rel="stylesheet" href="<%= VUE_APP_SUBSYSTEM %>/statisticsManage/lib/statisticsManage.css" />
<link rel="stylesheet" href="<%= VUE_APP_SUBSYSTEM %>/deviceManage/lib/deviceManage.css" />
<link rel="stylesheet" href="<%= VUE_APP_SUBSYSTEM %>/smaproManage/lib/smaproManage.css" />
<title>多彩综合管理系统</title> <title>多彩综合管理系统</title>
</head> </head>
......
src/components/input/AreaSelect/AreaSelect.vue
...@@ -26,7 +26,7 @@ export default { ...@@ -26,7 +26,7 @@ export default {
value: Number, value: Number,
disabled: Boolean, disabled: Boolean,
clearable: { clearable: {
type:Boolean, type: Boolean,
default: true, default: true,
}, },
}, },
...@@ -35,8 +35,10 @@ export default { ...@@ -35,8 +35,10 @@ export default {
changeHandle(val) { changeHandle(val) {
if (val) { if (val) {
this.$emit('input', val); this.$emit('input', val);
this.$emit('change', val);
} else { } else {
this.$emit('input', null); this.$emit('input', null);
this.$emit('change', null);
} }
}, },
}, },
......
src/components/input/AreaServiceSelect/AreaServiceSelect.vue
...@@ -40,8 +40,10 @@ export default { ...@@ -40,8 +40,10 @@ export default {
changeHandle(val) { changeHandle(val) {
if (val || val === 0) { if (val || val === 0) {
this.$emit('input', val); this.$emit('input', val);
this.$emit('change', val);
} else { } else {
this.$emit('input', null); this.$emit('input', null);
this.$emit('change', null);
} }
}, },
disabledValue(val) { disabledValue(val) {
......
src/components/input/BaseDataSelect/BaseDataSelect.vue
...@@ -54,6 +54,12 @@ export default { ...@@ -54,6 +54,12 @@ export default {
}); });
} }
}, },
methods: {
changeHandle(val) {
this.$emit('input', val);
this.$emit('change', val);
},
},
}; };
</script> </script>
src/components/input/BaseDataSelect/mixin.js
...@@ -26,9 +26,6 @@ export default { ...@@ -26,9 +26,6 @@ export default {
}, },
methods: { methods: {
...mapActions(actionsList), ...mapActions(actionsList),
changeHandle(val) {
this.$emit('input', val);
},
getOptionsList(label) { getOptionsList(label) {
let optionValue = this.getOptionsValue(label); let optionValue = this.getOptionsValue(label);
if (optionValue) { if (optionValue) {
......
src/components/input/BeanTypeSelect/BeanTypeSelect.vue
...@@ -33,6 +33,7 @@ export default { ...@@ -33,6 +33,7 @@ export default {
methods: { methods: {
changeHandle(val) { changeHandle(val) {
this.$emit('input', val); this.$emit('input', val);
this.$emit('change', val);
}, },
}, },
}; };
......
src/components/input/OperatorSelect/OperatorSelect.vue
...@@ -31,7 +31,7 @@ export default { ...@@ -31,7 +31,7 @@ export default {
}, },
disabled: Boolean, disabled: Boolean,
clearable: { clearable: {
type:Boolean, type: Boolean,
default: true, default: true,
}, },
}, },
...@@ -46,8 +46,10 @@ export default { ...@@ -46,8 +46,10 @@ export default {
changeHandle(val) { changeHandle(val) {
if (!val) { if (!val) {
this.$emit('input', null); this.$emit('input', null);
this.$emit('change', null);
} else { } else {
this.$emit('input', val); this.$emit('input', val);
this.$emit('change', val);
} }
}, },
}, },
......
src/components/input/ServiceTypeSelect/ServiceTypeSelect.vue
...@@ -40,8 +40,10 @@ export default { ...@@ -40,8 +40,10 @@ export default {
changeHandle(val) { changeHandle(val) {
if (val || val === 0) { if (val || val === 0) {
this.$emit('input', val); this.$emit('input', val);
this.$emit('change', val);
} else { } else {
this.$emit('input', null); this.$emit('input', null);
this.$emit('change', null);
} }
}, },
}, },
......
src/dev-local/develop.html
...@@ -4,22 +4,12 @@ ...@@ -4,22 +4,12 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
<meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Expires" content="0" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" /> <meta name="viewport" content="width=device-width,initial-scale=1.0" />
<link rel="icon" href="<%= BASE_URL %>ic_logo.ico" /> <link rel="icon" href="<%= BASE_URL %>ic_logo.ico" />
<script src="<%= BASE_URL %>system.js"></script> <script src="<%= BASE_URL %>system.js"></script>
<script src="https://unpkg.com/vue@2.6.10/dist/vue.js"></script> <script src="https://unpkg.com/vue@2.6.10/dist/vue.js"></script>
<script src="https://unpkg.com/vuex@3.1.0/dist/vuex.js"></script> <script src="https://unpkg.com/vuex@3.1.0/dist/vuex.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vue-router@3.0.1/dist/vue-router.js"></script> <script src="https://cdn.jsdelivr.net/npm/vue-router@3.0.1/dist/vue-router.js"></script>
<link rel="stylesheet" href="<%= VUE_APP_SUBSYSTEM %>/customerManage/lib/customerManage.css" />
<link rel="stylesheet" href="<%= VUE_APP_SUBSYSTEM %>/baseManage/lib/baseManage.css" />
<link rel="stylesheet" href="<%= VUE_APP_SUBSYSTEM %>/systemManage/lib/systemManage.css" />
<link rel="stylesheet" href="<%= VUE_APP_SUBSYSTEM %>/operateManage/lib/operateManage.css" />
<link rel="stylesheet" href="<%= VUE_APP_SUBSYSTEM %>/statisticsManage/lib/statisticsManage.css" />
<link rel="stylesheet" href="<%= VUE_APP_SUBSYSTEM %>/deviceManage/lib/deviceManage.css" />
<link rel="stylesheet" href="<%= VUE_APP_SUBSYSTEM %>/smaproManage/lib/smaproManage.css" />
<title>多彩综合管理系统</title> <title>多彩综合管理系统</title>
</head> </head>
......
src/dev-local/develop.js
...@@ -43,9 +43,19 @@ script.text = ` ...@@ -43,9 +43,19 @@ script.text = `
'deviceManage', 'deviceManage',
'smaproManage', 'smaproManage',
]; ];
Promise.all(routeNameList.map(name => System.import('${ Promise.all(routeNameList.map(name => {
process.env.VUE_APP_SUBSYSTEM var node = document.createElement("link");
}/' + name + '/lib/' + name + '.umd.min.js?t=${new Date().getTime()}'))).then(res => { node.rel = "stylesheet";
node.type = "text/css";
node.href = '${
process.env.VUE_APP_SUBSYSTEM
}/' + name + '/lib/' + name + '.css?t=${new Date().getTime()}';
document.getElementsByTagName("head")[0].appendChild(node);
return System.import('${
process.env.VUE_APP_SUBSYSTEM
}/' + name + '/lib/' + name + '.umd.min.js?t=${new Date().getTime()}')
}))
.then(res => {
for (let index = 0; index < res.length; index++) { for (let index = 0; index < res.length; index++) {
const element = res[index]; const element = res[index];
allAasyncRouterMap = allAasyncRouterMap.concat(element.default.default); allAasyncRouterMap = allAasyncRouterMap.concat(element.default.default);
......
src/main.js
...@@ -36,6 +36,11 @@ script.text = ` ...@@ -36,6 +36,11 @@ script.text = `
]; ];
Promise.all( Promise.all(
routeNameList.map(function(name) { routeNameList.map(function(name) {
var node = document.createElement("link");
node.rel = "stylesheet";
node.type = "text/css";
node.href = '${process.env.VUE_APP_SUBSYSTEM}/' + name + '/lib/' + name + '.css?t=${new Date().getTime()}';
document.getElementsByTagName("head")[0].appendChild(node);
return System.import('${ return System.import('${
process.env.VUE_APP_SUBSYSTEM process.env.VUE_APP_SUBSYSTEM
}/' + name + '/lib/' + name + '.umd.min.js?t=${new Date().getTime()}'); }/' + name + '/lib/' + name + '.umd.min.js?t=${new Date().getTime()}');
...@@ -75,5 +80,6 @@ script.text = ` ...@@ -75,5 +80,6 @@ script.text = `
}, },
}); });
}); });
`; `;
document.body.appendChild(script); document.body.appendChild(script);
src/utils/errorHandler.js
export default (err, vm, info) => { export default (err, vm, info) => {
console.table([err, { info: info }]); console.error(err);
console.table([{ name: 'vm', data: vm }, { name: 'info', data: info }]);
return false; return false;
}; };
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