sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2.08

Browse Source
This commit is contained in:
Smile-Xin 2025-02-08 17:31:26 +08:00
parent 35ce87cfb0
commit 38379d9638
3 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/dasadmin/.env.development
View File

@ -8,6 +8,7 @@ VITE_BASE_PATH = './'
# 本地 # 本地
# VITE_APP_PROXY=[["/api","http://192.168.130.22:8080/api"]] # VITE_APP_PROXY=[["/api","http://192.168.130.22:8080/api"]]
# 线上 # 线上
# VITE_APP_PROXY=[["/api","https://192.168.151.18:6379/api"]]
VITE_APP_PROXY=[["/api","https://test.jsspisoft.com/api"]] VITE_APP_PROXY=[["/api","https://test.jsspisoft.com/api"]]

7
ui/dasadmin/src/views/backend/home/windMatrixpage.vue
View File

@ -443,7 +443,11 @@ const getSafeImagePath = (item, type) => {
} }
.wind-default { .wind-default {
background-image: linear-gradient(180deg, #f0f6ff 0%, #ffffff 50%); background-image: linear-gradient(180deg, #f0f6ff 0%, #ffffff 50%);
border: 1px solid #e1edf6; border: 1px solid #ffffff;
// border: 1px solid #e1edf6;
opacity: 1;
background: transparent;
} }
.wind-offline { .wind-offline {
background-image: linear-gradient(180deg, #dddddd 0%, #ffffff 93%); background-image: linear-gradient(180deg, #dddddd 0%, #ffffff 93%);
@ -475,6 +479,7 @@ const getSafeImagePath = (item, type) => {
display: flex; display: flex;
box-sizing: border-box; box-sizing: border-box;
width: 170px; width: 170px;
// width: 170px;
height: 110px; height: 110px;
margin-top: 8px; margin-top: 8px;
margin-bottom: 8px; margin-bottom: 8px;

57
ui/dasadmin/src/views/backend/report/SingleReport.vue
View File

@ -2,7 +2,32 @@
<div class="report" style="width: 100%; height: 100%"> <div class="report" style="width: 100%; height: 100%">
<div class="topForm"> <div class="topForm">
<div class="forms"> <div class="forms">
<el-space> <div>
<el-space style="margin-top: 10px">
<div style="min-width: 30px">模板</div>
<el-select v-model="template" placeholder="请选择模板" class="templateSelect commonSelect">
<el-option v-for="v in reportTemplateList" :key="v.value" :label="v.label" :value="v.value" @click="changeTemplate">
<template #default>
<div class="tamplateOption">
<span>{{ v.label }}</span>
<el-icon style="color: red" @click="delReportTemplate(v.value)">
<Delete />
</el-icon>
</div>
</template>
</el-option>
</el-select>
<div style="width: 20px"></div>
<!-- <div>{{ t('statAnalysis.attributes') }}</div>
<el-input
style="width: 200px; height: 40px"
v-model="currentChoose"
:placeholder="'请选择' + t('statAnalysis.attributes')"
></el-input>
<el-button type="primary" size="small" :icon="Plus" circle @click="chooseMeasurePoint"> </el-button> -->
</el-space>
</div>
<el-space class="parameters">
<div style="min-width: 30px">{{ t('statAnalysis.deviceId') }}</div> <div style="min-width: 30px">{{ t('statAnalysis.deviceId') }}</div>
<el-select <el-select
v-model="windBlowerValue" v-model="windBlowerValue"
@ -40,31 +65,7 @@
<el-option v-for="v in calFunctions" :key="v.value" :label="v.label" :value="v.value"></el-option> <el-option v-for="v in calFunctions" :key="v.value" :label="v.label" :value="v.value"></el-option>
</el-select> </el-select>
</el-space> </el-space>
<div>
<el-space style="margin-top: 10px">
<div style="min-width: 30px">模板</div>
<el-select v-model="template" placeholder="请选择模板" class="templateSelect commonSelect">
<el-option v-for="v in reportTemplateList" :key="v.value" :label="v.label" :value="v.value" @click="changeTemplate">
<template #default>
<div class="tamplateOption">
<span>{{ v.label }}</span>
<el-icon style="color: red" @click="delReportTemplate(v.value)">
<Delete />
</el-icon>
</div>
</template>
</el-option>
</el-select>
<div style="width: 20px"></div>
<!-- <div>{{ t('statAnalysis.attributes') }}</div>
<el-input
style="width: 200px; height: 40px"
v-model="currentChoose"
:placeholder="'请选择' + t('statAnalysis.attributes')"
></el-input>
<el-button type="primary" size="small" :icon="Plus" circle @click="chooseMeasurePoint"> </el-button> -->
</el-space>
</div>
</div> </div>
<div class="buttons"> <div class="buttons">
<el-button class="button" :icon="Search" @click="queryHistoryData" type="primary">查询</el-button> <el-button class="button" :icon="Search" @click="queryHistoryData" type="primary">查询</el-button>
@ -689,4 +690,8 @@ onMounted(() => {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} }
.parameters{
}
</style> </style>