From 8c6ee232f4d3db82d559e0e169f86e86019d3189 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 16:11:20 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E5=BF=83?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D=E8=8F=9C=E5=8D=95=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tools/UserMenu.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue index 7e68251..b5e779a 100644 --- a/src/components/tools/UserMenu.vue +++ b/src/components/tools/UserMenu.vue @@ -22,6 +22,11 @@ 系统设置 --> + + + {{ this.userInfo().username }} + + Change Password From 80c1f479969dbbf60f0af7913329ab972d43c5a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Mon, 19 Feb 2024 10:06:45 +0800 Subject: [PATCH 2/8] =?UTF-8?q?ALARM=20--=20=20Analysis=20Monitor=20=20---?= =?UTF-8?q?=20=20=20Avg=20Nuclide=20=E9=A1=B5=E9=9D=A2=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0STATION?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue b/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue index 1c28989..67eb63e 100644 --- a/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue +++ b/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue @@ -89,6 +89,11 @@ import moment from 'moment' import TableList from '../../components/tableList.vue' import { getAction, postAction, httpAction, deleteAction } from '@/api/manage' const columns = [ + { + title: 'STATION', + align: 'center', + dataIndex: 'stationCode', + }, { title: 'NUCLIDE', align: 'center', From d6ef68963bcfad1c0003c605eeaea5fe17cd389b Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Mon, 19 Feb 2024 14:09:20 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=201=E3=80=81focus=20data=E4=B8=AD?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9C=89=E6=8E=92=E7=8F=AD=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA=EF=BC=9B?= =?UTF-8?q?2=E3=80=81Data=20Receive=20status=20Monitoring=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=B8=85=E7=90=86=E7=BC=93=E5=AD=98=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../station-operation/data-item-bg-active.png | Bin 0 -> 1525 bytes .../components/DataListItem.vue | 12 +++-- .../stationOperation/components/MapPane.vue | 50 +++++++++++------- 3 files changed, 39 insertions(+), 23 deletions(-) create mode 100644 src/assets/images/station-operation/data-item-bg-active.png diff --git a/src/assets/images/station-operation/data-item-bg-active.png b/src/assets/images/station-operation/data-item-bg-active.png new file mode 100644 index 0000000000000000000000000000000000000000..15652ead3d1fe09f27f0cd405aef1b09726a3427 GIT binary patch literal 1525 zcmeAS@N?(olHy`uVBq!ia0y~yU~~eq{W;ixl zO)W`OsL0L9E4HezRRWu91!RMS^_3LBN=mYAl^~9a@C{IK&M!(;Fw-;8O*SwvQZTpF zGc+?XF*DFnFfuSQ&^IvEH#E{UG_x`=u`)DQfC43;ZAB?*RzWUqP`iLUTcwPWk^(Dz z{qpj1y>er{{GxPyLrY6beFGzXBO_g)3fZE`@j@w*YQzUNJP7fB~jokyxN_sAmB35=^15FMg%Dxp39RB|)hO_hL1; zIHa;5RX-@TIKQ+g85nVC${?!>telHd6HD@oLh|!-V4)b0kzbNuoRMFkU}UIgq@WR= znU|7ZUaSe$;OlGUnO9trn3tUD>0+w{G(s;kGsViy($dMv(7@5z)y2fn(ACw#$k@fr z)xgo%!pYRd+0+cC*Cju>G&eP`1g19yq1OqgUQk-dEdbi=l3J8mmYU*Ll%J~r_On$c zZns$AG!Lpb1-Dx)aq86vIz}H9vq&)w69Oh55EGtmfgE_sPt5}+_ab1rKH6iuhk=19 z!_&nvq~g|_>$V`AfdRlH_(X}lIe)~#@#Wg^{ zoa-X&9+X60YAzpod5Xcm9VmBYHb%xwES`&+eodyc5i?tC~a z_ZhR4W8%I|B~R~tdE5GQ>Q)Ip4n>8w*&Pc7m@Xa<;Ani2tkL4|#Zbg)!NTN<%A8-< z+`w#6@2O9Flb})xza+R61!{R(1v<>ymQH-rAi$I)0g}98$Rp1V6t!ymC&kR62owhs zP8m!N9E>djgoy%QyXls}aZ#GH*gK3`6r0?&uHITI&7bamhS^2@kifw+S!?ZTia(vc z5%ckRQ)R;nCkdq+q5hNH`Qt>?;%hZ(O?d@EIhs+6w?)~|3CucFk#&E8Rygoo4^$9)y85}Sb4q9e0JZQA$p8QV literal 0 HcmV?d00001 diff --git a/src/views/stationOperation/components/DataListItem.vue b/src/views/stationOperation/components/DataListItem.vue index b065b2d..6c54acc 100644 --- a/src/views/stationOperation/components/DataListItem.vue +++ b/src/views/stationOperation/components/DataListItem.vue @@ -4,7 +4,7 @@ {{ item.stationName || item.stationCode }}
-
+
@@ -42,9 +42,9 @@ export default { props: { item: { - type: Object - } - } + type: Object, + }, + }, } @@ -85,6 +85,10 @@ export default { flex-direction: column; justify-content: space-between; + &.active { + background-image: url(~@/assets/images/station-operation/data-item-bg-active.png); + } + .data-list-item-children { display: flex; justify-content: space-between; diff --git a/src/views/stationOperation/components/MapPane.vue b/src/views/stationOperation/components/MapPane.vue index 584b094..3085a9d 100644 --- a/src/views/stationOperation/components/MapPane.vue +++ b/src/views/stationOperation/components/MapPane.vue @@ -189,7 +189,7 @@
- + day @@ -268,15 +268,11 @@ import CustomModal from '@/components/CustomModal/index.vue' import CustomTree from '@/components/CustomTree/index.vue' import RealTimeDataChart from './RealTimeDataChart.vue' -import { getAction, postAction } from '../../../api/manage' +import { deleteAction, getAction, postAction } from '../../../api/manage' import { MarkerType, FilterIcon } from './markerEnum' import { Vector as VectorLayer } from 'ol/layer' import VectorSource from 'ol/source/Vector' -import { Circle } from 'ol/geom' -import { fromLonLat } from 'ol/proj' -import Feature from 'ol/Feature' -import { Fill, Stroke, Style } from 'ol/style' import { cloneDeep } from 'lodash' // Filter中的筛选列表 @@ -455,8 +451,6 @@ export default { this.initParentMapProps() document.addEventListener('fullscreenchange', this.onFullScreenChange) this.stationList = [] - - this.getDataRecieveSettings() }, destroyed() { document.removeEventListener('fullscreenchange', this.onFullScreenChange) @@ -739,7 +733,16 @@ export default { userId: this.$store.getters.userInfo.id, }) if (success) { + const { cacheTime, scaleInterval, timelineLength, updateIntervalTime, sysUserFocusStations } = result this.initialDataRecieveSettings = result + + this.dataRecieveStatusModel = { + cacheTime, + scaleInterval, + timelineLength, + updateIntervalTime, + } + this.dataStatusCheckedKeys = sysUserFocusStations.map((item) => parseInt(item.stationId)) } else { this.$message.error(message) } @@ -771,6 +774,7 @@ export default { const { success, result, message } = await getAction('/stationOperation/getDataReceivingStatus', { userId: this.$store.getters.userInfo.id, oneStationId: (this.stationInfo && this.stationInfo.stationId) || '', + cacheTime: this.initialDataRecieveSettings.cacheTime, }) this.maskVisi = false this.spinLoading = false @@ -804,24 +808,32 @@ export default { } }, + // 清理接收状态配置缓存 + async clearDataRecieveSetting() { + const { success, message } = await deleteAction('/sysUserFocusStation/deleteUserCache', { + userId: this.$store.getters.userInfo.id, + }) + if (!success) { + throw new Error(message) + } + }, + handleResize() { this.$refs.realtimeChartRef.resize() }, }, watch: { - dataStatusModalVisible(val) { + async dataStatusModalVisible(val) { if (val) { - this.dataStatusCheckedKeys = this.initialDataRecieveSettings.sysUserFocusStations.map((item) => - parseInt(item.stationId) - ) - this.dataRecieveStatusModel = { - cacheTime: this.initialDataRecieveSettings.cacheTime, - scaleInterval: this.initialDataRecieveSettings.scaleInterval, - timelineLength: this.initialDataRecieveSettings.timelineLength, - updateIntervalTime: this.initialDataRecieveSettings.updateIntervalTime, + try { + this.spinLoading = true + await this.clearDataRecieveSetting() + await this.getDataRecieveSettings() + this.startGetDataReceiveStatusList() + } catch (error) { + this.$message.error(error) + this.spinLoading = false } - - this.startGetDataReceiveStatusList() } else { clearInterval(this.timer) } From 6dbf6f99aa1ecdcf7a32948c6332a5f4af81156e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Mon, 19 Feb 2024 14:32:14 +0800 Subject: [PATCH 4/8] =?UTF-8?q?Analysis=20Monitor=20=20---=20Avg=20Nuclide?= =?UTF-8?q?=20=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0station=20=20?= =?UTF-8?q?=E5=92=8C=20source=20type=20=E6=90=9C=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysisMonitor/avgNuclide/index.vue | 80 ++++++++++++++++++- 1 file changed, 77 insertions(+), 3 deletions(-) diff --git a/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue b/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue index 67eb63e..d3c2cfe 100644 --- a/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue +++ b/src/views/abnormalAlarm/analysisMonitor/avgNuclide/index.vue @@ -5,13 +5,43 @@ Config - + Cacl date + + Station + + + + + + Source Type + + + +
@@ -130,6 +160,8 @@ export default { dataSource: [], loading: false, queryParams: { + stationId: undefined, + sourceType: undefined, startDate: dateFormat(new Date(), 'yyyy-MM-dd'), endDate: dateFormat(new Date(), 'yyyy-MM-dd'), }, @@ -153,6 +185,17 @@ export default { index: '', }, currId: '', + stationOptions: [], + sourceOptions: [ + { + label: 'ARMDARR', + value: '1', + }, + { + label: 'ARMDRRR', + value: '2', + }, + ], } }, created() { @@ -162,6 +205,30 @@ export default { this.getNuclideAvgList() }, methods: { + onSourceChange(val) { + console.log(val) + }, + getStationList() { + getAction('/webStatistics/findStationList', { menuName: '' }).then((res) => { + if (res.success) { + if (res.result.length > 0) { + this.stationOptions = res.result.map((item) => { + return { + label: item.stationCode, + value: `${item.stationId}`, + } + }) + } else { + this.stationOptions = [] + } + } else { + this.$message.warning('This operation fails. Contact your system administrator') + } + }) + }, + filterOption(input, option) { + return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 + }, // 获取n天前的日期 getBeforeDate(n) { var n = n @@ -188,8 +255,7 @@ export default { getNuclideAvgList() { this.loading = true let params = { - startDate: this.queryParams.startDate, - endDate: this.queryParams.endDate, + ...this.queryParams, pageNo: this.ipagination.current, pageSize: this.ipagination.pageSize, } @@ -203,6 +269,14 @@ export default { } }) }, + onStationChange(val) { + this.queryParams.stationId = val + this.getNuclideAvgList() + }, + onSourceChange(val) { + this.queryParams.sourceType = val + this.getNuclideAvgList() + }, onRangeDateChange(date, dateString) { this.queryParams.startDate = dateString[0] this.queryParams.endDate = dateString[1] From 183bc52071fa5ab4e302a99c6a6585fe19dc808c Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Mon, 19 Feb 2024 15:46:48 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=B8=8A=E7=9A=84=E5=8F=B0=E7=AB=99=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E8=AF=A5=E5=8F=B0=E7=AB=99=E7=9A=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stationOperation/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/stationOperation/index.vue b/src/views/stationOperation/index.vue index 1767edb..8d50ac1 100644 --- a/src/views/stationOperation/index.vue +++ b/src/views/stationOperation/index.vue @@ -521,12 +521,6 @@ export default { */ onFilterMarker({ filterType, filterDataQuality }) { this.updataFilterType = filterType - console.log( - '%c [ filterType, filterDataQuality ]-343', - 'font-size:13px; background:pink; color:#bf2c9f;', - filterType, - filterDataQuality - ) this.updataFilterDataQuality = [] filterDataQuality.forEach((item) => { if (item === 'Excellent data quality') { @@ -548,7 +542,13 @@ export default { // 地图图标点击 onMarkerClick(stationInfo) { - const { stationType, status } = stationInfo + const { stationType, stationName } = stationInfo + const find = this.orgStationList.find(item => item.stationCode == stationName) + if(!find) { + return + } + + const status = find.status if (stationType !== 'NRL' && stationType !== 'Nuclear Facility' && status !== 'Unoperating') { this.$refs.mapPane.handleOpenAnalyzeModal(stationInfo) } From d9b192cea16ec6d031c4c0830b8de206d36851c5 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Mon, 19 Feb 2024 17:25:27 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=AF=B9Country?= =?UTF-8?q?=20Code=E7=9A=84=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/stationList.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/system/stationList.vue b/src/views/system/stationList.vue index 2a0ecfa..55e4d1b 100644 --- a/src/views/system/stationList.vue +++ b/src/views/system/stationList.vue @@ -188,7 +188,10 @@ export default { } const validateCountryCode = (_, value, callback) => { - if (value && value.length > 2) { + if(!value) { + callback(new Error('Please Enter Country Code')) + } + else if (value.length > 2) { callback(new Error('Country Code Limit 2 Char')) } else { callback() @@ -199,7 +202,7 @@ export default { rules: { stationId: [{ required: true, message: 'Please Enter Station Id' }], stationCode: [{ required: true, validator: validateStationCode }], - countryCode: [{ validator: validateCountryCode }] + countryCode: [{ required: true, validator: validateCountryCode }] }, url: { list: '/gardsStations/findPage', From 829e870ec97b4b2c8d711b069cc5d2b6865bfe33 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Tue, 20 Feb 2024 10:41:45 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feat:=20Gamma=E7=9A=84Spectrum=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E5=A2=9E=E5=8A=A0phd:raw=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Modals/SpectrumModal.vue | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/views/spectrumAnalysis/components/Modals/SpectrumModal.vue b/src/views/spectrumAnalysis/components/Modals/SpectrumModal.vue index 166a2a4..329e0df 100644 --- a/src/views/spectrumAnalysis/components/Modals/SpectrumModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/SpectrumModal.vue @@ -1,9 +1,14 @@ @@ -16,8 +21,9 @@ export default { mixins: [ModalMixin, SampleDataMixin], data() { return { - content: '', - isLoading: true + spectrum: '', + phdSpectrum: '', + isLoading: true, } }, methods: { @@ -27,10 +33,12 @@ export default { const { sampleId, inputFileName: fileName } = this.sampleData const { success, result, message } = await getAction('/gamma/Spectrum', { sampleId, - fileName + fileName, }) if (success) { - this.content = result + const { Spectrum, phdSpectrum } = result + this.spectrum = Spectrum + this.phdSpectrum = (phdSpectrum || []).join('\r\n') } else { this.$message.error(message) } @@ -43,8 +51,8 @@ export default { beforeModalOpen() { this.getContent() - } - } + }, + }, } From f55ca0eb3bbcddbdcc8c8900de9ca552d880c715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Tue, 20 Feb 2024 14:33:11 +0800 Subject: [PATCH 8/8] =?UTF-8?q?Data=20Receive=20status=20Monitoring=20?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=8F=B3=E4=BE=A7=E5=9B=BE=E6=A0=87=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=A1=86=E6=97=B6=E9=97=B4=E4=B8=8E=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=8D=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/stationOperation/components/RealTimeDataChart.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/stationOperation/components/RealTimeDataChart.vue b/src/views/stationOperation/components/RealTimeDataChart.vue index 075af92..37afcc8 100644 --- a/src/views/stationOperation/components/RealTimeDataChart.vue +++ b/src/views/stationOperation/components/RealTimeDataChart.vue @@ -73,7 +73,7 @@ const initialOption = { formatter: (params) => { return `
${params.marker}${params.name}
-
START：${dayjs(new Date(params.value[1])).format('YYYY-MM-DD HH:mm:ss')}
+
START：${dayjs(new Date(params.value[4])).format('YYYY-MM-DD HH:mm:ss')}
END：${dayjs(new Date(params.value[2])).format('YYYY-MM-DD HH:mm:ss')}
` }, @@ -249,6 +249,7 @@ export default { item.dataList.forEach((item) => { this.convertStatus(item) + let originalTime = new Date(item.beginTime * 1000).getTime() let startTime = new Date(item.beginTime * 1000).getTime() if (item.type == 'PHD') { startTime = item.endTime * 1000 - 60 * 1000 * 30 @@ -261,7 +262,7 @@ export default { if (find.isShow) { data.push({ name: item.status, - value: [index, startTime, endTime, duration], + value: [index, startTime, endTime, duration, originalTime], itemStyle: { normal: { color: find.color,