优化拍照bug

ds1.0
fanluyan 2 years ago
parent 7a0e8bbe06
commit 81e071b3ec

@ -150,6 +150,14 @@ export default {
.monitor-container { .monitor-container {
.sideBar { .sideBar {
width: 200px; width: 200px;
.el-tree-node__content {
font-size: 10px !important;
}
.el-tree-node__children {
.el-tree-node__content {
padding-left: 8px !important;
}
}
.radioFilter { .radioFilter {
.refresh { .refresh {
display: none; display: none;
@ -169,6 +177,9 @@ export default {
} }
.thumb-example { .thumb-example {
height: calc(100% - 8px); height: calc(100% - 8px);
.radioBox {
top: -18px;
}
.picTop { .picTop {
height: 70%; height: 70%;
} }

@ -140,11 +140,11 @@ export default {
}, },
], ],
}, },
// { {
// icon: "el-icon-setting", icon: "el-icon-setting",
// index: "/itOperation", index: "/itOperation",
// title: "", title: "运维管理",
// }, },
], ],
items1: [ items1: [
{ {

@ -1235,9 +1235,13 @@ export default {
this.newshedulenr = []; this.newshedulenr = [];
this.shedulenr = []; this.shedulenr = [];
this.sureloading = false; this.sureloading = false;
console.log("关闭轮询"); this.compareloading = false;
clearInterval(this.timer);
clearInterval(this.timers); clearInterval(this.timers);
this.timers = null; this.timers = null;
this.timer = null;
console.log("关闭轮询", "loading");
}, },
}, },
}; };

@ -306,7 +306,12 @@
title="配置参数" title="配置参数"
:visible.sync="videoVisible" :visible.sync="videoVisible"
> >
<el-form :model="videoForm"> <el-form
:model="videoForm"
:rules="videorules"
label-width="94px"
ref="videoRef"
>
<el-form-item label="码流类型"> <el-form-item label="码流类型">
<el-select v-model="videoForm.stream"> <el-select v-model="videoForm.stream">
<el-option label="主码流" value="0"></el-option> <el-option label="主码流" value="0"></el-option>
@ -315,12 +320,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间 s(秒)" prop="videoTime"> <el-form-item label="时间 s(秒)" prop="time">
<el-input-number <!-- <el-input-number
v-model="videoForm.time" v-model="videoForm.time"
:min="1" :min="1"
:max="100" :max="30"
></el-input-number> ></el-input-number> -->
<el-input v-model="videoForm.time" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -353,7 +359,6 @@ import carouselChart from "../components/carouselChart.vue";
import setschedule from "./components/setschedule.vue"; import setschedule from "./components/setschedule.vue";
import infoDialog from "./components/infoDialog.vue"; import infoDialog from "./components/infoDialog.vue";
import gpsPosition from "./components/gpsPosition.vue"; import gpsPosition from "./components/gpsPosition.vue";
import { number } from "echarts";
export default { export default {
components: { components: {
previewContain, previewContain,
@ -425,6 +430,12 @@ export default {
time: "20", time: "20",
}, },
commondChannel: 1, commondChannel: 1,
videorules: {
time: [
{ required: true, message: "时间不能为空" },
{ type: "number", message: "请输入正确的数字时间" },
],
},
}; };
}, },
watch: { watch: {
@ -809,6 +820,7 @@ export default {
// //
handleCommandpic(command) { handleCommandpic(command) {
console.log(command); console.log(command);
this.clearfun();
getTermStatus({ termId: this.zztermId }).then((res) => { getTermStatus({ termId: this.zztermId }).then((res) => {
console.log(res); console.log(res);
if (res.data.isonline) { if (res.data.isonline) {
@ -845,8 +857,8 @@ export default {
}, },
// //
handleCommandvideo(command) { handleCommandvideo(command) {
console.log(command); // console.log(command);
this.clearfun(); // this.clearfun();
console.log(command); console.log(command);
this.commondChannel = command; this.commondChannel = command;
this.clearfun(); this.clearfun();
@ -891,6 +903,8 @@ export default {
}, },
anVideoFn(command) { anVideoFn(command) {
this.$refs[videoRef].validate((valid) => {
if (valid) {
this.videoVisible = false; this.videoVisible = false;
getTermStatus({ termId: this.zztermId }).then((res) => { getTermStatus({ termId: this.zztermId }).then((res) => {
console.log(res); console.log(res);
@ -933,6 +947,10 @@ export default {
}); });
} }
}); });
} else {
return false;
}
});
}, },
setTermFn(dataParams) { setTermFn(dataParams) {
console.log("点击了统一的接口", "runningstatus"); console.log("点击了统一的接口", "runningstatus");
@ -1025,11 +1043,11 @@ export default {
// // console.log(this.i); // // console.log(this.i);
if (res.data == true && this.i < 10) { if (res.data == true && this.i < 10) {
console.log(res.data); console.log(res.data);
this.i = 0;
clearInterval(this.timer);
this.timer = null;
this.btnpicloading = false; this.btnpicloading = false;
this.btnvideoloading = false; this.btnvideoloading = false;
console.log(this.i);
clearInterval(this.timer);
this.timer = null;
this.getTerminalPhotoList( this.getTerminalPhotoList(
this.selectChannelValue, this.selectChannelValue,
this.dateValue, this.dateValue,
@ -1575,8 +1593,8 @@ export default {
.el-dialog { .el-dialog {
width: 380px; width: 380px;
} }
.el-input-number { .el-input {
width: 208px; width: 214px;
} }
} }
} }

@ -29,7 +29,7 @@ module.exports = defineConfig({
proxy: { proxy: {
"/api": { "/api": {
//表示拦截以/api开头的请求路径 //表示拦截以/api开头的请求路径
//target: "http://47.96.238.157:8093", //阿里云服务器环境 // target: "http://47.96.238.157:8093", //阿里云服务器环境
target: "http://180.166.218.222:40080", //dell target: "http://180.166.218.222:40080", //dell
changOrigin: true, //是否开启跨域 changOrigin: true, //是否开启跨域
pathRewrite: { pathRewrite: {

Loading…
Cancel
Save