diff --git a/antdTheme.js b/antdTheme.js index ed1a559..b598cbe 100644 --- a/antdTheme.js +++ b/antdTheme.js @@ -3,7 +3,7 @@ const path = require('path'); const { generateTheme } = require('antd-theme-generator'); const options = { antDir: path.join(__dirname, './node_modules/ant-design-vue'), //依赖位置 - // stylesDir: path.join(__dirname, './src/style'), //处理style下所有less + stylesDir: path.join(__dirname, './src/style'), //处理style下所有less varFile: path.join(__dirname, './src/style/antd-variables.less'), //antd全局变量 themeVariables: [ '@primary-color', diff --git a/public/test1.jpg b/public/test1.jpg new file mode 100644 index 0000000..8d5c87a Binary files /dev/null and b/public/test1.jpg differ diff --git a/public/test2.jpg b/public/test2.jpg new file mode 100644 index 0000000..64bc92f Binary files /dev/null and b/public/test2.jpg differ diff --git a/src/store/modules/styles.js b/src/store/modules/styles.js index f696382..972e67d 100644 --- a/src/store/modules/styles.js +++ b/src/store/modules/styles.js @@ -46,7 +46,7 @@ const store = { // 更新样式 async updateStyles({commit}, data) { console.log(Vue.prototype.$api); - commit('UPDATE_STYLES', data); + // commit('UPDATE_STYLES', data); await httpNodeApi.updateStylesAPI({data}) }, // 获取样式 @@ -58,5 +58,5 @@ const store = { } } // 初始加载时默认更新一次主题 -changeTheme(store.state.data.theme['primary-color']); +// changeTheme(store.state.data.theme['primary-color']); export default store; diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index 4c180b4..f0795c5 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -138,14 +138,16 @@
- 暂无图片 + +

操作前照片

- 暂无图片 + +

操作后照片

@@ -290,12 +292,12 @@ export default { }, methods: { getScanAndCheck() { - // this.scanAndCheck = { - // SystemCode: 'D1H0000147', - // ScanCode: 'D1H0000147', - // SystemNumber: 10, - // CheckNumber: 10 - // } + this.scanAndCheck = { + SystemCode: 'D1H0000147', + ScanCode: 'D1H0000147', + SystemNumber: 10, + CheckNumber: 10 + } this.$api.httpApi.scanAndCheck({ name: 'getData' }).then(res=>{ diff --git a/src/views/updateStyles/index.vue b/src/views/updateStyles/index.vue index 6f28d12..33c9381 100644 --- a/src/views/updateStyles/index.vue +++ b/src/views/updateStyles/index.vue @@ -72,6 +72,7 @@ export default { this.$refs.ruleForm.validate((valid) => { if (valid) { this.updateStyles(this.formData); + this.$message.success('刷新后生效') } else { console.log('error submit!!'); return false;