chengdandan
/
TransFlow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

20230222

This commit is contained in:
chengdandan 2023-02-22 15:52:47 +08:00
parent 390216761c
commit 407c084e90
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/chart/lineChart.vue
View File

@ -147,12 +147,12 @@ export default {
} }
}, },
mounted() { mounted() {
// this.drawLine(); this.drawLine();
}, },
watch: { watch: {
list: { list: {
handler(newVal) { handler(newVal) {
if (newVal ) { if (newVal.length!=0) {
// x轴的数据 // x轴的数据
this.xData = newVal.map(val => { this.xData = newVal.map(val => {
@ -182,7 +182,7 @@ export default {
confine: true confine: true
}; };
this.series[0].name = '总量'; this.series[0].name = '总量';
console.log("折线图",newVal)
// 映射出类型数组 // 映射出类型数组
let arr = newVal.map(function(ele) { let arr = newVal.map(function(ele) {
if (ele.type_data != null) { if (ele.type_data != null) {

7
src/components/target/typeChart.vue
View File

@ -4,7 +4,7 @@
<p class="chartTitle"><span class="titleIcon"></span> {{ componentName }} {{ triggerType }}</p> <p class="chartTitle"><span class="titleIcon"></span> {{ componentName }} {{ triggerType }}</p>
<!-- 触发数据数值渲染 --> <!-- 触发数据数值渲染 -->
<div class="typeContent" v-if="triggerType == '触发' || '周期时刻'"> <div class="typeContent" v-if="triggerType == '触发' || '周期时刻'">
<div v-if="dataArr && dataArr.length != 0"> <div v-if="dataArr && dataArr.length != 0 && dataArr!=undefined">
<div v-if="title == '类型'" style="display:flex"> <div v-if="title == '类型'" style="display:flex">
<el-card v-for="(n, i) in typeValue.type_data" :key="i" style="width: 150px; margin-bottom: 20px; text-align: center"> <el-card v-for="(n, i) in typeValue.type_data" :key="i" style="width: 150px; margin-bottom: 20px; text-align: center">
<div> <div>
@ -21,7 +21,7 @@
</div> </div>
</div> </div>
<el-card v-show="echartArr.includes('数值')" style="width: 150px; margin-bottom: 20px; text-align: center"> <el-card v-show="echartArr.includes('数值')" style="width: 150px; margin-bottom: 20px; text-align: center">
<div v-if="dataArr"> <div v-if="dataArr&& dataArr.length != 0 && dataArr!=undefined">
<div v-if="title == '类型'"> <div v-if="title == '类型'">
<span style="font-size: 15px;">类型数量总和</span><br /> <span style="font-size: 15px;">类型数量总和</span><br />
<span style="font-size: 30px; font-weight: bold"> <span style="font-size: 30px; font-weight: bold">
@ -65,7 +65,7 @@
</el-card> </el-card>
</div> </div>
<div v-show="echartArr.includes('表格')"> <div v-show="echartArr.includes('表格')">
<div class="tableTitle" v-if="dataArr"> <div class="tableTitle" v-if="dataArr&& dataArr.length != 0 && dataArr!=undefined">
<div> <div>
<span <span
style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;" style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"
@ -86,6 +86,7 @@
<div class="border" v-if="echartArr.includes('曲线图')"> <div class="border" v-if="echartArr.includes('曲线图')">
<detailDialog /> <detailDialog />
<lineChart <lineChart
v-if="dataArr && dataArr.length != 0 && dataArr!=undefined"
:componentName="componentName" :componentName="componentName"
:chartName="chartName" :chartName="chartName"
:pageType="pageType" :pageType="pageType"

7
src/views/bounced/dataBoard.vue
View File

@ -32,11 +32,10 @@
:componentName="o.componentName" :echartArr="o.presentationForm" :componentName="o.componentName" :echartArr="o.presentationForm"
:dataArr="o.trigger" :title="o.componentName.split('_')[0]" :dataArr="o.trigger" :title="o.componentName.split('_')[0]"
:chartName="o.combinationName" /> :chartName="o.combinationName" />
<!--触发的组件 -->
<typeChart v-if="o.timeMode === '触发'" :pageType="o.graphicType" <typeChart v-if="o.timeMode === '触发'" :pageType="o.graphicType"
:triggerType="o.timeMode" :componentName="o.componentName" :dataArr="o.trigger" :triggerType="o.timeMode" :componentName="o.componentName" :dataArr="o.trigger"
:echartArr="o.presentationForm" :title="o.componentName.split('_')[0]" :echartArr="o.presentationForm" :title="o.componentName.split('_')[0]"
:chartName="o.combinationName" :typeValue="typeValue" /> :chartName="o.combinationName" :typeValue="typeTimeMode" />
<typeChart v-if="o.timeMode === '周期时刻'" :pageType="o.graphicType" <typeChart v-if="o.timeMode === '周期时刻'" :pageType="o.graphicType"
:triggerType="o.timeMode" :componentName="o.componentName" :triggerType="o.timeMode" :componentName="o.componentName"
:dataArr="o.cycleTimeData" :echartArr="o.presentationForm" :dataArr="o.cycleTimeData" :echartArr="o.presentationForm"
@ -347,7 +346,7 @@ export default {
sectionArr: [], sectionArr: [],
//触发的类型数值看板显示 //触发的类型数值看板显示
typeValue: {}, typeTimeMode: {},
// 周期时刻的数值看板展示 // 周期时刻的数值看板展示
typeCycleTimeData: {}, typeCycleTimeData: {},
typeCycleStatistics: {}, typeCycleStatistics: {},
@ -496,7 +495,7 @@ export default {
// 该时间的触发数据 // 该时间的触发数据
if (item.type_data != null) { if (item.type_data != null) {
// console.log(item,'461461'); // console.log(item,'461461');
this.typeValue = item this.typeTimeMode = item
} }
ele.trigger.unshift(item) ele.trigger.unshift(item)
} }

16
src/views/index.vue
View File

@ -1029,14 +1029,14 @@ export default {
message: res.data.msg, message: res.data.msg,
type: 'success' type: 'success'
}); });
setTimeout(() => { // setTimeout(() => {
this.$message({ // this.$message({
type: 'warning', // type: 'warning',
message: '请点击交通分析，获取最新数据！', // message: '请点击交通分析，获取最新数据！',
showClose: true, // showClose: true,
duration: 0 // duration: 0
}); // });
}, 5000); // }, 5000);
console.log('startFigureName', this.startFigureName); console.log('startFigureName', this.startFigureName);
document.getElementById('mapModule').contentWindow.postFigureId(JSON.stringify(res.data.data)); document.getElementById('mapModule').contentWindow.postFigureId(JSON.stringify(res.data.data));
console.log('this.numberNew', this.numberNew); console.log('this.numberNew', this.numberNew);