diff --git a/src/backend/weicai/AppServer.js b/src/backend/weicai/AppServer.js index efd4ab5..c5e383f 100644 --- a/src/backend/weicai/AppServer.js +++ b/src/backend/weicai/AppServer.js @@ -52,6 +52,10 @@ class AppServer { console.log('wechat_history') self.ws['wechat_history'].send(JSON.stringify(data)) }) + self.recorder.on('export_status', (data) => { + console.log('export_status') + self.ws['wcclient'].send(JSON.stringify(data)) + }) self.recorder.on('article_detail', (data) => { console.log('article_detail') self.ws['article_detail'].send(JSON.stringify(data)) diff --git a/src/backend/weicai/app.js b/src/backend/weicai/app.js index ad94ec1..6a783e5 100644 --- a/src/backend/weicai/app.js +++ b/src/backend/weicai/app.js @@ -62,9 +62,20 @@ appServer.route(function(self) { // 标记文件末尾 writerStream.end() writerStream.on('finish', function() { - console.log("写入完成。") + self.recorder.emit('export_status', { + 'type': 'export_status', + 'data': { + 'state': 'success' + } + }) }); writerStream.on('error', function(err) { + self.recorder.emit('export_status', { + 'type': 'export_status', + 'data': { + 'state': 'fail' + } + }) console.log(err.stack) }); res.send({ diff --git a/src/renderer/main.js b/src/renderer/main.js index 5eb3f91..10ff0d0 100644 --- a/src/renderer/main.js +++ b/src/renderer/main.js @@ -22,6 +22,9 @@ socket.addEventListener('message', function(event) { if (data.type == 'toggleMakeImg') { store.dispatch('toggleMakeImg', data.data) } + if (data.type == 'export_status') { + store.dispatch('toggleLoading', data.data) + } }); diff --git a/src/renderer/store/modules/ExportView.js b/src/renderer/store/modules/ExportView.js new file mode 100644 index 0000000..4a88779 --- /dev/null +++ b/src/renderer/store/modules/ExportView.js @@ -0,0 +1,22 @@ +const state = { + loading: false +} + +const mutations = { + toggleLoading(state, data) { + console.log(data) + state.loading = !state.loading; + } +} + +const actions = { + toggleLoading({ commit }, data) { + commit('toggleLoading', data) + } +} + +export default { + state, + mutations, + actions +} diff --git a/src/renderer/view/ExportView/article.vue b/src/renderer/view/ExportView/article.vue index 0033bc5..30d26da 100644 --- a/src/renderer/view/ExportView/article.vue +++ b/src/renderer/view/ExportView/article.vue @@ -12,7 +12,7 @@ 备选导出字段 {{ item.name }} 导出方式 - + @@ -42,6 +42,15 @@ export default { keys_save: [{ 'name': '采集时间', 'field': 'create_time' + }, { + 'name': '文章文本', + 'field': 'text' + }, { + 'name': '文章描述', + 'field': 'msg_desc' + }, { + 'name': '文章标识', + 'field': 'msg_sn' }] } }, @@ -57,6 +66,9 @@ export default { this.keys.push(current.pop()) }, clickExport(type) { + + this.$store.dispatch('toggleLoading') + articleAction({ 'act': 'export', 'type': type @@ -67,7 +79,11 @@ export default { }, mounted() {}, watch: {}, - computed: {} + computed: { + loadingExport() { + return this.$store.state.ExportView.loading + } + } }