解决提出的问题
This commit is contained in:
parent
976d0576bf
commit
4877550f7b
|
|
@ -271,7 +271,7 @@ function listUpload() {
|
||||||
|
|
||||||
const columns = ref<TableColumn[]>([
|
const columns = ref<TableColumn[]>([
|
||||||
{ prop: 'taskName', label: '任务名称', type: 'text' }, // width: 180
|
{ prop: 'taskName', label: '任务名称', type: 'text' }, // width: 180
|
||||||
{ prop: 'taskStatus', label: '任务状态', type: 'select', colorArr: ['#f42a2a', '#f42a2a', '#ffcb40', '#ffcb40', '#2af442', '#f42a2a'], width: 90 },
|
{ prop: 'taskStatus', label: '任务状态', type: 'select', colorArr: ['#8C8C8C', '#FAAD14', '#1677FF', '#52C41A', '#F5222D', '#fff'], width: 90 },
|
||||||
{ prop: 'releaseType', label: '释放类型', type: 'select', width: 90 },
|
{ prop: 'releaseType', label: '释放类型', type: 'select', width: 90 },
|
||||||
{ prop: 'releaseSourceLocation', label: '释放源位置', type: 'select', width: 100 },
|
{ prop: 'releaseSourceLocation', label: '释放源位置', type: 'select', width: 100 },
|
||||||
{ prop: 'timeRange', label: '数据时间范围', type: 'text', width: 200 },
|
{ prop: 'timeRange', label: '数据时间范围', type: 'text', width: 200 },
|
||||||
|
|
@ -284,7 +284,7 @@ const taskFlag = ref<string>('');
|
||||||
function handleTaskStatusChange(value: number) {
|
function handleTaskStatusChange(value: number) {
|
||||||
console.log('选择的任务状态:', value);
|
console.log('选择的任务状态:', value);
|
||||||
queryForm.value.taskStatus = value;
|
queryForm.value.taskStatus = value;
|
||||||
getList(); // 刷新列表
|
// getList(); // 刷新列表
|
||||||
}
|
}
|
||||||
function addTask(): void {
|
function addTask(): void {
|
||||||
taskFlag.value = 'add';
|
taskFlag.value = 'add';
|
||||||
|
|
@ -907,7 +907,7 @@ onMounted(() => {
|
||||||
@close="viewDetailVisible = false"
|
@close="viewDetailVisible = false"
|
||||||
>
|
>
|
||||||
<!--<ElFormItem :label="t('upload')" style="width: 40%;">-->
|
<!--<ElFormItem :label="t('upload')" style="width: 40%;">-->
|
||||||
<ElButton v-if="uploadButtonShow" type="default" class="custom-btn" style="margin-bottom: 6px;" @click="listUpload">{{ t('upload') }}abc</ElButton>
|
<ElButton v-if="uploadButtonShow" type="default" class="custom-btn" style="margin-bottom: 6px;" @click="listUpload">{{ t('upload') }}</ElButton>
|
||||||
<!--</ElFormItem>-->
|
<!--</ElFormItem>-->
|
||||||
<Table
|
<Table
|
||||||
class="table" :show-index="true" :table-data="detailData" :table-header="detailColumns"
|
class="table" :show-index="true" :table-data="detailData" :table-header="detailColumns"
|
||||||
|
|
@ -1036,79 +1036,79 @@ onMounted(() => {
|
||||||
<!-- 任务详情弹窗 -->
|
<!-- 任务详情弹窗 -->
|
||||||
<Dialog v-model="addVisible" :title="taskFlag === 'edit' ? t('taskDetail') : t('addTask')" width="54vw" class="view-dialog" @close="addVisible = false">
|
<Dialog v-model="addVisible" :title="taskFlag === 'edit' ? t('taskDetail') : t('addTask')" width="54vw" class="view-dialog" @close="addVisible = false">
|
||||||
<ElForm ref="ruleFormRef" :inline="true" :model="detailForm" label-width="160px" class="viewForm" :rules="rules">
|
<ElForm ref="ruleFormRef" :inline="true" :model="detailForm" label-width="160px" class="viewForm" :rules="rules">
|
||||||
<ElFormItem :label="t('taskName')" prop="taskName" style="width: 40%;">
|
<ElFormItem :label="t('taskName')" prop="taskName" style="width: 47%;">
|
||||||
<ElInput v-model="detailForm.taskName" :placeholder="t('pleaseEnter')" />
|
<ElInput v-model="detailForm.taskName" :placeholder="t('pleaseEnter')" />
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem v-if="!(taskFlag==='add' || taskFlag==='edit')" :label="t('taskStatus')" prop="taskStatus" style="width: 40%;">
|
<ElFormItem v-if="!(taskFlag==='add' || taskFlag==='edit')" :label="t('taskStatus')" prop="taskStatus" style="width: 47%;">
|
||||||
<ElSelect v-model="detailForm.taskStatus" :placeholder="t('pleaseSelect')" disabled>
|
<ElSelect v-model="detailForm.taskStatus" :placeholder="t('pleaseSelect')" disabled>
|
||||||
<ElOption v-for="item in taskStatusList" :key="item.value" :label="item.label" :value="item.value" />
|
<ElOption v-for="item in taskStatusList" :key="item.value" :label="item.label" :value="item.value" />
|
||||||
</ElSelect>
|
</ElSelect>
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('releaseType')" prop="releaseType" style="width: 40%;">
|
<ElFormItem :label="t('releaseType')" prop="releaseType" style="width: 47%;">
|
||||||
<ElSelect v-model="detailForm.releaseType" :placeholder="t('pleaseSelect')">
|
<ElSelect v-model="detailForm.releaseType" :placeholder="t('pleaseSelect')">
|
||||||
<ElOption v-for="item in releaseTypeList" :key="item.value" :label="item.label" :value="item.value" />
|
<ElOption v-for="item in releaseTypeList" :key="item.value" :label="item.label" :value="item.value" />
|
||||||
</ElSelect>
|
</ElSelect>
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('releaseSourceLocation')" prop="releaseSourceLocation" style="width: 40%;">
|
<ElFormItem :label="t('releaseSourceLocation')" prop="releaseSourceLocation" style="width: 47%;">
|
||||||
<ElSelect v-model="detailForm.releaseSourceLocation" :placeholder="t('pleaseSelect')">
|
<ElSelect v-model="detailForm.releaseSourceLocation" :placeholder="t('pleaseSelect')">
|
||||||
<ElOption v-for="item in releaseLcationList" :key="item.value" :label="item.label" :value="item.value" />
|
<ElOption v-for="item in releaseLcationList" :key="item.value" :label="item.label" :value="item.value" />
|
||||||
</ElSelect>
|
</ElSelect>
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('lonmin')" prop="lonmin" style="width: 40%;">
|
<ElFormItem :label="t('lonmin')" prop="lonmin" style="width: 47%;">
|
||||||
<ElInput v-model="detailForm.lonmin" type="number" :placeholder="t('pleaseEnter')" />
|
<ElInput v-model="detailForm.lonmin" type="number" :placeholder="t('pleaseEnter')" />
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('latmin')" prop="latmin" style="width: 40%;">
|
<ElFormItem :label="t('latmin')" prop="latmin" style="width: 47%;">
|
||||||
<ElInput v-model="detailForm.latmin" type="number" :placeholder="t('pleaseEnter')" />
|
<ElInput v-model="detailForm.latmin" type="number" :placeholder="t('pleaseEnter')" />
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('lonmax')" prop="lonmax" style="width: 40%;">
|
<ElFormItem :label="t('lonmax')" prop="lonmax" style="width: 47%;">
|
||||||
<ElInput v-model="detailForm.lonmax" type="number" :placeholder="t('pleaseEnter')" />
|
<ElInput v-model="detailForm.lonmax" type="number" :placeholder="t('pleaseEnter')" />
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('latmax')" prop="latmax" style="width: 40%;">
|
<ElFormItem :label="t('latmax')" prop="latmax" style="width: 47%;">
|
||||||
<ElInput v-model="detailForm.latmax" type="number" :placeholder="t('pleaseEnter')" />
|
<ElInput v-model="detailForm.latmax" type="number" :placeholder="t('pleaseEnter')" />
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('srsStartTime')" prop="srsStartTime" style="width: 40%;">
|
<ElFormItem :label="t('srsStartTime')" prop="srsStartTime" style="width: 47%;">
|
||||||
<ElDatePicker
|
<ElDatePicker
|
||||||
v-model="detailForm.srsStartTime" type="date" :placeholder="t('selectDateTime')"
|
v-model="detailForm.srsStartTime" type="date" :placeholder="t('selectDateTime')"
|
||||||
value-format="YYYY-MM-DD"
|
value-format="YYYY-MM-DD"
|
||||||
/>
|
/>
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('srsEndTime')" prop="srsEndTime" style="width: 40%;">
|
<ElFormItem :label="t('srsEndTime')" prop="srsEndTime" style="width: 47%;">
|
||||||
<ElDatePicker
|
<ElDatePicker
|
||||||
v-model="detailForm.srsEndTime" type="date" :placeholder="t('selectDateTime')"
|
v-model="detailForm.srsEndTime" type="date" :placeholder="t('selectDateTime')"
|
||||||
value-format="YYYY-MM-DD"
|
value-format="YYYY-MM-DD"
|
||||||
/>
|
/>
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('qmin')" prop="qmin" style="width: 40%;">
|
<ElFormItem :label="t('qmin')" prop="qmin" style="width: 47%;">
|
||||||
<ElInput v-model="detailForm.qmin" type="number" :placeholder="t('pleaseEnter')" />
|
<ElInput v-model="detailForm.qmin" type="number" :placeholder="t('pleaseEnter')" />
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('qmax')" prop="qmax" style="width: 40%;">
|
<ElFormItem :label="t('qmax')" prop="qmax" style="width: 47%;">
|
||||||
<ElInput v-model="detailForm.qmax" type="number" :placeholder="t('pleaseEnter')" />
|
<ElInput v-model="detailForm.qmax" type="number" :placeholder="t('pleaseEnter')" />
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('resolution')" prop="resolution" style="width: 40%;">
|
<ElFormItem :label="t('resolution')" prop="resolution" style="width: 47%;">
|
||||||
<ElInput v-model="detailForm.resolution" :placeholder="t('pleaseEnter')" />
|
<ElInput v-model="detailForm.resolution" :placeholder="t('pleaseEnter')" />
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('halflife')" prop="halflife" style="width: 40%;">
|
<ElFormItem :label="t('halflife')" prop="halflife" style="width: 47%;">
|
||||||
<ElInput v-model="detailForm.halflife" type="number" :placeholder="t('pleaseEnter')" />
|
<ElInput v-model="detailForm.halflife" type="number" :placeholder="t('pleaseEnter')" />
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('sourceLon')" prop="sourceLon" style="width: 40%;">
|
<ElFormItem :label="t('sourceLon')" prop="sourceLon" style="width: 47%;">
|
||||||
<ElInput v-model="detailForm.sourceLon" type="number" :placeholder="t('pleaseEnter')" />
|
<ElInput v-model="detailForm.sourceLon" type="number" :placeholder="t('pleaseEnter')" />
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('sourceLat')" prop="sourceLat" style="width: 40%;">
|
<ElFormItem :label="t('sourceLat')" prop="sourceLat" style="width: 47%;">
|
||||||
<ElInput v-model="detailForm.sourceLat" type="number" :placeholder="t('pleaseEnter')" />
|
<ElInput v-model="detailForm.sourceLat" type="number" :placeholder="t('pleaseEnter')" />
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('releaseStartTime')" prop="releaseStartTime" style="width: 46%;">
|
<ElFormItem :label="t('releaseStartTime')" prop="releaseStartTime" style="width: 47%;">
|
||||||
<ElDatePicker
|
<ElDatePicker
|
||||||
v-model="detailForm.releaseStartTime" type="datetime" :placeholder="t('selectDateTime')"
|
v-model="detailForm.releaseStartTime" type="datetime" :placeholder="t('selectDateTime')"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
/>
|
/>
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('releaseEndTime')" prop="releaseEndTime" style="width: 46%;">
|
<ElFormItem :label="t('releaseEndTime')" prop="releaseEndTime" style="width: 47%;">
|
||||||
<ElDatePicker
|
<ElDatePicker
|
||||||
v-model="detailForm.releaseEndTime" type="datetime" :placeholder="t('selectDateTime')"
|
v-model="detailForm.releaseEndTime" type="datetime" :placeholder="t('selectDateTime')"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD HH:mm:ss"
|
||||||
/>
|
/>
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
<ElFormItem :label="t('sourceStrength')" prop="halflife" style="width: 40%;">
|
<ElFormItem :label="t('sourceStrength')" prop="halflife" style="width: 47%;">
|
||||||
<ElInput v-model="detailForm.sourceStrength" type="number" :placeholder="t('pleaseEnter')" />
|
<ElInput v-model="detailForm.sourceStrength" type="number" :placeholder="t('pleaseEnter')" />
|
||||||
</ElFormItem>
|
</ElFormItem>
|
||||||
|
|
||||||
|
|
@ -1338,6 +1338,17 @@ onMounted(() => {
|
||||||
margin: 16px 0;
|
margin: 16px 0;
|
||||||
// flex:0.5;
|
// flex:0.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
justify-content: space-between;
|
||||||
|
padding: 0 3%;
|
||||||
|
|
||||||
|
::v-deep .el-form-item__content{
|
||||||
|
.el-input{
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
:deep(.el-dialog__footer) {
|
:deep(.el-dialog__footer) {
|
||||||
|
|
|
||||||
|
|
@ -171,7 +171,7 @@ defineExpose({
|
||||||
function getData() {
|
function getData() {
|
||||||
// 观测值和模拟值的活度浓度比较结果数据
|
// 观测值和模拟值的活度浓度比较结果数据
|
||||||
// taskId: props.taskId
|
// taskId: props.taskId
|
||||||
getAcTimeSeries({ taskId: 8 }, (responce: any) => {
|
getAcTimeSeries({ taskId: props.taskId}, (responce: any) => {
|
||||||
const resuit = responce.result;
|
const resuit = responce.result;
|
||||||
let maxValue = 0;
|
let maxValue = 0;
|
||||||
let minValue = 0;
|
let minValue = 0;
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,10 @@ import { ref } from 'vue';
|
||||||
import { useECharts } from '@/hooks/useECharts';
|
import { useECharts } from '@/hooks/useECharts';
|
||||||
import { exportUnivariateTxt, getUnivariate } from '@/utils/axios/yxcj';
|
import { exportUnivariateTxt, getUnivariate } from '@/utils/axios/yxcj';
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
taskId: Number,
|
||||||
|
});
|
||||||
|
|
||||||
const diskCardRef = ref();
|
const diskCardRef = ref();
|
||||||
function setLonData(data: any) {
|
function setLonData(data: any) {
|
||||||
const histogramData = data?.histogramChartBarDataList.map((item: { xleftVal: any; yvalue: any; xrightVal: any }) => {
|
const histogramData = data?.histogramChartBarDataList.map((item: { xleftVal: any; yvalue: any; xrightVal: any }) => {
|
||||||
|
|
@ -651,7 +655,7 @@ function setStartData(data) {
|
||||||
}
|
}
|
||||||
const resFlag = ref(false);
|
const resFlag = ref(false);
|
||||||
function getData() {
|
function getData() {
|
||||||
getUnivariate({ taskId: 8 }, (res) => {
|
getUnivariate({ taskId: props.taskId }, (res) => {
|
||||||
// console.log(res, 'res');
|
// console.log(res, 'res');
|
||||||
const { lonChartStru, latChartStru, log10_QChartStru, stopChartStru, startChartStru } = res.result;
|
const { lonChartStru, latChartStru, log10_QChartStru, stopChartStru, startChartStru } = res.result;
|
||||||
setLonData(lonChartStru);
|
setLonData(lonChartStru);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user