代码提交

This commit is contained in:
luoshiwen 2023-02-26 09:58:04 +08:00
commit 3774ac8806
19 changed files with 237 additions and 149 deletions

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"}]}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -5,3 +5,13 @@ export const getHostInfoApi = 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' } });
};

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 => {
return axios.get('api/DeleteShipjk', {
params

View File

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

View File

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

View File

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

View File

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

View File

@ -737,8 +737,8 @@ export default {
OnSceneload(newV) {
var ip = window.location.host;
this.ipData = 'http://' + ip.split(':')[0] + ':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.getIpData('http://172.16.1.168:5000');
this.$refs.analysisWeb.contentWindow.getDianwei(this.$route.query.id);
this.unityDone = true;
},
handleDeleteDian(row, idx) {
@ -1045,8 +1045,8 @@ export default {
// const host = 'ws://49.234.27.18:10087/'; // urlws://broker.emqx.io:8083/mqtt
var ip = window.location.host.split(":")[0];
console.log("ip",ip)
const host = `ws://${ip}:10087`;
// const host = 'ws://172.16.1.168:10087/';
// const host = `ws://${ip}:10087`;
const host = 'ws://172.16.1.168:10087/';
const options = {
//
// IP

View File

@ -6,8 +6,12 @@
<div class="dataBoard" ref="dataBoard" v-if="activeName == 'second'">
<!-- 断面 -->
<div class="plate1" ref="plate1">
<div :class="sectionData.length <= 2 ? 'sectionBox' : 'section'" ref="section"
v-for="(s, i) in sectionData" :key="s.analogAreaComponentId">
<div
:class="sectionData.length <= 2 ? 'sectionBox' : 'section'"
ref="section"
v-for="(s, i) in sectionData"
:key="s.analogAreaComponentId"
>
<template>
<div ref="sectionContent">
<div>
@ -18,30 +22,58 @@
</div>
<el-tabs>
<el-collapse v-model="acticveName">
<div v-for="o in s.children" :key="o.analogAreaComponentId">
<el-collapse-item :title="o.componentName" :name="o.analogAreaComponentId">
<OD v-if="o.componentName.includes('OD')" :pageType="o.graphicType"
triggerType="触发" :componentName="o.componentName"
:echartArr="o.presentationForm" :dataArr="o.trigger"
:title="o.componentName.split('_')[0]" :chartName="o.combinationName" />
<div style="position:relative" v-for="o in s.children" :key="o.analogAreaComponentId">
<div class="titleGnag"></div>
<el-collapse-item :title="o.componentName + o.timeMode" :name="o.analogAreaComponentId">
<OD
v-if="o.componentName.includes('OD')"
: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 === '触发'"
:pageType="o.graphicType" :triggerType="o.timeMode"
:componentName="o.componentName" :dataArr="o.trigger"
:echartArr="o.presentationForm" :title="o.componentName.split('_')[0]"
: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="typeChartRef"
v-if="o.timeMode === '触发'"
:pageType="o.graphicType"
:triggerType="o.timeMode"
:componentName="o.componentName"
:dataArr="o.trigger"
:echartArr="o.presentationForm"
:title="o.componentName.split('_')[0]"
: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%;"
v-if="o.timeMode === '周期统计'" :pageType="o.graphicType"
:triggerType="o.timeMode" :componentName="o.componentName"
:dataArr="o.cycleStatistics" :echartArr="o.presentationForm"
:title="o.componentName.split('_')[0]" :chartName="o.combinationName"
:typeValue="typeCycleStatistics" />
<typeChart
ref="typeChartRef2"
style="width: 100%;"
v-if="o.timeMode === '周期统计'"
:pageType="o.graphicType"
: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>
</div>
</el-collapse>
@ -104,7 +136,6 @@ export default {
title2: '01区域',
dialogVisible: false,
idVal: '',
//
componentList: [],
@ -151,9 +182,9 @@ export default {
});
},
siftData() {
this.sectionArr = []
this.sectionData = []
this.classify = []
this.sectionArr = [];
this.sectionData = [];
this.classify = [];
this.componentList.forEach(val => {
this.sectionArr.push(val.combinationName);
this.sectionArr = Array.from(new Set(this.sectionArr));
@ -163,14 +194,13 @@ export default {
this.acticveName = [];
this.componentList.forEach(val => {
if (item.title == val.combinationName) {
this.classify.push(val)
this.classify.push(val);
item.children.push(val);
}
this.acticveName.push(val.analogAreaComponentId);
this.acticveName.push([]);
});
return item;
});
},
//
sectionHandle(i) {
@ -189,27 +219,26 @@ export default {
downPulls1[i].style.cssText = 'transition: all 0.5s linear;';
// sections[i].style.height = '500px';
if (sectionBox[i] != undefined) {
}
}
},
channge(oldVal, newVal) {
console.log("old", oldVal)
console.log("newVal", newVal)
console.log('old', oldVal);
console.log('newVal', newVal);
if (oldVal == 'second') {
this.sectionArr = []
this.sectionData = []
this.getNew()
this.sectionArr = [];
this.sectionData = [];
this.getNew();
} else if (newVal == 'second') {
this.sectionArr = []
this.sectionData = []
this.getNew()
this.sectionArr = [];
this.sectionData = [];
this.getNew();
}
}
//
},
mounted() { },
mounted() {},
watch: {
// acticveName: {
// handler(newVal) {
@ -222,7 +251,7 @@ export default {
// },
//
triggerData: {
handler(newVal, oldVal) { },
handler(newVal, oldVal) {},
immediate: true
},
// activeName:'channge',
@ -235,11 +264,10 @@ export default {
var _this = this
if (newVal.length != 0 && _this.sectionData) {
_this.classify.forEach((ele, index) => {
if (ele.trigger == undefined && ele.timeMode == '触发') {
ele.trigger = [];
}
newVal.forEach((item) => {
newVal.forEach(item => {
if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '触发') {
if (ele.trigger.length == 10) {
ele.trigger.pop();
@ -247,11 +275,10 @@ export default {
item.time = item.time.split('.')[0];
//
if (item.type_data != null) {
_this.typeTimeMode = item
_this.typeTimeMode = item;
}
ele.trigger.unshift(item);
_this.$nextTick(() => {
for (let i = 0; i < _this.$refs.typeChartRef.length; i++) {
// console.log(_this.$refs.typeChartRef[i], '');
let item = _this.$refs.typeChartRef[i]
@ -273,11 +300,8 @@ export default {
})
}
}
});
});
}
},
immediate: true
@ -287,17 +311,14 @@ export default {
handler(newVal) {
//
console.log(newVal, '周期时刻数据');
var that = this
var that = this;
if (newVal.length != 0 && this.sectionData) {
that.classify.forEach((ele, index) => {
if (ele.cycleTimeData == undefined && ele.timeMode == '周期时刻') {
ele.cycleTimeData = [];
}
newVal.forEach(item => {
if (
ele.analogAreaComponentId == item.component_id &&
ele.timeMode == '周期时刻'
) {
if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '周期时刻') {
if (ele.cycleTimeData.length == 10) {
ele.cycleTimeData.pop();
} else {
@ -324,7 +345,7 @@ export default {
// }
}
}
})
});
}
}
});
@ -351,7 +372,7 @@ export default {
}
ele.cycleStatistics.unshift(item);
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], '');
if (item.dataArr.length != 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>
<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">
* {
margin: 0;

View File

@ -17,7 +17,7 @@
autocomplete="off"
></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>
<p>备份&恢复</p>
<el-form-item label="备份服务器设置:">
@ -77,7 +77,7 @@
</template>
<script>
import { getHostInfoApi } from '../../api/aboutMachine';
import { getHostInfoApi, resetReboot } from '../../api/aboutMachine';
import { getQuanjszData } from '../../api/index';
import serverUrl from '../../config/apiurl.js';
import { setQuanjsz } from '@/api/index';
@ -171,7 +171,6 @@ export default {
.then(res => {
this.sizeForm.name = res.data.data.hostname;
this.sizeForm.date1 = res.data.data.time;
console.log(res.data.data, 11111);
})
.catch(err => {
this.$message.error(res.data.msg);
@ -184,10 +183,14 @@ export default {
type: 'warning'
})
.then(() => {
// this.$message({
// type: 'success',
// message: '!'
// });
resetReboot()
.then(res => {
console.log(res);
this.$message.success(res.data.msg);
})
.catch(err => {
this.$message.error(res.data.msg);
});
})
.catch(() => {
this.$message({

View File

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