xiaoguangbin/AnalysisSystemForRadionuclide_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-dev' into feature-Beta-dev-renpy

Browse Source
This commit is contained in:
任珮宇 2024-01-25 16:19:47 +08:00
commit 3291baf499
11 changed files with 188 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/jeecgbiz/JSelectUserByDep.vue
View File

@ -2,11 +2,11 @@
<div>
<a-input-search
v-model="textVals"
placeholder="请先选择用户"
placeholder="Please select the user first"
readOnly
unselectable="on"
@search="onSearchDepUser">
<a-button slot="enterButton" :disabled="disabled">选择用户</a-button>
<a-button slot="enterButton" :disabled="disabled">Select user</a-button>
</a-input-search>
<j-select-user-by-dep-modal
ref="selectModal"
@ -120,7 +120,7 @@
this.$refs.selectModal.showModal()
},
selectOK(rows) {
console.log("当前选中用户", rows)
console.log("Currently selected user", rows)
if (!rows) {
this.storeVals = ''
this.textVals = ''

62
src/views/modules/message/SysMessageList.vue
View File

@ -6,28 +6,28 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<a-form-item label="消息标题">
<a-input placeholder="请输入消息标题" v-model="queryParam.esTitle"></a-input>
<a-form-item label="Message header">
<a-input placeholder="Please enter the message title" v-model="queryParam.esTitle"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<a-form-item label="发送内容">
<a-input placeholder="请输入发送内容" v-model="queryParam.esContent"></a-input>
<a-form-item label="Send content">
<a-input placeholder="Please enter the content to send" v-model="queryParam.esContent"></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8">
<a-form-item label="接收人">
<a-input placeholder="请输入接收人" v-model="queryParam.esReceiver"></a-input>
<a-form-item label="receiver">
<a-input placeholder="Please enter the recipient" v-model="queryParam.esReceiver"></a-input>
</a-form-item>
</a-col>
</template>
<a-col :md="6" :sm="8">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a-button type="primary" @click="searchQuery" icon="search">Search</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">Reset</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
{{ toggleSearchStatus ? 'Pack up' : 'unfold' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
@ -39,20 +39,20 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" v-show="show" type="primary" icon="plus">新增</a-button>
<a-button type="primary" v-show="show" icon="download" @click="handleExportXls('消息')">导出</a-button>
<a-button @click="handleAdd" v-show="show" type="primary" icon="plus">ADD</a-button>
<a-button type="primary" v-show="show" icon="download" @click="handleExportXls('消息')">Export</a-button>
<a-upload v-show="show" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
<a-button type="primary" icon="import">Import</a-button>
</a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel">
<a-icon type="delete"/>
删除
Delete
</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作
<a-button style="margin-left: 8px"> Batch operation
<a-icon type="down"/>
</a-button>
</a-dropdown>
@ -61,9 +61,9 @@
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
selectedRowKeys.length }}</a>项
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
<i class="anticon anticon-info-circle ant-alert-icon"></i> Selected <a style="font-weight: 600">{{
selectedRowKeys.length }}</a>item
<a style="margin-left: 24px" @click="onClearSelected">Clear</a>
</div>
<a-table
@ -84,17 +84,17 @@
</span>
<span slot="action" slot-scope="text, record">
<a href="javascript:;" @click="handleDetail(record)">详情</a>
<a href="javascript:;" @click="handleDetail(record)">Details</a>
<a-divider type="vertical"/>
<a-dropdown>
<a class="ant-dropdown-link">更多<a-icon type="down"/></a>
<a class="ant-dropdown-link">More<a-icon type="down"/></a>
<a-menu slot="overlay">
<a-menu-item v-show="show">
<a @click="handleEdit(record)">编辑</a>
<a @click="handleEdit(record)">Edit</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
<a-popconfirm title="Are you sure to delete it?" @confirm="() => handleDelete(record.id)">
<a>Delete</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
@ -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'},

78
src/views/modules/message/SysMessageTemplateList.vue
View File

@ -7,33 +7,33 @@
<a-row :gutter="24">
<a-col :md="6" :sm="8">
<a-form-item label="模板CODE">
<a-input placeholder="请输入模板CODE" v-model="queryParam.templateCode"></a-input>
<a-form-item label="TEMPLATE CODE">
<a-input placeholder="Please enter the template CODE" v-model="queryParam.templateCode"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<a-form-item label="模板内容">
<a-input placeholder="请输入模板内容" v-model="queryParam.templateContent"></a-input>
<a-form-item label="TEMPLATE Content">
<a-input placeholder="Please enter the template content" v-model="queryParam.templateContent"></a-input>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="8">
<a-form-item label="模板标题">
<a-input placeholder="请输入模板标题" v-model="queryParam.templateName"></a-input>
<a-form-item label="TEMPLATE Title">
<a-input placeholder="Please enter the template title" v-model="queryParam.templateName"></a-input>
</a-form-item>
</a-col>
<a-col :md="6" :sm="8">
<a-form-item label="模板类型">
<j-dict-select-tag placeholder="请选择模板类型" v-model="queryParam.templateType" dictCode="msgType"></j-dict-select-tag>
<a-form-item label="TEMPLATE Type">
<j-dict-select-tag placeholder="Please check the template type" v-model="queryParam.templateType" dictCode="msgType"></j-dict-select-tag>
</a-form-item>
</a-col>
</template>
<a-col :md="6" :sm="8">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a-button type="primary" @click="searchQuery" icon="search">Search</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">Reset</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
{{ toggleSearchStatus ? 'Pack up' : 'unfold' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
@ -45,11 +45,11 @@
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('消息模板')">导出</a-button>
<a-button @click="handleAdd" type="primary" icon="plus">ADD</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('消息模版')">Export</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
<a-button type="primary" icon="import">Import</a-button>
</a-upload>
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
@ -67,9 +67,9 @@
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
selectedRowKeys.length }}</a>项
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
<i class="anticon anticon-info-circle ant-alert-icon"></i> Selected <a style="font-weight: 600">{{
selectedRowKeys.length }}</a>item
<a style="margin-left: 24px" @click="onClearSelected">Clear</a>
</div>
<a-table
@ -91,26 +91,26 @@
<span slot="action" slot-scope="text, record">
<a @click="handleMyEdit(record)">编辑</a>
<a @click="handleMyEdit(record)">Edit</a>
<a-divider type="vertical"/>
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
<a class="ant-dropdown-link">More <a-icon type="down"/></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleUse(record)">应用</a>
<a @click="handleUse(record)">Use</a>
</a-menu-item>
<a-menu-item>
<a @click="handleNotUse(record)">停用</a>
<a @click="handleNotUse(record)">NotUse</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record)">
<a>删除</a>
<a-popconfirm title="Are you sure to delete it?" @confirm="() => handleDelete(record)">
<a>Delete</a>
</a-popconfirm>
</a-menu-item>
<a-menu-item>
<a @click="handleTest(record)">发送测试</a>
<a @click="handleTest(record)">Send test</a>
</a-menu-item>
</a-menu>
</a-dropdown>
@ -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;

38
src/views/modules/message/modules/SysMessageModal.vue
View File

@ -15,70 +15,70 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="消息标题">
<a-input placeholder="请输入消息标题" v-decorator="['esTitle', {}]"/>
label="Message header">
<a-input placeholder="Please enter the message title" v-decorator="['esTitle', {}]"/>
</a-form-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="发送内容">
<a-input placeholder="请输入发送内容" v-decorator="['esContent', {}]"/>
label="Send content">
<a-input placeholder="Please enter the content to send" v-decorator="['esContent', {}]"/>
</a-form-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="发送所需参数">
<a-input placeholder="请输入发送所需参数Json格式" v-decorator="['esParam', {}]"/>
label="Send required parameters">
<a-input placeholder="Please enter the required parameters in Json format" v-decorator="['esParam', {}]"/>
</a-form-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="接收人">
<a-input placeholder="请输入接收人" v-decorator="['esReceiver', {}]"/>
label="receiver">
<a-input placeholder="Please enter the recipient" v-decorator="['esReceiver', {}]"/>
</a-form-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="发送方式">
<j-dict-select-tag :triggerChange="true" dictCode="msgType" v-decorator="[ 'esType', {}]" placeholder="请选择发送方式">
label="Sending mode">
<j-dict-select-tag :triggerChange="true" dictCode="msgType" v-decorator="[ 'esType', {}]" placeholder="Please select a sending method">
</j-dict-select-tag>
</a-form-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="发送时间">
label="Sending time">
<a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'esSendTime', {}]"/>
</a-form-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="发送状态">
<j-dict-select-tag :triggerChange="true" dictCode="msgSendStatus" v-decorator="[ 'esSendStatus', {}]" placeholder="请选择发送状态">
label="Sending state">
<j-dict-select-tag :triggerChange="true" dictCode="msgSendStatus" v-decorator="[ 'esSendStatus', {}]" placeholder="Please select Send status">
</j-dict-select-tag>
</a-form-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="发送次数">
label="Transmission times">
<a-input-number v-decorator="[ 'esSendNum', {}]"/>
</a-form-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="发送失败原因">
label="Cause of sending failure">
<a-input v-decorator="['esResult', {}]"/>
</a-form-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="备注">
label="remark">
<a-input v-decorator="['remark', {}]"/>
</a-form-item>
</a-form>
</a-spin>
<div v-show="!disableSubmit">
<a-button style="margin-right: .8rem" @confirm="handleCancel">取消</a-button>
<a-button @click="handleOk" type="primary" :loading="confirmLoading">提交</a-button>
<a-button style="margin-right: .8rem" @confirm="handleCancel">Cancel</a-button>
<a-button @click="handleOk" type="primary" :loading="confirmLoading">Submit</a-button>
</div>
</a-drawer>
</template>
@ -92,7 +92,7 @@
name: "SysMessageModal",
data() {
return {
title: "操作",
title: "Operation",
visible: false,
model: {},
labelCol: {

47
src/views/modules/message/modules/SysMessageTemplateModal.vue
View File

@ -6,70 +6,67 @@
:confirmLoading="confirmLoading"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭">
cancelText="Cancel">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
<a-row :gutter="{ xs: 8, sm: 16, md: 24, lg: 32 }">
<a-col :span="12">
<a-row class="form-row" :gutter="24" >
<a-col :span="24">
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="模板CODE"
style="margin-right: -35px"
label="Template Code"
>
<a-input
:disabled="disable"
placeholder="请输入模板编码"
placeholder="Please enter the template code"
v-decorator="['templateCode', validatorRules.templateCode ]"
/>
</a-form-item>
</a-col>
<a-col :span="12">
<a-col :span="24">
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="模板类型">
<j-dict-select-tag @change="handleChangeTemplateType" :triggerChange="true" dictCode="msgType" v-decorator="['templateType', validatorRules.templateType ]" placeholder="请选择模板类型">
label="Template type">
<j-dict-select-tag @change="handleChangeTemplateType" :triggerChange="true" dictCode="msgType" v-decorator="['templateType', validatorRules.templateType ]" placeholder="Please select a template type">
</j-dict-select-tag>
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24" >
<a-col :span="24" pull="2">
<a-col :span="24">
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="模板标题"
style="margin-left: -15px">
label="Template title">
<a-input
placeholder="请输入模板标题"
placeholder="Please enter the template title"
v-decorator="['templateName', validatorRules.templateName]"
style="width: 122%"
style="width: 100%"
/>
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24" >
<a-col :span="24" pull="2">
<a-col :span="24">
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="是否应用"
label="useStatus"
style="margin-left: -15px">
<j-switch v-decorator="['useStatus', validatorRules.useStatus]" :options="['1', '0']"></j-switch>
</a-form-item>
</a-col>
</a-row>
<a-row class="form-row" :gutter="24">
<a-col :span="24" pull="4">
<a-col :span="24">
<a-form-item
v-show="!useEditor"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="模板内容"
style="margin-left: 4px;width: 126%">
<a-textarea placeholder="请输入模板内容" v-decorator="['templateContent', validatorRules.templateContent ]" :autosize="{ minRows: 8, maxRows: 8 }"/>
label="Template content">
<a-textarea placeholder="Please enter the template content" v-decorator="['templateContent', validatorRules.templateContent ]" :autosize="{ minRows: 8, maxRows: 8 }"/>
</a-form-item>
</a-col>
</a-row>
@ -79,7 +76,7 @@
v-show="useEditor"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="模板内容"
label="Template content"
style="margin-left: 4px;width: 126%">
<j-editor v-model="templateEditorContent"></j-editor>
</a-form-item>
@ -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",

20
src/views/modules/message/modules/SysMessageTestModal.vue
View File

@ -6,43 +6,43 @@
:confirmLoading="confirmLoading"
@ok="handleOk"
@cancel="handleCancel"
cancelText="关闭">
cancelText="Cancel">
<a-spin :spinning="confirmLoading">
<a-form>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="模板标题">
label="Template title">
<a-input disabled v-model="templateName"/>
</a-form-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="模板内容">
label="Template content">
<a-textarea disabled v-model="templateContent" :autosize="{ minRows: 5, maxRows: 8 }"/>
</a-form-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="测试数据">
<a-textarea placeholder="请输入json格式测试数据" v-model="testData" :autosize="{ minRows: 5, maxRows: 8 }"/>
label="Test data">
<a-textarea placeholder="Please enter the test data in json format" v-model="testData" :autosize="{ minRows: 5, maxRows: 8 }"/>
</a-form-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="消息类型">
label="Message type">
<j-dict-select-tag
v-model="msgType"
type="radio"
placeholder="请选择消息类型"
placeholder="Please select a message type"
dictCode="messageType"/>
</a-form-item>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
label="消息接收方">
<j-select-user-by-dep placeholder="请选择消息接收方" v-model="receiver"></j-select-user-by-dep>
label="Message receiver">
<j-select-user-by-dep placeholder="Please select a message recipient" v-model="receiver"></j-select-user-by-dep>
</a-form-item>
</a-form>
</a-spin>
@ -60,7 +60,7 @@
},
data() {
return {
title: "操作",
title: "Operation",
visible: false,
model: {},
labelCol: {

8
src/views/spectrumAnalysis/beta-gamma-analysis.vue
View File

@ -26,7 +26,7 @@
<!-- 左侧图表 -->
<div class="beta-gamma-spectrum-sample">
<beta-gamma-chart-container>
<template slot="title"> Beta-Gamma Spectrum: Sample </template>
<template slot="title"> Beta-Gamma Spectrum: {{ currSpectrum }} </template>
<beta-gamma-spectrum-chart
ref="betaGammaChartRef"
:histogramDataList="histogramDataList"
@ -191,6 +191,7 @@ export default {
this.SampleType = SampleType
return {
currSpectrum: '',
// analyseCurrentSpectrum: {},
qcFlags: {},
@ -386,6 +387,11 @@ export default {
if (val === 'qc' && !this.sampleDetail.qc) {
this.$message.warning('No qc spectrum file!')
} else {
if (val == 'sample') this.currSpectrum = 'Sample'
if (val == 'gasBg') this.currSpectrum = 'Gas'
if (val == 'detBg') this.currSpectrum = 'Det'
if (val == 'qc') this.currSpectrum = 'QC'
const {
betaOriginalData,
betaProjectedData,

1
src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue
View File

@ -340,6 +340,7 @@ export default {
// 点击改变Beta-Gamma Spectrum: Sample图表类型
handleChange(index) {
this.active = index
this.handleUnzoom()
// 因第一个二维的图表采用的v-show(为了响应Unzoom事件)，而在该图表不显示的时候，且改变了浏览器大小触发resize时，大小会变为0, 故在切换回来的时候resize一下
if (this.active == 0) {

1
src/views/stationOperation/components/Map.vue
View File

@ -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({

89
src/views/stationOperation/components/MapMarker.vue
View File

@ -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 = ` <div class="inner-ripple-excellent-1"></div>
<div class="inner-ripple-excellent-2"></div>
`
} else if (quality == "good") {
} else if (quality == 'good') {
rippleDiv.innerHTML = ` <div class="inner-ripple-good-1"></div>
<div class="inner-ripple-good-2"></div>
`
} else if(quality == "bad"){
} else if (quality == 'bad') {
rippleDiv.innerHTML = ` <div class="inner-ripple-bad-1"></div>
<div class="inner-ripple-bad-2"></div>
`
@ -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,13 +219,14 @@ 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 => {
let params =
this.currList.find((item) => {
return item.stationId === result.stationId
}) || {}
this.currStationInfo = { ...result, ...params }
@ -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,
},
},
}
</script>
<style lang="less" scoped>
@ -362,7 +365,12 @@ export default {
width: 100%;
height: 100%;
border-radius: 50%;
background-image: radial-gradient(circle, transparent 10%, rgba(187, 138, 18, 0.2) 30%, rgba(187, 138, 18, 0.5) 60%);
background-image: radial-gradient(
circle,
transparent 10%,
rgba(187, 138, 18, 0.2) 30%,
rgba(187, 138, 18, 0.5) 60%
);
animation: rippleEffect @duration linear 0s infinite;
}
@ -373,7 +381,12 @@ export default {
height: 100%;
border-radius: 50%;
transform: scale(0);
background-image: radial-gradient(circle, transparent 10%, rgba(187, 138, 18, 0.2) 30%, rgba(187, 138, 18, 0.5) 60%);
background-image: radial-gradient(
circle,
transparent 10%,
rgba(187, 138, 18, 0.2) 30%,
rgba(187, 138, 18, 0.5) 60%
);
animation: rippleEffect @duration linear @delay infinite;
}
.inner-ripple-bad-1 {

4
src/views/stationOperation/index.vue
View File

@ -548,8 +548,8 @@ export default {
// 地图图标点击
onMarkerClick(stationInfo) {
const { stationType } = stationInfo
if (stationType !== 'NRL' && stationType !== 'Nuclear Facility') {
const { stationType, status } = stationInfo
if (stationType !== 'NRL' && stationType !== 'Nuclear Facility' && status !== 'Unoperating') {
this.$refs.mapPane.handleOpenAnalyzeModal(stationInfo)
}
},