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

代码提交

This commit is contained in:
luoshiwen 2023-02-26 09:58:04 +08:00
parent 13b85abd71 ecd604b289
commit 3774ac8806
19 changed files with 237 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node_modules/.cache/babel-loader/028b248418ccf5df4d4eed55795b8c5c.json generated vendored
View File

@ -1 +1 @@
{"remainingRequest":"E:\\视频边缘计算管理平台\\TransFlow\\node_modules\\babel-loader\\lib\\index.js!E:\\视频边缘计算管理平台\\TransFlow\\node_modules\\cache-loader\\dist\\cjs.js??ref--0-0!E:\\视频边缘计算管理平台\\TransFlow\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!E:\\视频边缘计算管理平台\\TransFlow\\src\\views\\SystemSettings\\UDPServiceSettings.vue?vue&type=script&lang=js&","dependencies":[{"path":"E:\\视频边缘计算管理平台\\TransFlow\\src\\views\\SystemSettings\\UDPServiceSettings.vue","mtime":1677026201583},{"path":"E:\\视频边缘计算管理平台\\TransFlow\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"E:\\视频边缘计算管理平台\\TransFlow\\node_modules\\babel-loader\\lib\\index.js","mtime":499162500000},{"path":"E:\\视频边缘计算管理平台\\TransFlow\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"E:\\视频边缘计算管理平台\\TransFlow\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000}],"contextDependencies":[],"result":["//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\nexport default {\n data: function data() {\n return {\n form: {\n name: 55570,\n delivery: true,\n bytes: 4096\n }\n };\n }\n};",{"version":3,"sources":["UDPServiceSettings.vue"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BA,eAAA;AACA,EAAA,IADA,kBACA;AACA,WAAA;AACA,MAAA,IAAA,EAAA;AACA,QAAA,IAAA,EAAA,KADA;AAEA,QAAA,QAAA,EAAA,IAFA;AAGA,QAAA,KAAA,EAAA;AAHA;AADA,KAAA;AAOA;AATA,CAAA","sourcesContent":["<template>\r\n <div class=\"content-box\">\r\n <div class=\"container\">\r\n <p class=\"title\">UPD服务设置</p>\r\n <!-- <div class=\"test-div\">\r\n <i class=\"el-icon-edit\"></i>\r\n <i class=\"el-icon-share\"></i>\r\n <i class=\"el-icon-delete\"></i>\r\n </div> -->\r\n <el-form :model=\"form\" label-position=\"left\" label-width=\"180px\">\r\n <el-form-item label=\"upd服务器端口：\">\r\n <el-input-number v-model=\"form.name\" controls-position=\"right\" :min=\"1\"></el-input-number>\r\n </el-form-item>\r\n\r\n <el-form-item label=\"启用有效载荷：\">\r\n <el-switch v-model=\"form.delivery\"></el-switch>\r\n </el-form-item>\r\n\r\n <el-form-item label=\"最大数据包大小：\">\r\n <el-input-number v-model=\"form.bytes\" controls-position=\"right\" :min=\"1\"></el-input-number>\r\n bytes\r\n </el-form-item>\r\n </el-form>\r\n </div>\r\n </div>\r\n</template>\r\n\r\n<script>\r\nexport default {\r\n data() {\r\n return {\r\n form: {\r\n name: 55570,\r\n delivery: true,\r\n bytes: 4096\r\n }\r\n }\r\n }\r\n}\r\n</script>\r\n\r\n<style>\r\n.test-div i {\r\n font-size: 25px;\r\n}\r\n</style>"],"sourceRoot":"src/views/SystemSettings"}]} {"remainingRequest":"E:\\视频边缘计算管理平台\\TransFlow\\node_modules\\babel-loader\\lib\\index.js!E:\\视频边缘计算管理平台\\TransFlow\\node_modules\\cache-loader\\dist\\cjs.js??ref--0-0!E:\\视频边缘计算管理平台\\TransFlow\\node_modules\\vue-loader\\lib\\index.js??vue-loader-options!E:\\视频边缘计算管理平台\\TransFlow\\src\\views\\SystemSettings\\UDPServiceSettings.vue?vue&type=script&lang=js&","dependencies":[{"path":"E:\\视频边缘计算管理平台\\TransFlow\\src\\views\\SystemSettings\\UDPServiceSettings.vue","mtime":1677376577618},{"path":"E:\\视频边缘计算管理平台\\TransFlow\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"E:\\视频边缘计算管理平台\\TransFlow\\node_modules\\babel-loader\\lib\\index.js","mtime":499162500000},{"path":"E:\\视频边缘计算管理平台\\TransFlow\\node_modules\\cache-loader\\dist\\cjs.js","mtime":499162500000},{"path":"E:\\视频边缘计算管理平台\\TransFlow\\node_modules\\vue-loader\\lib\\index.js","mtime":499162500000}],"contextDependencies":[],"result":["//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\nimport { getUpdInfoApi } from \"../../api/aboutMachine\";\nexport default {\n data: function data() {\n return {\n form: {\n name: 55570,\n delivery: true,\n bytes: 4096\n }\n };\n },\n methods: {\n getUpd: function getUpd() {\n var _this = this;\n\n getUpdInfoApi().then(function (res) {\n console.log(res.data.data);\n }).catch(function (err) {\n _this.$message.error(res.data.msg);\n });\n }\n },\n mounted: function mounted() {\n this.getUpd();\n }\n};",{"version":3,"sources":["UDPServiceSettings.vue"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAuBA,SAAA,aAAA;AACA,eAAA;AACA,EAAA,IADA,kBACA;AACA,WAAA;AACA,MAAA,IAAA,EAAA;AACA,QAAA,IAAA,EAAA,KADA;AAEA,QAAA,QAAA,EAAA,IAFA;AAGA,QAAA,KAAA,EAAA;AAHA;AADA,KAAA;AAOA,GATA;AAUA,EAAA,OAAA,EAAA;AACA,IAAA,MADA,oBACA;AAAA;;AACA,MAAA,aAAA,GACA,IADA,CACA,UAAA,GAAA,EAAA;AACA,QAAA,OAAA,CAAA,GAAA,CAAA,GAAA,CAAA,IAAA,CAAA,IAAA;AACA,OAHA,EAIA,KAJA,CAIA,UAAA,GAAA,EAAA;AACA,QAAA,KAAA,CAAA,QAAA,CAAA,KAAA,CAAA,GAAA,CAAA,IAAA,CAAA,GAAA;AACA,OANA;AAOA;AATA,GAVA;AAqBA,EAAA,OArBA,qBAqBA;AACA,SAAA,MAAA;AACA;AAvBA,CAAA","sourcesContent":["<template>\r\n <div class=\"content-box\">\r\n <div class=\"container\">\r\n <p class=\"title\">UPD服务设置</p>\r\n <el-form :model=\"form\" label-position=\"left\" label-width=\"180px\">\r\n <el-form-item label=\"upd服务器端口：\">\r\n <el-input-number v-model=\"form.name\" controls-position=\"right\" :min=\"1\"></el-input-number>\r\n </el-form-item>\r\n\r\n <el-form-item label=\"启用有效载荷：\">\r\n <el-switch v-model=\"form.delivery\"></el-switch>\r\n </el-form-item>\r\n\r\n <el-form-item label=\"最大数据包大小：\">\r\n <el-input-number v-model=\"form.bytes\" controls-position=\"right\" :min=\"1\"></el-input-number>\r\n bytes\r\n </el-form-item>\r\n </el-form>\r\n </div>\r\n </div>\r\n</template>\r\n\r\n<script>\r\nimport { getUpdInfoApi } from '../../api/aboutMachine';\r\nexport default {\r\n data() {\r\n return {\r\n form: {\r\n name: 55570,\r\n delivery: true,\r\n bytes: 4096\r\n }\r\n };\r\n },\r\n methods: {\r\n getUpd() {\r\n getUpdInfoApi()\r\n .then(res => {\r\n console.log(res.data.data);\r\n })\r\n .catch(err => {\r\n this.$message.error(res.data.msg);\r\n });\r\n }\r\n },\r\n mounted() {\r\n this.getUpd();\r\n }\r\n};\r\n</script>\r\n\r\n<style>\r\n.test-div i {\r\n font-size: 25px;\r\n}\r\n</style>\r\n"],"sourceRoot":"src/views/SystemSettings"}]}

2
node_modules/.cache/babel-loader/0a9a6e42027ba3575cac91989cfa8a8c.json generated vendored
View File

File diff suppressed because one or more lines are too long

2
node_modules/.cache/babel-loader/707c80c5cb9d3ec9ed91511d9d73326f.json generated vendored
View File

File diff suppressed because one or more lines are too long

2
node_modules/.cache/babel-loader/b84f2eff62cf6f6e1777fdc799b085d7.json generated vendored
View File

File diff suppressed because one or more lines are too long

2
node_modules/.cache/babel-loader/c90a7db1294db9fc3e3360c0ce4029f4.json generated vendored
View File

File diff suppressed because one or more lines are too long

2
node_modules/.cache/babel-loader/cb5ef0e3bf9c65cd4548725a3d1af5c8.json generated vendored
View File

File diff suppressed because one or more lines are too long

2
node_modules/.cache/babel-loader/d36b985a450343bbaebc7d3929d30d4d.json generated vendored
View File

File diff suppressed because one or more lines are too long

2
node_modules/.cache/babel-loader/e945cb0760ea78a2bfad855462b52cb2.json generated vendored
View File

File diff suppressed because one or more lines are too long

2
node_modules/.cache/babel-loader/f33a3790ba493045db8997e3255aae8b.json generated vendored
View File

File diff suppressed because one or more lines are too long

10
src/api/aboutMachine.js
View File

@ -5,3 +5,13 @@ export const getHostInfoApi = params => {
params params
}); });
}; };
//获取upd接口
export const getUpdInfoApi = params => {
return axios.get('api/GetUdppz', {
params
});
};
export const resetReboot = data => {
return axios.post('api/SetReboot', data, { headers: { 'Content-Type': 'application/x-www-form-urlencoded' } });
};

1
src/api/index.js
View File

@ -40,7 +40,6 @@ export const getStopAlgorithm = params => {
}); });
}; };
//分析-删除视频源接口 //分析-删除视频源接口
//172.16.1.26:5000/api/DeleteShipjk?F_VC_ID=9df02f1a113640c498e74a74c93aca77
export const getDeleteShipjk = params => { export const getDeleteShipjk = params => {
return axios.get('api/DeleteShipjk', { return axios.get('api/DeleteShipjk', {
params params

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

@ -115,7 +115,7 @@ export default {
}, },
boundaryGap: ['5%', '5%'], boundaryGap: ['5%', '5%'],
data: this.xData data: this.xData.reverse()
} }
], ],
yAxis: [ yAxis: [

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

@ -1,22 +1,21 @@
<template> <template>
<!-- 触发类型 --> <!-- 触发类型 -->
<div class="setion"> <div class="setion">
<p class="chartTitle"><span class="titleIcon"></span> {{ componentName }} {{ triggerType }}</p> <!-- <p class="chartTitle"><span class="titleIcon"></span> {{ componentName }} {{ triggerType }}</p> -->
<!-- 触发数据数值渲染 --> <!-- 触发数据数值渲染 -->
<div class="typeContent"> <div class="typeContent">
<div v-if="dataArr && dataArr.length != 0 && dataArr != undefined"> <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 dataArr[0].type_data" :key="i" <el-card v-for="(n, i) in dataArr[0].type_data" :key="i" style="width: 150px; margin-bottom: 20px; text-align: center">
style="width: 150px; margin-bottom: 20px; text-align: center">
<div> <div>
<span style="font-size: 15px;">{{ n.name }}</span><br /> <span style="font-size: 15px;">{{ n.name }}</span
><br />
<span style="font-size: 30px; font-weight: bold">{{ n.quantity }}</span> <span style="font-size: 30px; font-weight: bold">{{ n.quantity }}</span>
</div> </div>
<div> <div>
<div> <div>
{{ dataArr[0].time ? dataArr[0].time : '' }} {{ dataArr[0].time ? dataArr[0].time : '' }}
</div> </div>
</div> </div>
</el-card> </el-card>
</div> </div>
@ -69,9 +68,9 @@
<div class="tableTitle" v-if="dataArr && dataArr.length != 0 && dataArr != undefined"> <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;"></span> style="width: 10px;height:10px;border-radius: 50%;background-color: #3297ff;display: inline-block;vertical-align: middle;margin-right: 8px;"
<span style="font-size:18px;">{{ this.chartName + '-' + this.componentName + '-' + '表格' + '-' + ></span>
triggerType }}</span> <span style="font-size:18px;">{{ this.chartName + '-' + this.componentName + '-' + '表格' + '-' + triggerType }}</span>
</div> </div>
<div class="tableTime"> <div class="tableTime">
{{ dataArr[0].time ? dataArr[0].time : '' }} {{ dataArr[0].time ? dataArr[0].time : '' }}
@ -86,23 +85,55 @@
</div> </div>
<div class="border" v-if="echartArr.includes('曲线图')"> <div class="border" v-if="echartArr.includes('曲线图')">
<detailDialog /> <detailDialog />
<lineChart :componentName="componentName" :chartName="chartName" :pageType="pageType" :list="dataArr" <lineChart
:status="triggerType" :title="title" :typeValue="typeValue" ref="lineChartRef" /> :componentName="componentName"
:chartName="chartName"
:pageType="pageType"
:list="dataArr"
:status="triggerType"
:title="title"
:typeValue="typeValue"
ref="lineChartRef"
/>
</div> </div>
<div class="border" v-if="echartArr.includes('饼状图')"> <div class="border" v-if="echartArr.includes('饼状图')">
<detailDialog /> <detailDialog />
<pieChart :componentName="componentName" :chartName="chartName" :pageType="pageType" :list="dataArr" <pieChart
:status="triggerType" :title="title" :typeValue="typeValue" ref="pieChartRef"/> :componentName="componentName"
:chartName="chartName"
:pageType="pageType"
:list="dataArr"
:status="triggerType"
:title="title"
:typeValue="typeValue"
ref="pieChartRef"
/>
</div> </div>
<div class="border" v-if="echartArr.includes('均值图')"> <div class="border" v-if="echartArr.includes('均值图')">
<detailDialog /> <detailDialog />
<avgChart ref="avgRefChart" :componentName="componentName" :chartName="chartName" :pageType="pageType" <avgChart
:list="dataArr" :status="triggerType" :title="title" :typeValue="typeValue" /> ref="avgRefChart"
:componentName="componentName"
:chartName="chartName"
:pageType="pageType"
:list="dataArr"
:status="triggerType"
:title="title"
:typeValue="typeValue"
/>
</div> </div>
<div class="border" v-if="echartArr.includes('直方图')"> <div class="border" v-if="echartArr.includes('直方图')">
<detailDialog /> <detailDialog />
<barChart :componentName="componentName" :chartName="chartName" :pageType="pageType" :list="dataArr" <barChart
:status="triggerType" :title="title" :typeValue="typeValue" ref="barChartRef"/> :componentName="componentName"
:chartName="chartName"
:pageType="pageType"
:list="dataArr"
:status="triggerType"
:title="title"
:typeValue="typeValue"
ref="barChartRef"
/>
</div> </div>
</div> </div>
</template> </template>
@ -137,26 +168,25 @@ export default {
flow: 0, flow: 0,
isRefer: true, isRefer: true,
valueShow: { }, valueShow: {},
//排队数 //排队数
queue: '', queue: ''
}; };
}, },
created() { created() {
console.log(this.title); console.log(this.title);
}, },
methods: { methods: {
// 计算类型数量的总和 // 计算类型数量的总和
getTotal(dataArr) { getTotal(dataArr) {
return dataArr[0].type_data.reduce(function(prev, cur) { return dataArr[0].type_data.reduce(function(prev, cur) {
return cur.quantity + prev return cur.quantity + prev;
}, 0) }, 0);
// return dataArr[0].type_data((pre, cur) => { // return dataArr[0].type_data((pre, cur) => {
// return pre + cur // return pre + cur
// }, 0) // }, 0)
}, },
// 计算类型的数值 // 计算类型的数值
getNewQueue(dataArr) { getNewQueue(dataArr) {
@ -168,31 +198,32 @@ export default {
// }else if(dataArr[0].timeMode=='周期时刻'){ // }else if(dataArr[0].timeMode=='周期时刻'){
// } // }
// if (dataArr[0].n_queue) {
// this.queue = dataArr[0].n_queue
// } else if (dataArr[0].ave_queue) {
// this.queue = dataArr[0].ave_queue
// } else if (dataArr[0].timeMode == '周期时刻') {
// } if (dataArr[0].timeMode == '触发') {
this.queue = dataArr[0].n_queue;
} else if (dataArr[0].timeMode == '周期统计') {
this.queue = dataArr[0].ave_queue;
} else if (dataArr[0].timeMode == '周期时刻') {
}
} }
}, },
computed: { computed: {
// 获取类型的总数量 // 获取类型的总数量
}, },
mounted() { }, mounted() {},
watch: { watch: {
// 监听触发数据 // 监听触发数据
dataArr: { dataArr: {
handler(newVal) { handler(newVal) {
// console.log('dataArr', newVal); // console.log('dataArr', newVal);
// this.getNewQueue(newVal) if (newVal != undefined && newVal.length != 0) {
this.getNewQueue(newVal);
}
}, },
immediate: true immediate: true
}, }
// cycleTimeData: { // cycleTimeData: {
// handler(newVal) { // handler(newVal) {
// console.log(newVal); // console.log(newVal);

1
src/config/apiurl.js
View File

@ -7,6 +7,7 @@ export default {
// addFigure: "http://172.16.1.22:8080/api/AddJianktx", // addFigure: "http://172.16.1.22:8080/api/AddJianktx",
// //编辑图形名称 // //编辑图形名称
// editFigure: "http://172.16.1.22:8080/api/EditTuxmc", // editFigure: "http://172.16.1.22:8080/api/EditTuxmc",
dataUrl: 'http://172.16.1.168:5000/api/AddShipjk', dataUrl: 'http://172.16.1.168:5000/api/AddShipjk',
getSpareElementOrder: 'http://172.16.1.168:5000/api/Upload', getSpareElementOrder: 'http://172.16.1.168:5000/api/Upload',
postSetQuanjsz: 'http://172.16.1.168:5000/api/SetQuanjsz', postSetQuanjsz: 'http://172.16.1.168:5000/api/SetQuanjsz',

74
src/views/SystemSettings/UDPServiceSettings.vue
View File

@ -1,46 +1,56 @@
<template> <template>
<div class="content-box"> <div class="content-box">
<div class="container"> <div class="container">
<p class="title">UPD服务设置</p> <p class="title">UPD服务设置</p>
<!-- <div class="test-div"> <el-form :model="form" label-position="left" label-width="180px">
<i class="el-icon-edit"></i> <el-form-item label="upd服务器端口：">
<i class="el-icon-share"></i> <el-input-number v-model="form.name" controls-position="right" :min="1"></el-input-number>
<i class="el-icon-delete"></i> </el-form-item>
</div> -->
<el-form :model="form" label-position="left" label-width="180px">
<el-form-item label="upd服务器端口：">
<el-input-number v-model="form.name" controls-position="right" :min="1"></el-input-number>
</el-form-item>
<el-form-item label="启用有效载荷："> <el-form-item label="启用有效载荷：">
<el-switch v-model="form.delivery"></el-switch> <el-switch v-model="form.delivery"></el-switch>
</el-form-item> </el-form-item>
<el-form-item label="最大数据包大小："> <el-form-item label="最大数据包大小：">
<el-input-number v-model="form.bytes" controls-position="right" :min="1"></el-input-number> <el-input-number v-model="form.bytes" controls-position="right" :min="1"></el-input-number>
bytes bytes
</el-form-item> </el-form-item>
</el-form> </el-form>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
import { getUpdInfoApi } from '../../api/aboutMachine';
export default { export default {
data() { data() {
return { return {
form: { form: {
name: 55570, name: 55570,
delivery: true, delivery: true,
bytes: 4096 bytes: 4096
} }
};
},
methods: {
getUpd() {
getUpdInfoApi()
.then(res => {
console.log(res.data.data);
})
.catch(err => {
this.$message.error(res.data.msg);
});
}
},
mounted() {
this.getUpd();
} }
} };
}
</script> </script>
<style> <style>
.test-div i { .test-div i {
font-size: 25px; font-size: 25px;
} }
</style> </style>

8
src/views/bounced/analysisConfiguration.vue
View File

@ -737,8 +737,8 @@ export default {
OnSceneload(newV) { OnSceneload(newV) {
var ip = window.location.host; var ip = window.location.host;
this.ipData = 'http://' + ip.split(':')[0] + ':5000'; this.ipData = 'http://' + ip.split(':')[0] + ':5000';
this.$refs.analysisWeb.contentWindow.getIpData('http://172.16.1.168:5000'); // this.$refs.analysisWeb.contentWindow.getIpData('http://172.16.1.168:5000');
// this.$refs.analysisWeb.contentWindow.getDianwei(this.$route.query.id); this.$refs.analysisWeb.contentWindow.getDianwei(this.$route.query.id);
this.unityDone = true; this.unityDone = true;
}, },
handleDeleteDian(row, idx) { handleDeleteDian(row, idx) {
@ -1045,8 +1045,8 @@ export default {
// const host = 'ws://49.234.27.18:10087/'; // 一个测试用url，改成给的，ws://broker.emqx.io:8083/mqtt // const host = 'ws://49.234.27.18:10087/'; // 一个测试用url，改成给的，ws://broker.emqx.io:8083/mqtt
var ip = window.location.host.split(":")[0]; var ip = window.location.host.split(":")[0];
console.log("ip",ip) console.log("ip",ip)
const host = `ws://${ip}:10087`; // const host = `ws://${ip}:10087`;
// const host = 'ws://172.16.1.168:10087/'; const host = 'ws://172.16.1.168:10087/';
const options = { const options = {
// 配置 // 配置
// 测试：订阅本机IP // 测试：订阅本机IP

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

@ -6,8 +6,12 @@
<div class="dataBoard" ref="dataBoard" v-if="activeName == 'second'"> <div class="dataBoard" ref="dataBoard" v-if="activeName == 'second'">
<!-- 断面 --> <!-- 断面 -->
<div class="plate1" ref="plate1"> <div class="plate1" ref="plate1">
<div :class="sectionData.length <= 2 ? 'sectionBox' : 'section'" ref="section" <div
v-for="(s, i) in sectionData" :key="s.analogAreaComponentId"> :class="sectionData.length <= 2 ? 'sectionBox' : 'section'"
ref="section"
v-for="(s, i) in sectionData"
:key="s.analogAreaComponentId"
>
<template> <template>
<div ref="sectionContent"> <div ref="sectionContent">
<div> <div>
@ -18,30 +22,58 @@
</div> </div>
<el-tabs> <el-tabs>
<el-collapse v-model="acticveName"> <el-collapse v-model="acticveName">
<div v-for="o in s.children" :key="o.analogAreaComponentId"> <div style="position:relative" v-for="o in s.children" :key="o.analogAreaComponentId">
<el-collapse-item :title="o.componentName" :name="o.analogAreaComponentId"> <div class="titleGnag"></div>
<OD v-if="o.componentName.includes('OD')" :pageType="o.graphicType" <el-collapse-item :title="o.componentName + o.timeMode" :name="o.analogAreaComponentId">
triggerType="触发" :componentName="o.componentName" <OD
:echartArr="o.presentationForm" :dataArr="o.trigger" v-if="o.componentName.includes('OD')"
:title="o.componentName.split('_')[0]" :chartName="o.combinationName" /> :pageType="o.graphicType"
triggerType="触发"
:componentName="o.componentName"
:echartArr="o.presentationForm"
:dataArr="o.trigger"
:title="o.componentName.split('_')[0]"
:chartName="o.combinationName"
/>
<!--触发的组件 --> <!--触发的组件 -->
<typeChart ref="typeChartRef" v-if="o.timeMode === '触发'" <typeChart
:pageType="o.graphicType" :triggerType="o.timeMode" ref="typeChartRef"
:componentName="o.componentName" :dataArr="o.trigger" v-if="o.timeMode === '触发'"
:echartArr="o.presentationForm" :title="o.componentName.split('_')[0]" :pageType="o.graphicType"
:chartName="o.combinationName" :typeValue="typeTimeMode" /> :triggerType="o.timeMode"
<typeChart ref="typeChartRef1" v-if="o.timeMode === '周期时刻'" :componentName="o.componentName"
:pageType="o.graphicType" :triggerType="o.timeMode" :dataArr="o.trigger"
:componentName="o.componentName" :dataArr="o.cycleTimeData" :echartArr="o.presentationForm"
:echartArr="o.presentationForm" :title="o.componentName.split('_')[0]" :title="o.componentName.split('_')[0]"
:chartName="o.combinationName" :typeValue="typeCycleTimeData" /> :chartName="o.combinationName"
:typeValue="typeTimeMode"
/>
<typeChart
ref="typeChartRef1"
v-if="o.timeMode === '周期时刻'"
:pageType="o.graphicType"
:triggerType="o.timeMode"
:componentName="o.componentName"
:dataArr="o.cycleTimeData"
:echartArr="o.presentationForm"
:title="o.componentName.split('_')[0]"
:chartName="o.combinationName"
:typeValue="typeCycleTimeData"
/>
<!-- 周期统计的组件 --> <!-- 周期统计的组件 -->
<typeChart ref="typeChartRef2" style="width: 100%;" <typeChart
v-if="o.timeMode === '周期统计'" :pageType="o.graphicType" ref="typeChartRef2"
:triggerType="o.timeMode" :componentName="o.componentName" style="width: 100%;"
:dataArr="o.cycleStatistics" :echartArr="o.presentationForm" v-if="o.timeMode === '周期统计'"
:title="o.componentName.split('_')[0]" :chartName="o.combinationName" :pageType="o.graphicType"
:typeValue="typeCycleStatistics" /> :triggerType="o.timeMode"
:componentName="o.componentName"
:dataArr="o.cycleStatistics"
:echartArr="o.presentationForm"
:title="o.componentName.split('_')[0]"
:chartName="o.combinationName"
:typeValue="typeCycleStatistics"
/>
</el-collapse-item> </el-collapse-item>
</div> </div>
</el-collapse> </el-collapse>
@ -104,7 +136,6 @@ export default {
title2: '01区域', title2: '01区域',
dialogVisible: false, dialogVisible: false,
idVal: '', idVal: '',
//组件数组 //组件数组
componentList: [], componentList: [],
@ -151,9 +182,9 @@ export default {
}); });
}, },
siftData() { siftData() {
this.sectionArr = [] this.sectionArr = [];
this.sectionData = [] this.sectionData = [];
this.classify = [] this.classify = [];
this.componentList.forEach(val => { this.componentList.forEach(val => {
this.sectionArr.push(val.combinationName); this.sectionArr.push(val.combinationName);
this.sectionArr = Array.from(new Set(this.sectionArr)); this.sectionArr = Array.from(new Set(this.sectionArr));
@ -163,14 +194,13 @@ export default {
this.acticveName = []; this.acticveName = [];
this.componentList.forEach(val => { this.componentList.forEach(val => {
if (item.title == val.combinationName) { if (item.title == val.combinationName) {
this.classify.push(val) this.classify.push(val);
item.children.push(val); item.children.push(val);
} }
this.acticveName.push(val.analogAreaComponentId); this.acticveName.push([]);
}); });
return item; return item;
}); });
}, },
// 组件图标点击下拉事件 // 组件图标点击下拉事件
sectionHandle(i) { sectionHandle(i) {
@ -189,27 +219,26 @@ export default {
downPulls1[i].style.cssText = 'transition: all 0.5s linear;'; downPulls1[i].style.cssText = 'transition: all 0.5s linear;';
// sections[i].style.height = '500px'; // sections[i].style.height = '500px';
if (sectionBox[i] != undefined) { if (sectionBox[i] != undefined) {
} }
} }
}, },
channge(oldVal, newVal) { channge(oldVal, newVal) {
console.log("old", oldVal) console.log('old', oldVal);
console.log("newVal", newVal) console.log('newVal', newVal);
if (oldVal == 'second') { if (oldVal == 'second') {
this.sectionArr = [] this.sectionArr = [];
this.sectionData = [] this.sectionData = [];
this.getNew() this.getNew();
} else if (newVal == 'second') { } else if (newVal == 'second') {
this.sectionArr = [] this.sectionArr = [];
this.sectionData = [] this.sectionData = [];
this.getNew() this.getNew();
} }
} }
// 触发数据的类型数值 // 触发数据的类型数值
}, },
mounted() { }, mounted() {},
watch: { watch: {
// acticveName: { // acticveName: {
// handler(newVal) { // handler(newVal) {
@ -222,7 +251,7 @@ export default {
// }, // },
// 触发的原始数据 // 触发的原始数据
triggerData: { triggerData: {
handler(newVal, oldVal) { }, handler(newVal, oldVal) {},
immediate: true immediate: true
}, },
// activeName:'channge', // activeName:'channge',
@ -235,11 +264,10 @@ export default {
var _this = this var _this = this
if (newVal.length != 0 && _this.sectionData) { if (newVal.length != 0 && _this.sectionData) {
_this.classify.forEach((ele, index) => { _this.classify.forEach((ele, index) => {
if (ele.trigger == undefined && ele.timeMode == '触发') { if (ele.trigger == undefined && ele.timeMode == '触发') {
ele.trigger = []; ele.trigger = [];
} }
newVal.forEach((item) => { newVal.forEach(item => {
if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '触发') { if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '触发') {
if (ele.trigger.length == 10) { if (ele.trigger.length == 10) {
ele.trigger.pop(); ele.trigger.pop();
@ -247,11 +275,10 @@ export default {
item.time = item.time.split('.')[0]; item.time = item.time.split('.')[0];
// 该时间的触发数据 // 该时间的触发数据
if (item.type_data != null) { if (item.type_data != null) {
_this.typeTimeMode = item _this.typeTimeMode = item;
} }
ele.trigger.unshift(item); ele.trigger.unshift(item);
_this.$nextTick(() => { _this.$nextTick(() => {
for (let i = 0; i < _this.$refs.typeChartRef.length; i++) { for (let i = 0; i < _this.$refs.typeChartRef.length; i++) {
// console.log(_this.$refs.typeChartRef[i], '触发接收的表格数据'); // console.log(_this.$refs.typeChartRef[i], '触发接收的表格数据');
let item = _this.$refs.typeChartRef[i] let item = _this.$refs.typeChartRef[i]
@ -273,11 +300,8 @@ export default {
}) })
} }
} }
}); });
}); });
} }
}, },
immediate: true immediate: true
@ -287,17 +311,14 @@ export default {
handler(newVal) { handler(newVal) {
// 监听到打印周期时刻数据 // 监听到打印周期时刻数据
console.log(newVal, '周期时刻数据'); console.log(newVal, '周期时刻数据');
var that = this var that = this;
if (newVal.length != 0 && this.sectionData) { if (newVal.length != 0 && this.sectionData) {
that.classify.forEach((ele, index) => { that.classify.forEach((ele, index) => {
if (ele.cycleTimeData == undefined && ele.timeMode == '周期时刻') { if (ele.cycleTimeData == undefined && ele.timeMode == '周期时刻') {
ele.cycleTimeData = []; ele.cycleTimeData = [];
} }
newVal.forEach(item => { newVal.forEach(item => {
if ( if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '周期时刻') {
ele.analogAreaComponentId == item.component_id &&
ele.timeMode == '周期时刻'
) {
if (ele.cycleTimeData.length == 10) { if (ele.cycleTimeData.length == 10) {
ele.cycleTimeData.pop(); ele.cycleTimeData.pop();
} else { } else {
@ -324,7 +345,7 @@ export default {
// } // }
} }
} }
}) });
} }
} }
}); });
@ -351,7 +372,7 @@ export default {
} }
ele.cycleStatistics.unshift(item); ele.cycleStatistics.unshift(item);
for (let i = 0; i < this.$refs.typeChartRef2.length; i++) { for (let i = 0; i < this.$refs.typeChartRef2.length; i++) {
item = that.$refs.typeChartRef2[i] item = that.$refs.typeChartRef2[i];
// console.log(_this.$refs.typeChartRef[i], '触发接收的表格数据'); // console.log(_this.$refs.typeChartRef[i], '触发接收的表格数据');
if (item.dataArr.length != 0) { if (item.dataArr.length != 0) {
this.$refs.typeChartRef2[i].$refs.lineChartRef.drawLine(this.$refs.typeChartRef2[i].dataArr, _this.$refs.typeChartRe2f[i].componentName.split('_')[0]) this.$refs.typeChartRef2[i].$refs.lineChartRef.drawLine(this.$refs.typeChartRef2[i].dataArr, _this.$refs.typeChartRe2f[i].componentName.split('_')[0])
@ -395,6 +416,20 @@ export default {
}; };
</script> </script>
<style>
.titleGnag {
width: 3px;
height: 18px;
display: inline-block;
background-color: #3297ff;
position: absolute;
top: 14px;
}
.el-collapse-item__header {
font-size: 15px;
margin-left: 10px;
}
</style>
<style scoped lang="scss"> <style scoped lang="scss">
* { * {
margin: 0; margin: 0;

17
src/views/general/AboutMachine.vue
View File

@ -17,7 +17,7 @@
autocomplete="off" autocomplete="off"
></el-date-picker> ></el-date-picker>
<el-button @click="saveTime" type="primary" style="margin-left:10px" size="small">自动校验</el-button> <el-button @click="saveTime" type="primary" style="margin-left:10px" size="small">校时</el-button>
</el-form-item> </el-form-item>
<p>备份&恢复</p> <p>备份&恢复</p>
<el-form-item label="备份服务器设置："> <el-form-item label="备份服务器设置：">
@ -77,7 +77,7 @@
</template> </template>
<script> <script>
import { getHostInfoApi } from '../../api/aboutMachine'; import { getHostInfoApi, resetReboot } from '../../api/aboutMachine';
import { getQuanjszData } from '../../api/index'; import { getQuanjszData } from '../../api/index';
import serverUrl from '../../config/apiurl.js'; import serverUrl from '../../config/apiurl.js';
import { setQuanjsz } from '@/api/index'; import { setQuanjsz } from '@/api/index';
@ -171,7 +171,6 @@ export default {
.then(res => { .then(res => {
this.sizeForm.name = res.data.data.hostname; this.sizeForm.name = res.data.data.hostname;
this.sizeForm.date1 = res.data.data.time; this.sizeForm.date1 = res.data.data.time;
console.log(res.data.data, 11111);
}) })
.catch(err => { .catch(err => {
this.$message.error(res.data.msg); this.$message.error(res.data.msg);
@ -184,10 +183,14 @@ export default {
type: 'warning' type: 'warning'
}) })
.then(() => { .then(() => {
// this.$message({ resetReboot()
// type: 'success', .then(res => {
// message: '删除成功!' console.log(res);
// }); this.$message.success(res.data.msg);
})
.catch(err => {
this.$message.error(res.data.msg);
});
}) })
.catch(() => { .catch(() => {
this.$message({ this.$message({

9
src/views/index.vue
View File

@ -267,7 +267,7 @@ export default {
presentation: [], presentation: [],
startValue: '', startValue: '',
timeMode: '', timeMode: '',
type: [], type: ['机动车', '非机动车', '行人'],
startSection: [], startSection: [],
endSection: [], endSection: [],
componentType: '', componentType: '',
@ -763,7 +763,7 @@ export default {
arr = res.data.data.type.split(','); arr = res.data.data.type.split(',');
this.componentForm.type = arr; this.componentForm.type = arr;
} else { } else {
this.componentForm.type = []; this.componentForm.type = ['机动车', '非机动车', '行人'];
} }
console.log('this.componentForm', this.componentForm); console.log('this.componentForm', this.componentForm);
} }
@ -809,8 +809,7 @@ export default {
this.componentForm.componentName = res.data.data.componentName; this.componentForm.componentName = res.data.data.componentName;
this.componentForm.componentParameterId = res.data.data.componentParameterId; this.componentForm.componentParameterId = res.data.data.componentParameterId;
this.componentForm.cycleInterval = parseInt(res.data.data.cycleInterval); this.componentForm.cycleInterval = parseInt(res.data.data.cycleInterval);
this.componentForm.FlowType = res.data.data.flowType;
this.componentForm.startSectionIds = res.data.data.startSectionIds; this.componentForm.startSectionIds = res.data.data.startSectionIds;
this.componentForm.startSectionNames = res.data.data.startSectionNames; this.componentForm.startSectionNames = res.data.data.startSectionNames;
this.componentForm.endSectionIds = res.data.data.endSectionIds; this.componentForm.endSectionIds = res.data.data.endSectionIds;
@ -863,7 +862,7 @@ export default {
arr = res.data.data.type.split(','); arr = res.data.data.type.split(',');
this.componentForm.type = arr; this.componentForm.type = arr;
} else { } else {
this.componentForm.type = []; // this.componentForm.type = ['机动车', '非机动车', '行人'];
} }
} }
}); });