From 68d77441712ba05af0da27ee611f626f59a555e9 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Thu, 18 Jan 2024 11:26:13 +0800 Subject: [PATCH 01/91] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=E6=96=87=E6=94=B9=E4=B8=BA=E8=8B=B1?= =?UTF-8?q?=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/jeecgbiz/JSelectUserByDep.vue | 6 +- src/views/modules/message/SysMessageList.vue | 62 +++++++-------- .../message/SysMessageTemplateList.vue | 78 +++++++++---------- .../message/modules/SysMessageModal.vue | 38 ++++----- .../modules/SysMessageTemplateModal.vue | 47 ++++++----- .../message/modules/SysMessageTestModal.vue | 20 ++--- 6 files changed, 124 insertions(+), 127 deletions(-) diff --git a/src/components/jeecgbiz/JSelectUserByDep.vue b/src/components/jeecgbiz/JSelectUserByDep.vue index 29c9749..a668083 100644 --- a/src/components/jeecgbiz/JSelectUserByDep.vue +++ b/src/components/jeecgbiz/JSelectUserByDep.vue @@ -2,11 +2,11 @@
- 选择用户 + Select user - - + + - - + + - 查询 - 重置 + Search + Reset - {{ toggleSearchStatus ? '收起' : '展开' }} + {{ toggleSearchStatus ? 'Pack up' : 'unfold' }} @@ -39,20 +39,20 @@
- 新增 - 导出 + ADD + Export - 导入 + Import - 删除 + Delete - 批量操作 + Batch operation @@ -61,9 +61,9 @@
- 已选择 {{ - selectedRowKeys.length }}项 - 清空 + Selected {{ + selectedRowKeys.length }}item + Clear
- 详情 + Details - 更多 + More - 编辑 + Edit - - 删除 + + Delete @@ -124,7 +124,7 @@ }, data() { return { - description: '消息管理页面', + description: 'Message management page', // 新增修改按钮是否显示 show: false, // 表头 @@ -140,43 +140,43 @@ } }, { - title: '消息标题', + title: 'Message header', align: "center", dataIndex: 'esTitle' }, { - title: '发送内容', + title: 'Send content', align: "center", dataIndex: 'esContent', scopedSlots: {customRender: 'esContent'}, }, { - title: '接收人', + title: 'receiver', align: "center", dataIndex: 'esReceiver' }, { - title: '发送次数', + title: 'Transmission times', align: "center", dataIndex: 'esSendNum' }, { - title: '发送状态', + title: 'Send state', align: 'center', dataIndex: 'esSendStatus_dictText' }, { - title: '发送时间', + title: 'Send time', align: "center", dataIndex: 'esSendTime' }, { - title: '发送方式', + title: 'Send mode', align: 'center', dataIndex: 'esType_dictText' }, { - title: '操作', + title: 'Operation', dataIndex: 'action', align: "center", scopedSlots: {customRender: 'action'}, diff --git a/src/views/modules/message/SysMessageTemplateList.vue b/src/views/modules/message/SysMessageTemplateList.vue index cef9048..714ff1d 100644 --- a/src/views/modules/message/SysMessageTemplateList.vue +++ b/src/views/modules/message/SysMessageTemplateList.vue @@ -7,33 +7,33 @@ - - + + - - + + - 查询 - 重置 + Search + Reset - {{ toggleSearchStatus ? '收起' : '展开' }} + {{ toggleSearchStatus ? 'Pack up' : 'unfold' }} @@ -45,11 +45,11 @@
- 新增 - 导出 + ADD + Export - 导入 + Import
- 已选择 {{ - selectedRowKeys.length }}项 - 清空 + Selected {{ + selectedRowKeys.length }}item + Clear
- 编辑 + Edit - 更多 + More - 应用 + Use - 停用 + NotUse - - 删除 + + Delete - 发送测试 + Send test @@ -148,7 +148,7 @@ }, data() { return { - description: '消息模板管理页面', + description: 'Message template Management page', // 表头 columns: [ { @@ -162,48 +162,48 @@ } }, { - title: '模板CODE', + title: 'templateCode', align: "center", dataIndex: 'templateCode' }, { - title: '模板标题', + title: 'templateTitle', align: "center", dataIndex: 'templateName' }, { - title: '模板内容', + title: 'templateContent', align: "center", dataIndex: 'templateContent', scopedSlots: {customRender: 'templateContent'}, }, { - title: '模板类型', + title: 'templateType', align: "center", dataIndex: 'templateType', customRender: function (text) { if(text=='1') { - return "文本"; + return "TEXT"; } if(text=='2') { - return "富文本"; + return "Rich text"; } } }, { - title: '是否应用', + title: 'useStatus', align: "center", dataIndex: 'useStatus', customRender: function (text) { if(text=='1') { - return "是"; + return "YES"; }else{ - return '否' + return 'NO' } } }, { - title: '操作', + title: 'action', dataIndex: 'action', align: "center", scopedSlots: {customRender: 'action'}, @@ -226,7 +226,7 @@ methods: { handleTest(record){ this.$refs.testModal.open(record); - this.$refs.testModal.title = "发送测试"; + this.$refs.testModal.title = "Send test"; }, //update-begin-author:taoyan date:2022-7-8 for: 修改应用状态 updateUseStatus(record, useStatus){ @@ -251,7 +251,7 @@ }, handleMyEdit(record){ if(record.useStatus == '1'){ - this.$message.warning('此模板已被应用，禁止编辑!'); + this.$message.warning('This template has been applied and editing is prohibited!'); }else{ this.handleEdit(record); } @@ -260,11 +260,11 @@ handleDelete: function (record) { if(!this.url.delete){ - this.$message.error("请设置url.delete属性!") + this.$message.error("Please set the url.delete property!") return } if(record.useStatus=='1'){ - this.$message.error("该模板已被应用禁止删除!") + this.$message.error("The template is prohibited from being deleted by the application!") return } let id = record.id; diff --git a/src/views/modules/message/modules/SysMessageModal.vue b/src/views/modules/message/modules/SysMessageModal.vue index 9f6231c..1572965 100644 --- a/src/views/modules/message/modules/SysMessageModal.vue +++ b/src/views/modules/message/modules/SysMessageModal.vue @@ -15,70 +15,70 @@ - + label="Message header"> + - + label="Send content"> + - + label="Send required parameters"> + - + label="receiver"> + - + label="Sending mode"> + + label="Sending time"> - + label="Sending state"> + + label="Transmission times"> + label="Cause of sending failure"> + label="remark">
- 取消 - 提交 + Cancel + Submit
@@ -92,7 +92,7 @@ name: "SysMessageModal", data() { return { - title: "操作", + title: "Operation", visible: false, model: {}, labelCol: { diff --git a/src/views/modules/message/modules/SysMessageTemplateModal.vue b/src/views/modules/message/modules/SysMessageTemplateModal.vue index 6602065..bd7e16d 100644 --- a/src/views/modules/message/modules/SysMessageTemplateModal.vue +++ b/src/views/modules/message/modules/SysMessageTemplateModal.vue @@ -6,70 +6,67 @@ :confirmLoading="confirmLoading" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭"> + cancelText="Cancel"> - - + + - + - + label="Template type"> + - + + label="Template title"> - + - + - + label="Template content"> + @@ -79,7 +76,7 @@ v-show="useEditor" :labelCol="labelCol" :wrapperCol="wrapperCol" - label="模板内容" + label="Template content" style="margin-left: 4px;width: 126%"> @@ -106,7 +103,7 @@ }, data() { return { - title: "操作", + title: "Operation", visible: false, disable: true, model: {}, @@ -121,11 +118,11 @@ confirmLoading: false, form: this.$form.createForm(this), validatorRules: { - templateCode: {rules: [{required: true, message: '请输入模板CODE!' },{validator: this.validateTemplateCode}]}, - templateName: {rules: [{required: true, message: '请输入模板标题!'}]}, + templateCode: {rules: [{required: true, message: 'Please enter the template Code!' },{validator: this.validateTemplateCode}]}, + templateName: {rules: [{required: true, message: 'Please enter the template title!'}]}, templateContent: {rules: []}, useStatus:{rules: []}, - templateType: {rules: [{required: true, message: '请输入模板类型!'}]}, + templateType: {rules: [{required: true, message: 'Please enter the template type!'}]}, }, url: { add: "/sys/message/sysMessageTemplate/add", diff --git a/src/views/modules/message/modules/SysMessageTestModal.vue b/src/views/modules/message/modules/SysMessageTestModal.vue index 9feb97b..56ba464 100644 --- a/src/views/modules/message/modules/SysMessageTestModal.vue +++ b/src/views/modules/message/modules/SysMessageTestModal.vue @@ -6,43 +6,43 @@ :confirmLoading="confirmLoading" @ok="handleOk" @cancel="handleCancel" - cancelText="关闭"> + cancelText="Cancel"> + label="Template title"> + label="Template content"> - + label="Test data"> + + label="Message type"> - + label="Message receiver"> + @@ -60,7 +60,7 @@ }, data() { return { - title: "操作", + title: "Operation", visible: false, model: {}, labelCol: { From 032883810c2f60a85269b7a91fc479a3c75e9689 Mon Sep 17 00:00:00 2001 From: orgin Date: Thu, 18 Jan 2024 11:40:56 +0800 Subject: [PATCH 02/91] =?UTF-8?q?fix=EF=BC=9A=E5=9C=B0=E5=9B=BE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=98=BE=E7=A4=BA=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stationOperation/components/Map.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/stationOperation/components/Map.vue b/src/views/stationOperation/components/Map.vue index b565283..8cc3564 100644 --- a/src/views/stationOperation/components/Map.vue +++ b/src/views/stationOperation/components/Map.vue @@ -65,6 +65,7 @@ export default { zoom: this.zoom, maxZoom: this.maxZoom, minZoom: this.minZoom, + extent: [-20037508.34 - 3500000, -20037508.34 , 20037508.34 + 3500000, 20037508.34], }) this.map = new Map({ From 9f6575ff04f30a5181219c3787f4bbdfe307097a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Wed, 24 Jan 2024 17:39:38 +0800 Subject: [PATCH 03/91] =?UTF-8?q?=E5=8F=B0=E7=AB=99=E6=98=AFUnoperating?= =?UTF-8?q?=EF=BC=8Cicon=20=E4=B8=8A=E9=9D=A2=E7=9A=84=E6=B3=A2=E7=BA=B9?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=EF=BC=8C=20=E4=B8=8D=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=95=B0=E6=8D=AE=E6=8E=A5=E6=94=B6=E5=BC=B9?= =?UTF-8?q?=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stationOperation/components/MapMarker.vue | 93 +++++++++++-------- src/views/stationOperation/index.vue | 4 +- 2 files changed, 55 insertions(+), 42 deletions(-) diff --git a/src/views/stationOperation/components/MapMarker.vue b/src/views/stationOperation/components/MapMarker.vue index 83b15e6..7b1dc75 100644 --- a/src/views/stationOperation/components/MapMarker.vue +++ b/src/views/stationOperation/components/MapMarker.vue @@ -26,30 +26,30 @@ export default { props: { list: { type: Array, - required: true + required: true, }, currList: { type: Array, - required: true + required: true, }, orgList: { type: Array, - required: true + required: true, }, markerType: { type: Number, - default: 1 + default: 1, }, radius: { - type: Number - } + type: Number, + }, }, data() { return { currStationInfo: {}, isGettingInfo: false, columns: {}, - popupTitle: '' + popupTitle: '', } }, mounted() { @@ -59,7 +59,7 @@ export default { this.changeCircleRadius() }) - this.getStationInfo = debounce(stationInfo => { + this.getStationInfo = debounce((stationInfo) => { // 查询设施详情时去抖动 if (this.isHover) { this._getStationInfo(stationInfo) @@ -69,13 +69,14 @@ export default { methods: { initCircles() { const circleRadius = this.getRadius() * 2 + console.log('this.list', this.list) this.list .filter( - stationInfo => + (stationInfo) => stationInfo.stationType !== MarkerType.NuclearFacility && stationInfo.stationType !== MarkerType.NRL ) - .forEach(stationInfo => { + .forEach((stationInfo) => { this.map.addOverlay(this.getCircle(stationInfo, circleRadius)) }) }, @@ -92,17 +93,17 @@ export default { element: circleDiv, id: `circle_${stationType}_${stationId}`, positioning: 'center-center', - className: 'circle-overlay' + className: 'circle-overlay', }) }, // 修改圆的半径 changeCircleRadius() { const overlays = this.map.getOverlays().getArray() - const circleOverlays = overlays.filter(item => item.id.indexOf('circle') == 0) // 根据id标识获取所有的圆 + const circleOverlays = overlays.filter((item) => item.id.indexOf('circle') == 0) // 根据id标识获取所有的圆 const circleRadius = this.getRadius() * 2 - circleOverlays.forEach(circle => { + circleOverlays.forEach((circle) => { const circleEle = circle.getElement() circleEle.style.width = circleRadius + 'px' circleEle.style.height = circleRadius + 'px' @@ -111,10 +112,7 @@ export default { // 半径计算 getRadius() { - const metersPerUnit = this.map - .getView() - .getProjection() - .getMetersPerUnit() + const metersPerUnit = this.map.getView().getProjection().getMetersPerUnit() const distance = (this.radius * 1000) / metersPerUnit const resolution = this.map.getView().getResolution() @@ -123,7 +121,7 @@ export default { // 初始化marker initMarkers() { - this.list.forEach(stationInfo => { + this.list.forEach((stationInfo) => { this.map.addOverlay(this.getMarker(stationInfo)) }) }, @@ -153,18 +151,19 @@ export default { position: fromLonLat([lon, lat]), element: img, id: `marker_${stationInfo.stationType}_${stationInfo.stationId}`, - positioning: 'center-center' + positioning: 'center-center', }) }, // 初始化波纹 initRipples() { this.currList + .filter((stationInfo) => stationInfo.status !== 'Unoperating') // .filter( // stationInfo => // stationInfo.stationType !== MarkerType.NuclearFacility && stationInfo.stationType !== MarkerType.NRL // ) - .forEach(stationInfo => { + .forEach((stationInfo) => { this.map.addOverlay(this.getRipple(stationInfo)) }) }, @@ -172,15 +171,15 @@ export default { getRipple({ lon, lat, stationId, stationType, quality }) { const rippleDiv = document.createElement('div') rippleDiv.className = 'custom-ripple' - if (quality == "excellent") { + if (quality == 'excellent') { rippleDiv.innerHTML = `
` - } else if (quality == "good") { + } else if (quality == 'good') { rippleDiv.innerHTML = `
` - } else if(quality == "bad"){ + } else if (quality == 'bad') { rippleDiv.innerHTML = `
` @@ -191,7 +190,7 @@ export default { element: rippleDiv, id: `ripple_${stationType}_${stationId}`, positioning: 'center-center', - className: 'ripple-overlay' + className: 'ripple-overlay', }) }, @@ -200,7 +199,7 @@ export default { this.popupOverlay = new Overlay({ element: this.$refs.mapPopupRef, positioning: 'top-center', - id: POPUP_OVERLAY_ID + id: POPUP_OVERLAY_ID, }) this.map.addOverlay(this.popupOverlay) }, @@ -220,15 +219,16 @@ export default { try { const { success, result, message } = await getAction('/jeecg-station-operation/stationOperation/findInfo', { stationId: stationInfo.stationId, - type: stationInfo.stationType + type: stationInfo.stationType, }) if (success) { result.lon = decimalToDms(result.lon || result.longitude) result.lat = decimalToDms(result.lat || result.latitude, false) - let params = this.currList.find(item => { - return item.stationId === result.stationId - }) || {} + let params = + this.currList.find((item) => { + return item.stationId === result.stationId + }) || {} this.currStationInfo = { ...result, ...params } } else { this.$message.error(message) @@ -243,7 +243,7 @@ export default { //关闭地图弹窗 closeMapPopup() { this.popupOverlay.setPosition(null) - } + }, }, watch: { list() { @@ -257,19 +257,22 @@ export default { }, currList: { handler(newVal, oldVal) { - this.orgList.forEach(item => { - var layer = this.map.getOverlays().getArray().find(layer=> { - return layer.id === `ripple_${item.stationType}_${item.stationId}`; - }); + this.orgList.forEach((item) => { + var layer = this.map + .getOverlays() + .getArray() + .find((layer) => { + return layer.id === `ripple_${item.stationType}_${item.stationId}` + }) if (layer) { - this.map.removeOverlay(layer); + this.map.removeOverlay(layer) } }) this.initRipples() }, - deep:true - } - } + deep: true, + }, + }, } \ No newline at end of file From 139f7d3dd235bcfb2a0fed21b7e6ca1e4e6d42d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Tue, 30 Jan 2024 15:51:44 +0800 Subject: [PATCH 13/91] =?UTF-8?q?Database=20=E5=88=86=E9=A1=B5=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=88=A0=E6=8E=89SLOW=20QUERY=20=E8=BF=99=E4=B8=80?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../abnormalAlarm/databaseMonitor/overview/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/abnormalAlarm/databaseMonitor/overview/index.vue b/src/views/abnormalAlarm/databaseMonitor/overview/index.vue index fc83a48..6a8bc3c 100644 --- a/src/views/abnormalAlarm/databaseMonitor/overview/index.vue +++ b/src/views/abnormalAlarm/databaseMonitor/overview/index.vue @@ -193,11 +193,11 @@ const columns = [ ellipsis: true, width: 300, }, - { - title: 'SLOW QUERY', - align: 'center', - dataIndex: 'slowQuery', - }, + // { + // title: 'SLOW QUERY', + // align: 'center', + // dataIndex: 'slowQuery', + // }, { title: 'ALARMS', align: 'center', From 7e8e82c9e1341baf3d23a2a8acb740e1b5e559bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Tue, 30 Jan 2024 16:02:57 +0800 Subject: [PATCH 14/91] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E7=9A=84=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modals/ConfigUserLibraryModal.vue | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/src/views/spectrumAnalysis/components/Modals/ConfigUserLibraryModal.vue b/src/views/spectrumAnalysis/components/Modals/ConfigUserLibraryModal.vue index 62c74fe..2a7ec0b 100644 --- a/src/views/spectrumAnalysis/components/Modals/ConfigUserLibraryModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/ConfigUserLibraryModal.vue @@ -7,24 +7,28 @@ :dataSource="list" :list-style="{ width: '200px', - height: '400px' + height: '400px', }" :target-keys="targetKeys" - :render="item => item.title" + :render="(item) => item.title" :showSearch="true" :showSelectAll="false" @change="handleChange" > -
-
+ +
+ Save
@@ -43,7 +47,7 @@ export default { return { list: [], targetKeys: [], - isSaving: false + isSaving: false, } }, methods: { @@ -58,17 +62,17 @@ export default { const { sampleId, inputFileName: fileName } = this.sampleData const { success, result, message } = await getAction('/gamma/configUserLibrary', { sampleId, - fileName + fileName, }) if (success) { this.isLoading = false const { AllNuclides, UserNuclides } = result - this.list = AllNuclides.map(item => ({ + this.list = AllNuclides.map((item) => ({ key: item, - title: item + title: item, })) - this.targetKeys = UserNuclides.map(item => item) + this.targetKeys = UserNuclides.map((item) => item) this.initialTargetKeys = cloneDeep(this.targetKeys) } else { @@ -95,7 +99,7 @@ export default { const { inputFileName: fileName } = this.sampleData const { success, result, message } = await postAction('/gamma/saveUserLibrary', { fileName, - userLibraryName: this.targetKeys + userLibraryName: this.targetKeys, }) if (success) { this.$message.success('Save Success') @@ -107,8 +111,8 @@ export default { } finally { this.isSaving = false } - } - } + }, + }, } From f09ca1e38a2e2d8024f11f77d885b916b89d98bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Tue, 30 Jan 2024 17:43:42 +0800 Subject: [PATCH 15/91] =?UTF-8?q?input=20=E5=85=A8=E5=B1=80=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/style.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/style.less b/src/style.less index 45f7b8a..93472bc 100644 --- a/src/style.less +++ b/src/style.less @@ -355,7 +355,7 @@ body { border-radius: 0; &::placeholder { - color: #fff; + color: #ccc; } } @@ -392,7 +392,7 @@ body { border-radius: 0; color: #fff; &::placeholder { - color: #fff; + color: #ccc; } &:focus { box-shadow: none; From 4c0e48dd435f4f30c8380f0502b2f8ae48123d53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Tue, 30 Jan 2024 17:44:44 +0800 Subject: [PATCH 16/91] =?UTF-8?q?=20system=20=E6=A8=A1=E5=9D=97=EF=BC=8Cqu?= =?UTF-8?q?artz=20job=20=E9=A1=B5=E9=9D=A2=E4=B8=AD=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/jeecg/JEasyCron/InputCron.vue | 38 ++-- src/views/system/modules/QuartzJobModal.vue | 214 +++++++++---------- 2 files changed, 125 insertions(+), 127 deletions(-) diff --git a/src/components/jeecg/JEasyCron/InputCron.vue b/src/components/jeecg/JEasyCron/InputCron.vue index 868d4b3..8dc8288 100644 --- a/src/components/jeecg/JEasyCron/InputCron.vue +++ b/src/components/jeecg/JEasyCron/InputCron.vue @@ -3,7 +3,7 @@ - 选择 + Select @@ -24,44 +24,44 @@ import EasyCron from './EasyCron.vue' export default { name: 'input-cron', - components: {EasyCron}, + components: { EasyCron }, model: { prop: 'cronValue', - event: 'change' + event: 'change', }, props: { cronValue: { type: String, - default: '' + default: '', }, width: { type: String, - default: '800px' + default: '800px', }, placeholder: { type: String, - default: '请输入cron表达式' + default: '请输入cron表达式', }, disabled: { type: Boolean, - default: false + default: false, }, exeStartTime: { type: [Number, String, Object], - default: 0 + default: 0, }, hideSecond: { type: Boolean, - default: false + default: false, }, hideYear: { type: Boolean, - default: false + default: false, }, remote: { type: Function, - default: null - } + default: null, + }, }, data() { return { @@ -78,22 +78,20 @@ export default { }, editCronValue(newVal, oldVal) { this.$emit('change', newVal) - } + }, }, methods: { showConfigDlg() { if (!this.disabled) { this.show = true } - } - } + }, + }, } diff --git a/src/views/system/modules/QuartzJobModal.vue b/src/views/system/modules/QuartzJobModal.vue index c27c6aa..d7600fb 100644 --- a/src/views/system/modules/QuartzJobModal.vue +++ b/src/views/system/modules/QuartzJobModal.vue @@ -6,27 +6,32 @@ :confirmLoading="confirmLoading" @ok="handleOk" @cancel="handleCancel" - okText="保存并安排任务" - cancelText="关闭"> - + okText="Save And Schedule Tasks" + cancelText="Close" + > - - - + + - + - - + + - - + + - - + + @@ -34,108 +39,103 @@ \ No newline at end of file From 76e6916d33a851cb755ddbd4799c773edf981523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Wed, 31 Jan 2024 11:07:00 +0800 Subject: [PATCH 17/91] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=9C=B0=E5=9D=80=20ur?= =?UTF-8?q?l=20=E8=B0=83=E6=95=B4=20Data=20Receive=20status=20Monitoring?= =?UTF-8?q?=20=E4=B8=AD=E5=9B=BE=E8=A1=A8=E6=8F=90=E7=A4=BA=E6=A1=86?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stationOperation/components/MapMarker.vue | 2 +- .../stationOperation/components/MapPane.vue | 33 +++++++------------ .../components/RealTimeDataChart.vue | 2 +- src/views/stationOperation/index.vue | 6 ++-- 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/src/views/stationOperation/components/MapMarker.vue b/src/views/stationOperation/components/MapMarker.vue index 7e6b4b3..609d52b 100644 --- a/src/views/stationOperation/components/MapMarker.vue +++ b/src/views/stationOperation/components/MapMarker.vue @@ -217,7 +217,7 @@ export default { // 获取站点详情 async _getStationInfo(stationInfo) { try { - const { success, result, message } = await getAction('/armd-station-operation/stationOperation/findInfo', { + const { success, result, message } = await getAction('/stationOperation/findInfo', { stationId: stationInfo.stationId, type: stationInfo.stationType, }) diff --git a/src/views/stationOperation/components/MapPane.vue b/src/views/stationOperation/components/MapPane.vue index 0ba6525..584b094 100644 --- a/src/views/stationOperation/components/MapPane.vue +++ b/src/views/stationOperation/components/MapPane.vue @@ -579,7 +579,7 @@ export default { success, result: { GIS: markerList, table }, message, - } = await postAction('/armd-station-operation/stationOperation/getHitEquList', { + } = await postAction('/stationOperation/getHitEquList', { radius: this.radius, stationIds, }) @@ -695,13 +695,10 @@ export default { try { const stationIds = this.dataStatusCheckedKeys.filter((key) => -1 == key.toString().indexOf('root_')) this.isSavingDataRecieveSettings = true - const { success, message } = await postAction( - '/armd-station-operation/sysUserFocusStation/saveUserFocusByUserId', - { - stationIds, - ...this.dataRecieveStatusModel, - } - ) + const { success, message } = await postAction('/sysUserFocusStation/saveUserFocusByUserId', { + stationIds, + ...this.dataRecieveStatusModel, + }) if (success) { this.$message.success('Save Success') await this.getDataRecieveSettings() @@ -738,12 +735,9 @@ export default { // 获取数据接收状态配置 async getDataRecieveSettings() { try { - const { success, result, message } = await getAction( - '/armd-station-operation/sysUserFocusStation/findUserFocusByUserId', - { - userId: this.$store.getters.userInfo.id, - } - ) + const { success, result, message } = await getAction('/sysUserFocusStation/findUserFocusByUserId', { + userId: this.$store.getters.userInfo.id, + }) if (success) { this.initialDataRecieveSettings = result } else { @@ -774,13 +768,10 @@ export default { this.spinLoading = true try { this.isGettingStatusList = true - const { success, result, message } = await getAction( - '/armd-station-operation/stationOperation/getDataReceivingStatus', - { - userId: this.$store.getters.userInfo.id, - oneStationId: (this.stationInfo && this.stationInfo.stationId) || '', - } - ) + const { success, result, message } = await getAction('/stationOperation/getDataReceivingStatus', { + userId: this.$store.getters.userInfo.id, + oneStationId: (this.stationInfo && this.stationInfo.stationId) || '', + }) this.maskVisi = false this.spinLoading = false if (success) { diff --git a/src/views/stationOperation/components/RealTimeDataChart.vue b/src/views/stationOperation/components/RealTimeDataChart.vue index aa3730e..075af92 100644 --- a/src/views/stationOperation/components/RealTimeDataChart.vue +++ b/src/views/stationOperation/components/RealTimeDataChart.vue @@ -74,7 +74,7 @@ const initialOption = { return `
${params.marker}${params.name}
START：${dayjs(new Date(params.value[1])).format('YYYY-MM-DD HH:mm:ss')}
-
END：${dayjs(new Date(params.value[2])).format('YYYY-MM-DD HH:mm:ss')}
+
END：${dayjs(new Date(params.value[2])).format('YYYY-MM-DD HH:mm:ss')}
` }, }, diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue index 350b90c..1767edb 100644 --- a/src/views/stationOperation/index.vue +++ b/src/views/stationOperation/index.vue @@ -253,7 +253,7 @@ export default { async getStationList() { try { this.isGettingDataList = true - const res = await getAction('/armd-station-operation/stationOperation/findList') + const res = await getAction('/stationOperation/findList') res.forEach((item) => { const { stationId, stationName, stationType } = item item._stationId = `${stationId}${stationName}${stationType}` @@ -364,7 +364,7 @@ export default { async getFollowedStationList() { try { this.isGettingFollowedDataList = true - const res = await getAction('/armd-station-operation/sysUserFocusStation/findList') + const res = await getAction('/sysUserFocusStation/findList') this.followedDataList = res const scrollContainer2Ref = this.$refs.scrollContainer2Ref @@ -383,7 +383,7 @@ export default { // 获取站点类型 async getStationTypeList() { try { - const res = await getAction('/armd-station-operation/stationOperation/findStationType') + const res = await getAction('/stationOperation/findStationType') this.stationTypeList = res.filter((item) => item).map((item) => ({ label: item, value: item })) } catch (error) { console.error(error) From b2fbac2f52fd20c66ab80ebb5af94a38cd25dbb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Thu, 1 Feb 2024 09:55:32 +0800 Subject: [PATCH 18/91] =?UTF-8?q?=E4=BB=8E=E4=BA=A4=E4=BA=92=E5=88=86?= =?UTF-8?q?=E6=9E=90=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E8=87=B3=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=BB=9F=E8=AE=A1=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=B9=8B=E5=89=8D=E6=B8=B2=E6=9F=93=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=BC=9A=E8=A2=AB=E6=91=A7=E6=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/abnormalAlarm/RouteView.vue | 14 +++--- src/views/statistics/RouteView.vue | 71 +++++++++++++-------------- 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/src/views/abnormalAlarm/RouteView.vue b/src/views/abnormalAlarm/RouteView.vue index 5e58073..7a9c46b 100644 --- a/src/views/abnormalAlarm/RouteView.vue +++ b/src/views/abnormalAlarm/RouteView.vue @@ -28,9 +28,9 @@ - + - + @@ -72,11 +72,11 @@ const SubMenu = { export default { name: 'menuTree', components: { 'sub-menu': SubMenu }, - computed: { - keepAlive() { - return this.$route.meta.keepAlive - }, - }, + // computed: { + // keepAlive() { + // return this.$route.meta.keepAlive + // }, + // }, data() { const collapsed = false return { diff --git a/src/views/statistics/RouteView.vue b/src/views/statistics/RouteView.vue index f999aa6..d5fcaa6 100644 --- a/src/views/statistics/RouteView.vue +++ b/src/views/statistics/RouteView.vue @@ -1,8 +1,8 @@ + + + +
@@ -163,11 +167,24 @@ const columns = [ dataIndex: 'status', }, ] +const columnsModal = [ + { + title: 'Index', + dataIndex: 'rowCount', + align: 'center', + }, + { + title: 'Information', + dataIndex: 'info', + align: 'left', + }, +] export default { mixins: [JeecgListMixin], data() { this.columns = columns + this.columnsModal = columnsModal return { queryParam: { collectStart: this.getBeforeDate(6), @@ -183,6 +200,8 @@ export default { }, stationList: [], detectorList: [], + visibleInfo: false, + dataInfo: [], } }, created() { @@ -264,7 +283,7 @@ export default { cancelText: 'Cancel', onOk: async () => { try { - const { success, message } = await deleteAction('/gardsSampleData/deleteById', { + const { success, message, result } = await deleteAction('/gardsSampleData/deleteById', { sampleId: this.selectedRowKeys[0], ...this.delParams, }) @@ -273,6 +292,13 @@ export default { that.loadData() } else { this.$message.error(message) + this.visibleInfo = true + this.dataInfo = result.map((item, index) => { + return { + rowCount: `${index + 1}`, + info: item, + } + }) } } catch (error) { console.error(error) From c87c4ba6f7369cde633abd844c346bc7486b80cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Mon, 5 Feb 2024 18:35:28 +0800 Subject: [PATCH 29/91] =?UTF-8?q?log=20=E6=A8=A1=E5=9D=97=E7=9A=84?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/logManage/index.vue | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/views/logManage/index.vue b/src/views/logManage/index.vue index 2a71486..f489570 100644 --- a/src/views/logManage/index.vue +++ b/src/views/logManage/index.vue @@ -17,7 +17,7 @@ - + -
+
{{ logItem }}
@@ -74,42 +74,42 @@ const columns = [ title: 'NAME', align: 'center', width: 320, - dataIndex: 'fileName' + dataIndex: 'fileName', }, { title: 'DATE', align: 'center', width: 200, - dataIndex: 'fileDate' + dataIndex: 'fileDate', }, { title: 'SIZE', align: 'center', width: 220, - dataIndex: 'fileSize' + dataIndex: 'fileSize', }, { title: 'OPERATE', align: 'center', width: 200, scopedSlots: { - customRender: 'operate' - } - } + customRender: 'operate', + }, + }, ] export default { name: 'LogManage', mixins: [JeecgListMixin], components: { - TreeWithLine + TreeWithLine, }, data() { this.columns = columns return { disableMixinCreated: true, url: { - list: '/logManage/findFiles' + list: '/logManage/findFiles', }, isGettingTreeData: false, // 正在获取左侧树信息 treeData: [], @@ -119,7 +119,7 @@ export default { visible: false, isGettingDetail: false, - logInfo: [] + logInfo: [], } }, created() { @@ -148,11 +148,11 @@ export default { */ buildTreeData(treeJson) { const tree = [] - treeJson.forEach(item => { + treeJson.forEach((item) => { const treeNode = { title: item.name, key: item.path, - children: [] + children: [], } if (item.children && item.children.length) { treeNode.children.push(...this.buildTreeData(item.children)) @@ -180,7 +180,7 @@ export default { var params = this.getQueryParams() //查询条件 this.loading = true getAction(this.url.list, params) - .then(res => { + .then((res) => { this.dataSource = res }) .finally(() => { @@ -216,8 +216,8 @@ export default { formData.append('fileName', fileName) formData.append('localPath', filePath) downloadFile('/logManage/downloadFile', fileName, formData, 'post') - } - } + }, + }, } From 7995f08ccb5168b96cf63735dc03edc99132f48a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Sun, 18 Feb 2024 11:54:23 +0800 Subject: [PATCH 32/91] =?UTF-8?q?=E4=B8=8D=E5=8A=A0=E8=BD=BDgamma=20?= =?UTF-8?q?=E8=B0=B1=EF=BC=8Cnuclide=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BA=8C?= =?UTF-8?q?=E7=BA=A7=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/spectrumAnalysis/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 9c77ea1..1f48f7b 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -1372,11 +1372,13 @@ export default { children: [ { type: 'a-menu-item', + show: this.isGamma, title: 'Nuclide Library', handler: () => (this.nuclideLibraryModalVisible = true), }, { type: 'a-menu-item', + show: this.isGamma, title: 'Config User Library', handler: () => (this.configUserLibModalVisible = true), }, From 2b04b7d7baec0b9a088c5fa60c0a1a19a0e34923 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Sun, 18 Feb 2024 12:01:04 +0800 Subject: [PATCH 33/91] =?UTF-8?q?fix:=20Load=20From=20DB=20=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E5=88=87=E6=8D=A2=E6=97=B6=E6=89=A7=E8=A1=8C=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E6=9F=A5=E8=AF=A2=EF=BC=8CBeta=20=E8=B0=B1=20->=20Ene?= =?UTF-8?q?rgy=20Calibration=E5=BC=B9=E7=AA=97=E5=A2=9E=E5=8A=A0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=B1=BB=E5=9E=8B=E4=B8=BAman=E7=9A=84=E8=B0=B1?= =?UTF-8?q?=E6=97=B6=E5=AF=B9=E6=9F=90=E4=BA=9B=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/BetaDetectorCalibration.vue | 115 ++++++++++++------ .../components/GammaDetectorCalibration.vue | 100 ++++++++++----- .../components/Modals/LoadFromDBModal.vue | 9 +- 3 files changed, 155 insertions(+), 69 deletions(-) diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue index e40ddc7..2876da0 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue @@ -128,9 +128,24 @@ C to E : E = - + - *C + - *C 2 + + + + + *C + + + *C 2

@@ -546,15 +561,15 @@ const newCalibrationFuncModel = { export default { mixins: [SampleDataMixin], components: { CustomChart, TitleOverBorder }, - props: { + props: { isFirstFitting: { type: Boolean, required: false, }, - isBetaReset:{ + isBetaReset: { type: Boolean, required: false, - } + }, }, data() { this.columns = columns @@ -619,7 +634,7 @@ export default { handler() { // this.getData() }, - immediate: true + immediate: true, }, }, methods: { @@ -636,11 +651,20 @@ export default { sampleId, qcFileName, sampleFileName: inputFileName, - fittingBtn: this.isFirstFitting + fittingBtn: this.isFirstFitting, }) if (res.success) { - const { CToE, EToC, betaEnergy, gammaEnergy, gammaGatedBetaSpectrum, histogramData, oldScatterSeries } = - res.result + const { + CToE, + EToC, + betaEnergy, + gammaEnergy, + gammaGatedBetaSpectrum, + histogramData, + oldScatterSeries, + newCToE, + newEToC, + } = res.result this.c2e = CToE this.e2c = EToC @@ -669,9 +693,27 @@ export default { // 如果点击过reanalyze则渲染之前fitting的数据，如果没点Reanalyze，数据会在窗口关闭时删掉 20231101：xiao // todo 现在能谱数据没有缓存，刷新页面时也会获取到fitting的数据 - if(this.getCache("CALIBRATION_BETA_"+this.newSampleData.inputFileName)) { - this.setFirringResult(this.getCache("CALIBRATION_BETA_"+this.newSampleData.inputFileName)) - return false; + if (this.getCache('CALIBRATION_BETA_' + this.newSampleData.inputFileName)) { + this.setFirringResult(this.getCache('CALIBRATION_BETA_' + this.newSampleData.inputFileName)) + return false + } + + /** + * 对人工交互的返回数据单独处理 + */ + if (this.sampleData.dbName == 'man') { + this.setFirringResult(res.result) + if (newCToE) { + const [paramA, paramB, paramC] = newCToE + this.newCalibrationFuncModel = { + paramA: Number(paramA).toPrecision(6), + paramB: Number(paramB).toPrecision(6), + paramC: Number(paramC).toPrecision(6), + } + } + if (newEToC) { + this.newE2C = newEToC + } } } else { this.$message.error(res.message) @@ -723,7 +765,7 @@ export default { chartHeight: this.gammaEnergy.length, channelWidth: this.gammaChannelWidth, qcFileName, - sampleFileName + sampleFileName, }, cancelToken ) @@ -797,7 +839,7 @@ export default { } this.tooltipVisible = true this.channelAndEnergyModel.channel = xAxis - if(!isNullOrUndefined(this.currEnergy)) { + if (!isNullOrUndefined(this.currEnergy)) { this.channelAndEnergyModel.energy = add(661.657, -this.currEnergy) } } @@ -816,12 +858,12 @@ export default { channel, energy, }) - + // add之后 需要清空chart黄色的线 20231028：Xiao - if(this.figureChartOption.series[1].data) { + if (this.figureChartOption.series[1].data) { this.figureChartOption.series[1].data = [] } - + this.figureChartOption.series[1].markPoint.data.push({ xAxis: channel, yAxis: energy }) const { min, max } = this.getFigureChartMaxAndMin() @@ -850,10 +892,10 @@ export default { // 输入内容的时候 需要清空table数据 20231028：Xiao this.list = [] // 需要清空chart黄色的线 20231028：Xiao - if(this.figureChartOption.series[1].data) { + if (this.figureChartOption.series[1].data) { this.figureChartOption.series[1].data = [] } - if(this.figureChartOption.series[1].markPoint.data) { + if (this.figureChartOption.series[1].markPoint.data) { this.figureChartOption.series[1].markPoint.data = [] } }, @@ -894,19 +936,22 @@ export default { // 点击Reset Button 重置 async handleReset() { this.$emit('isFitting', false) - this.removeCache("CALIBRATION_BETA_"+this.newSampleData.inputFileName) // 删除fitting之后缓存的数据 20231101:xiao + this.removeCache('CALIBRATION_BETA_' + this.newSampleData.inputFileName) // 删除fitting之后缓存的数据 20231101:xiao this.newCalibrationFuncModel = cloneDeep(newCalibrationFuncModel) this.list = [] this.newE2C = [] // 按乔的要求增加请求reset的接口 20231211：xiao - const res = await postAction('/spectrumAnalysis/resetButton?tabName=beta&sampleFileName='+this.newSampleData.inputFileName, {}) + const res = await postAction( + '/spectrumAnalysis/resetButton?tabName=beta&sampleFileName=' + this.newSampleData.inputFileName, + {} + ) this.figureChartOption = this.oldChartOption this.figureChartOption = cloneDeep(this.oldChartOption) // this.isFirstFitting = true - + this.isInverse = false }, @@ -918,13 +963,14 @@ export default { } try { const { success, result, message } = await postAction('/spectrumAnalysis/fitting', { - ...this.list.length <= 0 ? this.newCalibrationFuncModel : [], // 如果list有数据则不传 C to E 表单数据 20231101：xiao + ...(this.list.length <= 0 ? this.newCalibrationFuncModel : []), // 如果list有数据则不传 C to E 表单数据 20231101：xiao sampleFileName: this.newSampleData.inputFileName, - tabName: "beta", + tabName: 'beta', // 修改逻辑，如果列表中有数据 以列表的数据优先进行分析 20231028：Xiao - tempPoints: this.list.length > 0 - ? this.list.map((item) => ({ x: item.channel, y: item.energy })) - : this.oldScatterSeries, + tempPoints: + this.list.length > 0 + ? this.list.map((item) => ({ x: item.channel, y: item.energy })) + : this.oldScatterSeries, // tempPoints: this.isFirstFitting // ? this.oldScatterSeries // : this.list.map((item) => ({ x: item.channel, y: item.energy })), @@ -934,10 +980,9 @@ export default { this.betaIsFitting = true this.$emit('isFitting', true) // 点击reAnalyze按钮，将isFirstFitting改为true 20231101：xiao - this.setCache("CALIBRATION_BETA_"+this.newSampleData.inputFileName, result) // 缓存数据，如果点击ReAnalyze需要回显数据 20231101：xiao + this.setCache('CALIBRATION_BETA_' + this.newSampleData.inputFileName, result) // 缓存数据，如果点击ReAnalyze需要回显数据 20231101：xiao this.setFirringResult(result) - } else { this.$message.error(message) } @@ -947,7 +992,7 @@ export default { }, // 封装 fitting后数据填充方法，如果点击ReAnalyze需要回显数据 20231101：xiao - setFirringResult(result){ + setFirringResult(result) { const { EToC, newLineSeries, newScatterSeriesData, tableWidgets, CToE } = result this.newE2C = EToC this.newLineSeries = newLineSeries @@ -1032,15 +1077,15 @@ export default { } return 0 }, - getCache(name){ + getCache(name) { return this.$ls.get(name) }, - setCache(name, data){ + setCache(name, data) { this.$ls.set(name, data) }, - removeCache(name){ + removeCache(name) { this.$ls.remove(name) // 删除fitting之后缓存的数据 20231101:xiao - } + }, }, computed: { rectHeight() { diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue index f523e7c..3dae514 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue @@ -95,9 +95,24 @@ C to E : E = - + - *C + - *C 2 + + + + + *C + + + *C 2

@@ -494,11 +509,11 @@ export default { sampleId, qcFileName, sampleFileName: inputFileName, - fittingBtn: this.isFirstFitting + fittingBtn: this.isFirstFitting, }) if (res.success) { - const { CToE, EToC, gammaEnergy, gammaSpectrum, max, min, oldScatterSeries } = res.result + const { CToE, EToC, gammaEnergy, gammaSpectrum, max, min, oldScatterSeries, newCToE, newEToC } = res.result this.c2e = CToE this.e2c = EToC @@ -530,9 +545,27 @@ export default { // 如果点击过reanalyze则渲染之前fitting的数据，如果没点Reanalyze，数据会在窗口关闭时删掉 20231101：xiao // todo 现在能谱数据没有缓存，刷新页面时也会获取到fitting的数据 - if(this.getCache("CALIBRATION_GAMMA_"+this.newSampleData.inputFileName)) { - this.setFirringResult(this.getCache("CALIBRATION_GAMMA_"+this.newSampleData.inputFileName)) - return false; + if (this.getCache('CALIBRATION_GAMMA_' + this.newSampleData.inputFileName)) { + this.setFirringResult(this.getCache('CALIBRATION_GAMMA_' + this.newSampleData.inputFileName)) + return false + } + + /** + * 对人工交互的返回数据单独处理 + */ + if (this.sampleData.dbName == 'man') { + this.setFirringResult(res.result) + if (newCToE) { + const [paramA, paramB, paramC] = newCToE + this.newCalibrationFuncModel = { + paramA: Number(paramA).toPrecision(6), + paramB: Number(paramB).toPrecision(6), + paramC: Number(paramC).toPrecision(6), + } + } + if (newEToC) { + this.newE2C = newEToC + } } } else { this.$message.error(res.message) @@ -588,7 +621,7 @@ export default { }) // add之后 需要清空chart黄色的线 20231028：Xiao - if(this.figureChartOption.series[1].data) { + if (this.figureChartOption.series[1].data) { this.figureChartOption.series[1].data = [] } @@ -615,14 +648,14 @@ export default { this.isInverse = true }, // 输入框发生变化 - newCalibrationFuncModelChange(val,a) { + newCalibrationFuncModelChange(val, a) { // 输入内容的时候 需要清空table数据 20231028：Xiao this.list = [] // 需要清空chart黄色的线 20231028：Xiao - if(this.figureChartOption.series[1].data) { + if (this.figureChartOption.series[1].data) { this.figureChartOption.series[1].data = [] } - if(this.figureChartOption.series[1].markPoint.data) { + if (this.figureChartOption.series[1].markPoint.data) { this.figureChartOption.series[1].markPoint.data = [] } }, @@ -655,13 +688,16 @@ export default { // 点击Reset Button 重置 async handleReset() { - this.$ls.remove("CALIBRATION_GAMMA_"+this.newSampleData.inputFileName) // 删除fitting之后缓存的数据 20231101:xiao + this.$ls.remove('CALIBRATION_GAMMA_' + this.newSampleData.inputFileName) // 删除fitting之后缓存的数据 20231101:xiao this.newCalibrationFuncModel = cloneDeep(newCalibrationFuncModel) this.list = [] this.newE2C = [] // 按乔的要求增加请求reset的接口 20231211：xiao - const res = await postAction('/spectrumAnalysis/resetButton?tabName=gamma&sampleFileName='+ this.newSampleData.inputFileName, { }) + const res = await postAction( + '/spectrumAnalysis/resetButton?tabName=gamma&sampleFileName=' + this.newSampleData.inputFileName, + {} + ) this.$emit('isFitting', false) @@ -680,32 +716,32 @@ export default { } try { const { success, result, message } = await postAction('/spectrumAnalysis/fitting', { - ...this.list.length <= 0 ? this.newCalibrationFuncModel : [], // 如果list有数据则不传 C to E 表单数据 20231101：xiao + ...(this.list.length <= 0 ? this.newCalibrationFuncModel : []), // 如果list有数据则不传 C to E 表单数据 20231101：xiao sampleFileName: this.newSampleData.inputFileName, - tabName: "gamma", + tabName: 'gamma', // 如果列表中有数据 以列表的数据优先进行分析 20231028：Xiao - tempPoints: this.list.length > 0 - ? this.list.map((item) => ({ x: item.channel, y: item.energy })) - : this.oldScatterSeries, - - // tempPoints: this.isFirstFitting - // ? this.oldScatterSeries - // : this.list.map((item) => ({ x: item.channel, y: item.energy })), + tempPoints: + this.list.length > 0 + ? this.list.map((item) => ({ x: item.channel, y: item.energy })) + : this.oldScatterSeries, + + // tempPoints: this.isFirstFitting + // ? this.oldScatterSeries + // : this.list.map((item) => ({ x: item.channel, y: item.energy })), count: this.isFirstFitting || !this.isInverse ? undefined : this.count, - fittingBtn : this.isFirstFitting + fittingBtn: this.isFirstFitting, }) if (success) { this.gammaIsFitting = true this.$emit('isFitting', true) // 点击reAnalyze按钮，将isFirstFitting改为true 20231101：xiao - this.setCache("CALIBRATION_GAMMA_"+this.newSampleData.inputFileName, result) // 缓存数据，如果点击ReAnalyze需要回显数据 20231101：xiao + this.setCache('CALIBRATION_GAMMA_' + this.newSampleData.inputFileName, result) // 缓存数据，如果点击ReAnalyze需要回显数据 20231101：xiao this.setFirringResult(result) // 通知Beta页清空数据 this.$bus.$emit('betaRefresh', {}) - console.log("betaRefresh>>>"); - + console.log('betaRefresh>>>') } else { this.$message.error(message) } @@ -715,7 +751,7 @@ export default { }, // 封装 fitting后数据填充方法，如果点击ReAnalyze需要回显数据 20231101：xiao - setFirringResult(result){ + setFirringResult(result) { const { EToC, newLineSeries, newScatterSeriesData, tableWidgets, CToE } = result this.newE2C = EToC this.newLineSeries = newLineSeries @@ -797,15 +833,15 @@ export default { } return 0 }, - getCache(name){ + getCache(name) { return this.$ls.get(name) }, - setCache(name, data){ + setCache(name, data) { this.$ls.set(name, data) }, - removeCache(name){ + removeCache(name) { this.$ls.remove(name) // 删除fitting之后缓存的数据 20231101:xiao - } + }, }, } diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue index b356b6b..8523ca9 100644 --- a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue @@ -23,7 +23,7 @@ - From 46c32d3627bb25c2b3095e78f28b81554a00f188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Fri, 22 Mar 2024 15:26:42 +0800 Subject: [PATCH 87/91] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=94=B9=E9=80=A0=EF=BC=8C=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4=EF=BC=8C=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/logManage/index.vue | 128 +++++++++++++++++++++++++++++++++- 1 file changed, 125 insertions(+), 3 deletions(-) diff --git a/src/views/logManage/index.vue b/src/views/logManage/index.vue index 0b4ee06..d28d4bf 100644 --- a/src/views/logManage/index.vue +++ b/src/views/logManage/index.vue @@ -30,6 +30,21 @@
+
+ + + + + + + + + + Search + + + +
+
@@ -108,6 +139,7 @@ export default { data() { this.columns = columns return { + nameStr: '', disableMixinCreated: true, url: { list: '/logManage/findFiles', @@ -121,12 +153,37 @@ export default { visible: false, isGettingDetail: false, logInfo: [], + ipagination: { + current: 1, + pageSize: 10, + pageSizeOptions: ['10', '20', '30'], + showTotal: (total, range) => { + const { current, pageSize } = this.ipagination + return `Total ${total} items　Page ${current} / ${Math.ceil(total / pageSize)}` + }, + showQuickJumper: true, + showSizeChanger: true, + total: 0, + }, } }, created() { this.getTreeData() }, methods: { + onSearch() { + this.loadData() + }, + handlePageChange(page, pageSize) { + this.ipagination.current = page + this.ipagination.pageSize = pageSize + this.loadData() + }, + handleSizeChange(current, size) { + this.ipagination.current = current + this.ipagination.pageSize = size + this.loadData() + }, async getTreeData() { try { this.isGettingTreeData = true @@ -164,6 +221,8 @@ export default { }, onSelect() { this.queryParam.path = this.selectedKeys[0] + this.ipagination.current = 1 + this.ipagination.pageSize = 10 this.loadData() }, @@ -179,10 +238,14 @@ export default { this.onClearSelected() var params = this.getQueryParams() //查询条件 + params.name = this.nameStr + params.pageNo = this.ipagination.current + params.pageSize = this.ipagination.pageSize this.loading = true getAction(this.url.list, params) - .then((res) => { - this.dataSource = res + .then(({ result: { records, total } }) => { + this.dataSource = records + this.ipagination.total = total }) .finally(() => { this.loading = false @@ -302,6 +365,10 @@ export default { } } } + &-list { + position: relative; + overflow: hidden; + } } .log-detail { @@ -314,4 +381,59 @@ export default { } } } +.search-bar { + height: 50px; + border-top: 1px solid rgba(13, 235, 201, 0.3); + border-bottom: 1px solid rgba(13, 235, 201, 0.3); + margin-bottom: 15px; + padding: 8px 10px; + background: rgba(12, 235, 201, 0.05); +} +.ant-input { + width: 266px; +} +::v-deep { + .ant-form-item { + display: flex; + margin-bottom: 0; + .ant-form-item-label, + .ant-form-item-control { + line-height: 32px; + height: 32px; + } + .ant-form-item-label { + flex-shrink: 0; + margin-right: 10px; + label { + font-size: 16px; + font-family: ArialMT; + color: #ade6ee; + &::after { + display: none; + } + } + } + .ant-calendar-range-picker-separator { + color: white; + } + .ant-form-item-control-wrapper { + width: 100%; + // overflow: hidden; + } + } +} +.search-btn { + margin-bottom: 10px; + img { + width: 16px; + height: 17px; + margin-right: 9px; + } +} +.ant-pagination { + position: absolute; + left: 50%; + bottom: 0; + transform: translateX(-50%); +} From 656a02c1ec1bb24b9bf4dc86a9d0901227d107af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Mon, 1 Apr 2024 11:35:36 +0800 Subject: [PATCH 88/91] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E6=8E=92=E7=8F=AD=E4=BB=BB=E5=8A=A1=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=BB=84=E4=BB=B6=E8=B0=83=E6=95=B4=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E7=BB=93=E6=9E=9C=E5=BC=B9=E7=AA=97=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/Scheduling.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/system/Scheduling.vue b/src/views/system/Scheduling.vue index 7070e2c..a8f84ed 100644 --- a/src/views/system/Scheduling.vue +++ b/src/views/system/Scheduling.vue @@ -196,11 +196,11 @@ - + - +
From e9c693ee5110ad8199006bf1c9b7859f89b2c07a Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Thu, 11 Apr 2024 09:58:36 +0800 Subject: [PATCH 89/91] =?UTF-8?q?WIP:=20=E6=80=A7=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/index.js | 2 - src/store/modules/sample.js | 52 ------------ src/utils/SampleStore.js | 84 +++++++++++++++++++ .../spectrumAnalysis/beta-gamma-analysis.vue | 27 ++++-- .../spectrumAnalysis/clearSampleCache.js | 4 +- .../AnalyzeInteractiveToolModal/index.vue | 9 +- .../BetaGammaEnergyCalibrationModal/index.vue | 4 +- src/views/spectrumAnalysis/gamma-analysis.vue | 7 +- src/views/spectrumAnalysis/index.vue | 10 ++- 9 files changed, 125 insertions(+), 74 deletions(-) delete mode 100644 src/store/modules/sample.js create mode 100644 src/utils/SampleStore.js diff --git a/src/store/index.js b/src/store/index.js index b77f9bd..5936c50 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -6,7 +6,6 @@ import user from './modules/user' import permission from './modules/permission' import enhance from './modules/enhance' import online from './modules/online' -import sample from './modules/sample' import getters from './getters' Vue.use(Vuex) @@ -18,7 +17,6 @@ export default new Vuex.Store({ permission, enhance, online, - sample }, state: { diff --git a/src/store/modules/sample.js b/src/store/modules/sample.js deleted file mode 100644 index 71219e2..0000000 --- a/src/store/modules/sample.js +++ /dev/null @@ -1,52 +0,0 @@ -const sample = { - state: Object.freeze({ - sampleList: [] // [{ inputFileName: String; data: Object; }] - }), - mutations: { - SET_SAMPLE_LIST: (state, sampleList) => { - state.sampleList = sampleList - }, - - ADD_SAMPLE_DATA: (state, sampleData) => { - const find = state.sampleList.find(item => item.inputFileName == sampleData.inputFileName) - if (find) { - find.data = sampleData.data - } else { - state.sampleList.push(sampleData) - } - }, - - UPDATE_SAMPLE_DATA: (state, { inputFileName, key, data }) => { - const find = state.sampleList.find(item => item.inputFileName == inputFileName) - if (find) { - find.data[key] = data - } - }, - UPDATE_SAMPLE_DATA_ANALY: (state, { inputFileName, data }) => { - const find = state.sampleList.find(item => item.inputFileName == inputFileName) - if (find) { - data.DetailedInformation = find.data.DetailedInformation - find.data = data - } - }, - - REMOVE_SAMPLE_DATA: (state, inputFileName) => { - const findIndex = state.sampleList.findIndex(item => item.inputFileName == inputFileName) - if(-1 !== findIndex) { - state.sampleList.splice(findIndex, 1) - } - }, - - CLEAR_SAMPLE_DATA: (state) => { - state.sampleList = [] - } - }, - actions: { - GET_SAMPLE_DATA: ({ state }, inputFileName) => { - const find = state.sampleList.find(item => item.inputFileName == inputFileName) - return find ? find : null - } - } -} - -export default sample diff --git a/src/utils/SampleStore.js b/src/utils/SampleStore.js new file mode 100644 index 0000000..a16e82c --- /dev/null +++ b/src/utils/SampleStore.js @@ -0,0 +1,84 @@ +// 所有缓存的谱 +let sampleList = [] + +/** + * 重新设置缓存的谱 + * @param {Array} list + */ +const setSampleList = list => { + sampleList = list +} + +/** + * 缓存一条谱数据 + * @param {*} sampleData + */ +const addSampleData = sampleData => { + const find = sampleList.find(item => item.inputFileName == sampleData.inputFileName) + if (find) { + find.data = sampleData.data + } else { + sampleList.push(sampleData) + } +} + +/** + * 更新谱数据 + * @param {{ inputFileName: string; key: string; data: any; }} param0 + */ +const updateSampleData = ({ inputFileName, key, data }) => { + const find = sampleList.find(item => item.inputFileName == inputFileName) + if (find) { + find.data[key] = data + } +} + +/** + * 移除谱数据 + * @param {string} inputFileName + */ +const removeSampleData = inputFileName => { + const findIndex = sampleList.findIndex(item => item.inputFileName == inputFileName) + if (-1 !== findIndex) { + sampleList.splice(findIndex, 1) + } +} + +/** + * 更新分析数据 + * @param {{ inputFileName: string; data: any; }} param0 + */ +const updateSampleDataAnaly = ({ inputFileName, data }) => { + const find = sampleList.find(item => item.inputFileName == inputFileName) + if (find) { + data.DetailedInformation = find.data.DetailedInformation + find.data = data + } +} + +/** + * 清理缓存列表 + */ +const clearSampleData = () => { + sampleList = [] +} + +/** + * 根据文件名获取谱 + * @param {string} inputFileName + */ +const getSampleData = inputFileName => { + const find = sampleList.find(item => item.inputFileName == inputFileName) + return find ? find : null +} + +export { + sampleList, + setSampleList, + addSampleData, + updateSampleData, + removeSampleData, + updateSampleDataAnaly, + clearSampleData, + getSampleData +} diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 3033f66..183e306 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -121,6 +121,7 @@