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

l 3.22

This commit is contained in:
luoshiwen 2023-03-22 14:11:42 +08:00
parent cfb4fe70a1
commit 08f785f516
9 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

2
node_modules/.cache/babel-loader/9a1a33dcb28bca93c77531c391e907a0.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/e945cb0760ea78a2bfad855462b52cb2.json generated vendored
View File

File diff suppressed because one or more lines are too long

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

@ -469,7 +469,7 @@ export default {
// console.log(item.component_id, 'component_id'); // console.log(item.component_id, 'component_id');
if (ele.trigger.length == 10) { if (ele.trigger.length == 10) {
ele.trigger.pop(); ele.trigger.pop();
} else { }
if(this.$route.query.type=='离线视频'){ if(this.$route.query.type=='离线视频'){
var timeNew = item.time.split('.')[0] var timeNew = item.time.split('.')[0]
var dateLength = timeNew.length; var dateLength = timeNew.length;
@ -514,7 +514,7 @@ export default {
} }
}) })
}
} }
}); });
}); });
@ -526,7 +526,7 @@ export default {
cycleTimeData: { cycleTimeData: {
handler(newVal) { handler(newVal) {
// 监听到打印周期时刻数据 // 监听到打印周期时刻数据
console.log(newVal, '周期时刻数据'); // console.log(newVal, '周期时刻数据');
if (newVal != undefined && newVal.length != 0 && this.sectionData) { if (newVal != undefined && newVal.length != 0 && this.sectionData) {
var thatN = this; var thatN = this;
@ -535,9 +535,11 @@ export default {
newVal.forEach(item => { newVal.forEach(item => {
if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '周期时刻') { if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '周期时刻') {
if (ele.cycleTimeData.length == 10) { if (ele.cycleTimeData.length == 10) {
ele.cycleTimeData.pop(); ele.cycleTimeData.pop();
} else {
}
// item.time = item.time.split('.')[0]; // item.time = item.time.split('.')[0];
// if(this.$route.query.type=='离线视频'){ // if(this.$route.query.type=='离线视频'){
// var timeNew = item.time.split('.')[0] // var timeNew = item.time.split('.')[0]
@ -552,6 +554,7 @@ export default {
thatN.typeCycleTimeData = item; thatN.typeCycleTimeData = item;
} }
ele.cycleTimeData.unshift(item); ele.cycleTimeData.unshift(item);
// thatN.$nextTick(() => { // thatN.$nextTick(() => {
if (thatN.$refs.typeChartRef1 != undefined) { if (thatN.$refs.typeChartRef1 != undefined) {
// console.log("thatN.$refs.typeChartRef1",thatN.$refs.typeChartRef1) // console.log("thatN.$refs.typeChartRef1",thatN.$refs.typeChartRef1)
@ -583,7 +586,7 @@ export default {
} }
} }
} }
}
// }); // });
} }
@ -598,7 +601,7 @@ export default {
if (ele.timeMode == '周期时刻') { if (ele.timeMode == '周期时刻') {
if (ele.cycleTimeData.length == 10) { if (ele.cycleTimeData.length == 10) {
ele.cycleTimeData.pop(); ele.cycleTimeData.pop();
} else { }
// item.time = item.time.split('.')[0]; // item.time = item.time.split('.')[0];
// if (item.type_data != null) { // if (item.type_data != null) {
// // 周期时刻的类型数据 // // 周期时刻的类型数据
@ -634,7 +637,7 @@ export default {
if (itemTypeChartRef1.componentName.includes('OD') && itemTypeChartRef1.$refs.ODChartRef != undefined && itemTypeChartRef1.dataArr[0].ob_data.length != 0) { if (itemTypeChartRef1.componentName.includes('OD') && itemTypeChartRef1.$refs.ODChartRef != undefined && itemTypeChartRef1.dataArr[0].ob_data.length != 0) {
itemTypeChartRef1.$refs.ODChartRef.drawThermalChart(itemTypeChartRef1.dataArr[0].ob_data, itemTypeChartRef1.startEndData) itemTypeChartRef1.$refs.ODChartRef.drawThermalChart(itemTypeChartRef1.dataArr[0].ob_data, itemTypeChartRef1.startEndData)
} }
}
} }
} }
@ -650,7 +653,7 @@ export default {
//周期统计 //周期统计
cycleStatisticsData: { cycleStatisticsData: {
handler(newVal) { handler(newVal) {
console.log("newVal", newVal) console.log("周期统计", newVal)
if (newVal != undefined && newVal.length != 0 && this.sectionData) { if (newVal != undefined && newVal.length != 0 && this.sectionData) {
var that = this; var that = this;
that.classify.forEach((ele, index) => { that.classify.forEach((ele, index) => {
@ -658,7 +661,7 @@ export default {
if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '周期统计') { if (ele.analogAreaComponentId == item.component_id && ele.timeMode == '周期统计') {
if (ele.cycleStatisticsData.length == 10) { if (ele.cycleStatisticsData.length == 10) {
ele.cycleStatisticsData.pop(); ele.cycleStatisticsData.pop();
} else { }
if(this.$route.query.type=='离线视频'){ if(this.$route.query.type=='离线视频'){
var timeNew = item.time.split('.')[0] var timeNew = item.time.split('.')[0]
@ -702,7 +705,7 @@ export default {
} }
} }
}
} }
} }
@ -717,7 +720,7 @@ export default {
if (ele.timeMode == '周期统计') { if (ele.timeMode == '周期统计') {
if (ele.cycleStatisticsData.length == 10) { if (ele.cycleStatisticsData.length == 10) {
ele.cycleStatisticsData.pop(); ele.cycleStatisticsData.pop();
} else { }
// item.time = item.time.split('.')[0]; // item.time = item.time.split('.')[0];
// if (item.type_data != null) { // if (item.type_data != null) {
// _that.typeCycleStatistics = item; // _that.typeCycleStatistics = item;
@ -754,7 +757,7 @@ export default {
} }
} }
}
} }
} }

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

@ -64,7 +64,7 @@
</template> </template>
<script> <script>
import { getHostInfoApi, initData, update,configRestore, ResetFactory,RestartComputer } from '../../api/aboutMachine'; import { getHostInfoApi, initData, configBackup,configRestore, ResetFactory,RestartComputer } 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';
@ -186,7 +186,7 @@ export default {
}); });
}); });
}, },
// 备份事件 // 备份服务器事件
backupHandle() { backupHandle() {
this.$confirm('此操作将备份操作, 是否继续?', '提示', { this.$confirm('此操作将备份操作, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@ -194,7 +194,7 @@ export default {
type: 'warning' type: 'warning'
}) })
.then(() => { .then(() => {
ConfigBackup().then(res => { configBackup().then(res => {
this.$message({ this.$message({
type: 'success', type: 'success',
message: '备份' + res.data.msg message: '备份' + res.data.msg

21
src/views/myId.vue
View File

@ -18,7 +18,7 @@
<el-dialog title="修改密码" :visible.sync="dialogVisible" width="30%" @close="dialogClosed"> <el-dialog title="修改密码" :visible.sync="dialogVisible" width="30%" @close="dialogClosed">
<el-form label-width="auto" :model="userData"> <el-form label-width="auto" :model="userData">
<el-form-item label="账号" aria-disabled="true"> <el-form-item label="账号" aria-disabled="true">
<el-input type="test" :disabled="true" v-model="userData.Account"></el-input> <el-input type="test" :disabled="true" v-model="userData.Account"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="原密码"> <el-form-item label="原密码">
<el-input type="password" v-model="userData.oldPassword"></el-input> <el-input type="password" v-model="userData.oldPassword"></el-input>
@ -36,7 +36,7 @@
</template> </template>
<script> <script>
import { getUserApi,updatePassword } from '@/api/myld.js'; import { getUserApi, updatePassword } from '@/api/myld.js';
import serverUrl from '@/config/apiurl.js'; import serverUrl from '@/config/apiurl.js';
import axios from 'axios'; import axios from 'axios';
export default { export default {
@ -55,13 +55,14 @@ export default {
} }
}; };
}, },
mounted() {
this.getUser();
},
methods: { methods: {
dialogClosed() { dialogClosed() {
this.password = ''; this.password = '';
}, },
mounted() {
this.getUser();
},
//保存密码 //保存密码
savePassword() { savePassword() {
// console.log(serverUrl); // console.log(serverUrl);
@ -70,11 +71,11 @@ export default {
formData.append('Account', this.userData.Account); formData.append('Account', this.userData.Account);
formData.append('OldPassword', this.userData.oldPassword); formData.append('OldPassword', this.userData.oldPassword);
formData.append('NewPassword', this.userData.newPassword); formData.append('NewPassword', this.userData.newPassword);
console.log(formData,'数据'); console.log(formData, '数据');
updatePassword(formData).then(res=>{ updatePassword(formData).then(res => {
console.log(res,'修改状态'); console.log(res, '修改状态');
if(res.data.code==200){ if (res.data.code == 200) {
this.$message({ this.$message({
message: res.data.msg, message: res.data.msg,
type: 'success' type: 'success'
@ -82,7 +83,7 @@ export default {
this.dialogVisible = false; this.dialogVisible = false;
this.$router.push('/Login'); this.$router.push('/Login');
// this.getUser(); // this.getUser();
}else{ } else {
this.$message({ this.$message({
message: res.data.msg, message: res.data.msg,
type: 'warning' type: 'warning'