diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeSettingModal.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeSettingModal.vue index 8c4c6a3..2b14225 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeSettingModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeSettingModal.vue @@ -201,6 +201,7 @@ export default { const { success, message } = await postAction('/gamma/configureSave', param) if (success) { this.$message.success('Save Success') + this.$emit('senInfo', checkBox_updateCal ? '1' : '0') } else { this.$message.error(message) } diff --git a/src/views/spectrumAnalysis/components/Modals/ReProcessingModal/index.vue b/src/views/spectrumAnalysis/components/Modals/ReProcessingModal/index.vue index 23904cb..b9f09c5 100644 --- a/src/views/spectrumAnalysis/components/Modals/ReProcessingModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/ReProcessingModal/index.vue @@ -1,52 +1,52 @@ @@ -121,11 +129,18 @@ import ReProcessingModal from './components/Modals/ReProcessingModal/index.vue' import { GammaOptions, graphAssistance } from './settings' +import store from '@/store/' +import Vue from 'vue' +import { ACCESS_TOKEN } from '@/store/mutation-types' + export default { props: { sample: { type: Object, }, + updateFlag: { + type: String, + }, }, components: { CustomChart, @@ -141,6 +156,7 @@ export default { }, data() { return { + abc: false, isLoading: false, isLoadingNuclide: false, option: cloneDeep(GammaOptions.option), @@ -191,6 +207,12 @@ export default { compareFileListModalVisible: false, // Compare 弹窗 reprocessingModalVisible: false, // 重新分析弹窗 isProcessing: false, // 正在处理 + websock: null, + lockReconnect: false, + bAnalyed: false, //是否重新分析 + checkBox_updateCal: false, //update复选框状态 + newCheckBox_updateCal: false, //update复选框状态 + currStep: '', } }, created() { @@ -210,8 +232,55 @@ export default { }, mounted() { this.option.brush = { toolbox: [] } + this.initWebSocket() }, methods: { + initWebSocket: function () { + console.log('qweqwerq') + // WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https + var userId = store.getters.userInfo.id + var url = + window._CONFIG['domianURL'].replace('https://', 'wss://').replace('http://', 'ws://') + '/websocket/' + userId + //console.log(url); + //update-begin-author:taoyan date:2022-4-22 for: v2.4.6 的 websocket 服务端，存在性能和安全问题。 #3278 + let token = Vue.ls.get(ACCESS_TOKEN) + this.websock = new WebSocket(url, [token]) + //update-end-author:taoyan date:2022-4-22 for: v2.4.6 的 websocket 服务端，存在性能和安全问题。 #3278 + this.websock.onopen = this.websocketOnopen + this.websock.onerror = this.websocketOnerror + this.websock.onmessage = this.websocketOnmessage + this.websock.onclose = this.websocketOnclose + }, + websocketOnopen: function () { + // console.log('WebSocket连接成功1231') + //心跳检测重置 + //this.heartCheck.reset().start(); + }, + websocketOnerror: function (e) { + this.reconnect() + }, + websocketOnmessage: function (e) { + // console.log('-----接收消息1231-------', e.data) + var data = eval('(' + e.data + ')') //解析对象 + // console.log(data) + if (data.cmd === 'analysis-process') { + this.currStep = data.msgTxt + } + }, + websocketOnclose: function (e) { + this.reconnect() + }, + reconnect() { + var that = this + if (that.lockReconnect) return + that.lockReconnect = true + //没连接上会一直重连，设置延迟避免请求过多 + setTimeout(function () { + console.info('尝试重连...') + that.initWebSocket() + that.lockReconnect = false + }, 20000) + }, // 获取样品详情 async getSampleDetail() { const { dbName, sampleId } = this.sample @@ -234,7 +303,7 @@ export default { ) console.log('%c [ result ]-243', 'font-size:13px; background:pink; color:#bf2c9f;', result) if (success) { - this.dataProsess(result) + this.dataProsess(result, 'db') } else { this.$message.error(message) } @@ -262,7 +331,7 @@ export default { ) console.log('%c [ result ]-243', 'font-size:13px; background:pink; color:#bf2c9f;', result) if (success) { - this.dataProsess(result) + this.dataProsess(result, 'file') } else { this.$message.error(message) } @@ -284,7 +353,7 @@ export default { return cancelToken }, - dataProsess(result) { + dataProsess(result, flag) { this.isLoading = false const { @@ -304,7 +373,12 @@ export default { shapeChannelData, shapeEnergyData, } = result - + if (flag && (flag == 'dab' || flag == 'file')) { + this.bAnalyed = result.bAnalyed + this.checkBox_updateCal = result.checkBox_updateCal + this.newCheckBox_updateCal = '2' + console.log(this.checkBox_updateCal) + } this.detailedInfomation = DetailedInformation this.qcFlags = QCFlag @@ -458,7 +532,7 @@ export default { } return `
Channel: ${channel}
-
${energy? `Energy: ${energy}`: ''}
` +
${energy ? `Energy: ${energy}` : ''}
` }, // Graph Assistance 操作 @@ -670,7 +744,7 @@ export default { return { channel, energy, - counts: counts.y + counts: counts.y, } }, @@ -1127,6 +1201,8 @@ export default { // 重新分析 async reProcessing() { + this.abc = true + this.reprocessingModalVisible = true if (this.isProcessing) { return } @@ -1158,7 +1234,10 @@ export default { } finally { this.isLoading = false } - // this.reprocessingModalVisible = true + }, + haCndleCloseModal() { + this.reprocessingModalVisible = false + this.abc = false }, /** @@ -1374,6 +1453,13 @@ export default { }, immediate: true, }, + updateFlag: { + handler(val) { + console.log('dfad', val) + this.newCheckBox_updateCal = val + }, + immediate: true, + }, }, } diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index af0d00d..6634a8c 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -30,7 +30,7 @@
- + @@ -78,7 +78,11 @@ - + @@ -374,6 +378,7 @@ export default { xe133mFlag: null, xe135Flag: null, }, + updateFlag: '2', } }, created() { @@ -391,6 +396,10 @@ export default { }, methods: { + getUpdateFlag(val) { + console.log('qerq', val) + this.updateFlag = val + }, getcommentsInfo(val) { this.params_toDB.comment = val.spectrumAnalysisCommentInfo },