jc
fanluyan 1 year ago
parent ea10c5ee28
commit 0117821a72

@ -142,10 +142,10 @@ export default {
index: "/roleManagement", index: "/roleManagement",
title: "角色管理", title: "角色管理",
}, },
// { {
// index: "/menuManagement", index: "/menuManagement",
// title: "", title: "菜单功能管理",
// }, },
{ {
index: "/deviceUpgrade", index: "/deviceUpgrade",
title: "升级管理", title: "升级管理",
@ -219,6 +219,7 @@ export default {
"cameraChannel", "cameraChannel",
"photographicDevice", "photographicDevice",
"devicePhotoSchedule", "devicePhotoSchedule",
"reportData",
].includes(index) ].includes(index)
) { ) {
// 线 // 线

@ -30,6 +30,7 @@ import VueLazyload from "vue-lazyload";
//注册插件 //注册插件
Vue.use(VueLazyload, { Vue.use(VueLazyload, {
error: require("./assets/img/nodatapic2.jpg"), error: require("./assets/img/nodatapic2.jpg"),
listenEvents: [ 'scroll', 'wheel', 'mousewheel', 'resize', 'animationend', 'transitionend', 'touchmove' ]
}); });
/* 引入公共js*/ /* 引入公共js*/
import common from "@/utils/common/common.js"; import common from "@/utils/common/common.js";

@ -91,7 +91,7 @@
>查询</el-button >查询</el-button
> >
<p class="looktime" v-if="lookTime && showLookTime"> <p class="looktime" v-if="lookTime && showLookTime">
{{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }} {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
</p> </p>
<!-- <el-button <!-- <el-button
class="searchImage" class="searchImage"
@ -940,7 +940,8 @@ export default {
.then((res) => { .then((res) => {
console.log(res); console.log(res);
this.requestid = res.data.requestId; this.requestid = res.data.requestId;
this.lookTime = res.data.date; this.showLookTime = false;
// this.lookTime = res.data.date;
//this.getinfo1(); //this.getinfo1();
clearInterval(this.timer); clearInterval(this.timer);
this.timer = window.setInterval(() => { this.timer = window.setInterval(() => {
@ -969,6 +970,8 @@ export default {
message: "信息已更新", message: "信息已更新",
type: "success", type: "success",
}); });
this.lookTime =res.data.requestTime ;
this.showLookTime = true; this.showLookTime = true;
} else if (this.i > 9) { } else if (this.i > 9) {
window.clearInterval(this.timer); window.clearInterval(this.timer);

@ -75,7 +75,7 @@
>设置</el-button >设置</el-button
> >
<p class="looktime" v-if="lookTime && showLookTime"> <p class="looktime" v-if="lookTime && showLookTime">
{{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }} {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
</p> </p>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -127,7 +127,7 @@
>查询</el-button >查询</el-button
> >
<p class="looktime" v-if="lookTime && showLookTime"> <p class="looktime" v-if="lookTime && showLookTime">
{{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }} {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
</p> </p>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -208,7 +208,7 @@
>查询</el-button >查询</el-button
> >
<p class="looktime" v-if="lookTime && showLookTime"> <p class="looktime" v-if="lookTime && showLookTime">
{{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }} {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
</p> </p>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -270,7 +270,7 @@
>查询</el-button >查询</el-button
> >
<p class="looktime" v-if="lookTime && showLookTime"> <p class="looktime" v-if="lookTime && showLookTime">
{{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }} {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
</p> </p>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -307,7 +307,7 @@
>查询</el-button >查询</el-button
> >
<p class="looktime" v-if="lookTime && showLookTime"> <p class="looktime" v-if="lookTime && showLookTime">
{{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }} {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
</p> </p>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -459,7 +459,7 @@
>查询</el-button >查询</el-button
> >
<p class="looktime" v-if="lookTime && showLookTime"> <p class="looktime" v-if="lookTime && showLookTime">
{{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }} {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
</p> </p>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -594,7 +594,7 @@
>查询</el-button >查询</el-button
> >
<p class="looktime" v-if="lookTime && showLookTime"> <p class="looktime" v-if="lookTime && showLookTime">
{{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }} {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
</p> </p>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -853,7 +853,7 @@
>查询</el-button >查询</el-button
> >
<p class="looktime" v-if="lookTime && showLookTime"> <p class="looktime" v-if="lookTime && showLookTime">
{{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }} {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
</p> </p>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -908,7 +908,7 @@
>查询</el-button >查询</el-button
> >
<p class="looktime" v-if="lookTime && showLookTime"> <p class="looktime" v-if="lookTime && showLookTime">
{{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }} {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
</p> </p>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -1956,8 +1956,9 @@ export default {
.then((res) => { .then((res) => {
console.log(res); console.log(res);
this.requestid = res.data.requestId; this.requestid = res.data.requestId;
this.showLookTime = false;
//this.getinfo1(); //this.getinfo1();
this.lookTime = res.data.date; //this.lookTime = res.data.date;
clearInterval(this.timer); clearInterval(this.timer);
this.timer = window.setInterval(() => { this.timer = window.setInterval(() => {
this.getinfo(); this.getinfo();
@ -2136,7 +2137,10 @@ export default {
message: "信息已更新", message: "信息已更新",
type: "success", type: "success",
}); });
this.lookTime =res.data.requestTime
this.showLookTime = true; this.showLookTime = true;
} else if (this.i > 9) { } else if (this.i > 9) {
window.clearInterval(this.timer); window.clearInterval(this.timer);
this.timer = null; this.timer = null;

@ -82,7 +82,7 @@
>查询</el-button >查询</el-button
> >
<p class="looktime" v-if="lookTime && showLookTime"> <p class="looktime" v-if="lookTime && showLookTime">
{{ $moment(lookTime).format("YYYY-MM-DD HH:mm:ss") }} {{ $moment(lookTime*1000).format("YYYY-MM-DD HH:mm:ss") }}
</p> </p>
</div> </div>
</el-tab-pane> </el-tab-pane>
@ -381,7 +381,7 @@ export default {
.then((res) => { .then((res) => {
console.log(res); console.log(res);
this.requestid = res.data.requestId; this.requestid = res.data.requestId;
this.lookTime = res.data.date; this.showLookTime = false;
//this.getinfo1(); //this.getinfo1();
clearInterval(this.timer); clearInterval(this.timer);
@ -415,6 +415,7 @@ export default {
message: "信息已更新", message: "信息已更新",
type: "success", type: "success",
}); });
this.lookTime =res.data.requestTime;
this.showLookTime = true; this.showLookTime = true;
} else if (this.i > 9) { } else if (this.i > 9) {
window.clearInterval(this.timer); window.clearInterval(this.timer);

@ -166,11 +166,11 @@
</div> </div>
</div> </div>
</div> </div>
<div class="arrow leftArrow" @click="smallLeftClick"> <div class="arrow leftArrow" @click.stop="smallLeftClick">
<i class="el-icon-arrow-left"></i> <i class="el-icon-arrow-left"></i>
</div> </div>
<div class="arrow rightArrow"> <div class="arrow rightArrow">
<i class="el-icon-arrow-right" @click="smallRightClick"></i> <i class="el-icon-arrow-right" @click.stop="smallRightClick"></i>
</div> </div>
</div> </div>
</div> </div>

@ -398,7 +398,7 @@ export default {
console.log(this.channelListOption); console.log(this.channelListOption);
this.channelfocalOpyion = res.data.list; // this.channelfocalOpyion = res.data.list; //
console.log("我是获取通道接口之后的通道",this.channelListOption[0].channelid) console.log("我是获取通道接口之后的通道",this.channelListOption[0].channelid)
this.selectChannelValue = Number(localStorage.getItem("channelId")); //; this.selectChannelValue = Number(localStorage.getItem("channelId"))==0?-1:Number(localStorage.getItem("channelId")); //;
this.$store.commit("channelId", this.selectChannelValue); //vuex this.$store.commit("channelId", this.selectChannelValue); //vuex
this.$store.commit("channelIdList", res.data.list); //vuex this.$store.commit("channelIdList", res.data.list); //vuex
this.$parent.getPhotoList( this.$parent.getPhotoList(

@ -86,6 +86,21 @@
<el-input v-model="channelForm.videoDuration"></el-input> <el-input v-model="channelForm.videoDuration"></el-input>
<span class="infoSpan">()</span> <span class="infoSpan">()</span>
</el-form-item> </el-form-item>
<el-form-item label="曝光补偿" class="comclass">
<el-select
v-model="channelForm.compensationVal"
placeholder="请选择"
>
<el-option
v-for="item in compensationOptions"
:key="item.value"
:label="item.name "
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</div> </div>
@ -327,7 +342,7 @@ export default {
{ {
"name": "HDR", "name": "HDR",
"id": 18, "id": 18,
"chName": "高动态范围" "chName": "HDR"
} }
], ],
roteOptions: [ roteOptions: [
@ -407,6 +422,25 @@ export default {
label: "1920X1080", label: "1920X1080",
}, },
], ],
compensationOptions:[{ name:-4,
value:-4},
{ name:-3,
value:-3},
{ name:-2,
value:-2},
{ name:-1,
value:-1},
{ name:0,
value:0},
{ name:1,
value:1},
{ name:2,
value:2},
{ name:3,
value:3},
{ name:4,
value:4},
],
requestid: "", requestid: "",
searchNum: 0, searchNum: 0,
searchTimer: null, searchTimer: null,
@ -432,7 +466,7 @@ export default {
getChannelListJoggle({ termid: this.areaData.id }) getChannelListJoggle({ termid: this.areaData.id })
.then((res) => { .then((res) => {
this.channelList = res.data.list; this.channelList = res.data.list;
if(Number(localStorage.getItem("channelId"))==1||Number(localStorage.getItem("channelId"))==-1){ if(Number(localStorage.getItem("channelId"))==1||Number(localStorage.getItem("channelId"))==-1||Number(localStorage.getItem("channelId"))==0){
this.channelForm.selectChannel = this.channelList[0].channelid; this.channelForm.selectChannel = this.channelList[0].channelid;
}else{ }else{
this.channelForm.selectChannel = Number(localStorage.getItem("channelId")); this.channelForm.selectChannel = Number(localStorage.getItem("channelId"));
@ -449,8 +483,8 @@ export default {
console.log(val, "是否选中"); console.log(val, "是否选中");
if (val) { if (val) {
this.bgflag = true; this.bgflag = true;
this.channelForm.bgsj = ""; // this.channelForm.bgsj = "";
this.channelForm.iso = ""; // this.channelForm.iso = "";
} else { } else {
this.bgflag = false; this.bgflag = false;
} }
@ -536,7 +570,7 @@ export default {
}, },
{ {
name: "configs", name: "configs",
value: 20, value: 21,
}, },
// { // {
// name: "resolutionCX", // name: "resolutionCX",
@ -687,6 +721,10 @@ export default {
{ name: "name20", value: "zoomRatio" }, { name: "name20", value: "zoomRatio" },
{ name: "value20", value: this.channelForm.zoomVal }, { name: "value20", value: this.channelForm.zoomVal },
{ name: "type20", value: 0 }, { name: "type20", value: 0 },
//compensation
{ name: "name21", value: "compensation" },
{ name: "value21", value: this.channelForm.compensationVal },
{ name: "type21", value: 0 },
]; ];
console.log(params); console.log(params);
this.setTermFn(params); this.setTermFn(params);
@ -845,6 +883,7 @@ export default {
// resultContent.hdrMode == 1 ? true : false; // resultContent.hdrMode == 1 ? true : false;
// this.channelForm.ywchecked = // this.channelForm.ywchecked =
// resultContent.nightMode == 1 ? true : false; // resultContent.nightMode == 1 ? true : false;
this.channelForm.compensationVal = resultContent.compensation;
this.channelForm.aival = resultContent.recognization; this.channelForm.aival = resultContent.recognization;
this.channelForm.roteval = resultContent.orientation; this.channelForm.roteval = resultContent.orientation;
this.channelForm.rtosd = resultContent.osd.rightTop!="null"?resultContent.osd.rightTop:""; this.channelForm.rtosd = resultContent.osd.rightTop!="null"?resultContent.osd.rightTop:"";
@ -935,6 +974,7 @@ export default {
this.channelForm.bgsj = ""; this.channelForm.bgsj = "";
this.channelForm.iso = ""; this.channelForm.iso = "";
this.channelForm.scene=""; this.channelForm.scene="";
this.channelForm.compensationVal="";
// this.channelForm.hdrchecked = ""; // this.channelForm.hdrchecked = "";
// this.channelForm.ywchecked = ""; // this.channelForm.ywchecked = "";
this.channelForm.rtosd = ""; this.channelForm.rtosd = "";
@ -1071,6 +1111,9 @@ export default {
// } // }
// } // }
} }
.comclass{
margin-left: 8px;
}
} }
.dialog-footer { .dialog-footer {
.el-button--default, .el-button--default,

@ -308,7 +308,7 @@ export default {
console.log("wwww",Number(localStorage.getItem("channelId"))) console.log("wwww",Number(localStorage.getItem("channelId")))
this.channelList = res.data.list; this.channelList = res.data.list;
this.timeChannelList = res.data.list; this.timeChannelList = res.data.list;
if(Number(localStorage.getItem("channelId"))==1||Number(localStorage.getItem("channelId"))==-1){ if(Number(localStorage.getItem("channelId"))==1||Number(localStorage.getItem("channelId"))==-1||Number(localStorage.getItem("channelId"))==0){
this.timeChannel = this.channelList[0].channelid; this.timeChannel = this.channelList[0].channelid;
this.selectChannel = this.channelList[0].channelid; this.selectChannel = this.channelList[0].channelid;
}else{ }else{

@ -96,7 +96,7 @@
stripe stripe
style="width: 100%" style="width: 100%"
:height="tableheight" :height="tableheight"
fit
> >
<template slot="empty"> <template slot="empty">
<el-empty :image-size="160" description="暂无数据"></el-empty> <el-empty :image-size="160" description="暂无数据"></el-empty>
@ -151,13 +151,13 @@
<el-table-column prop="photoInfo.lastPhotoTime" label="最后图片上送时间" min-width="140"> </el-table-column> <el-table-column prop="photoInfo.lastPhotoTime" label="最后图片上送时间" min-width="140"> </el-table-column>
<el-table-column prop="" label="最新基本信息采集时间" min-width="140"> </el-table-column> <el-table-column prop="lastInfo.updateTimeStr" label="最新基本信息采集时间" min-width="140"> </el-table-column>
<el-table-column prop="" label="装置名称"> </el-table-column> <el-table-column prop="lastInfo.equipName" label="装置名称" min-width="150"> </el-table-column>
<el-table-column prop="" label="装置型号"> </el-table-column> <el-table-column prop="lastInfo.model" label="装置型号" min-width="120"> </el-table-column>
<el-table-column prop="" label="装置版本号"> </el-table-column> <el-table-column prop="lastInfo.version" label="装置版本号"> </el-table-column>
<el-table-column prop="" label="生产厂家"> </el-table-column> <el-table-column prop="lastInfo.bsManu" label="生产厂家" min-width="120" show-overflow-tooltip> </el-table-column>
<el-table-column prop="" label="生产日期"> </el-table-column> <el-table-column prop="lastInfo.productionDate" label="生产日期" min-width="140"> </el-table-column>
<el-table-column prop="" label="出厂编号"> </el-table-column> <el-table-column prop="lastInfo.bsId" label="出厂编号" min-width="150"> </el-table-column>
<el-table-column prop="workingStatus.wsUpdateTime" label="最新工作状态采集时间" min-width="140"> <el-table-column prop="workingStatus.wsUpdateTime" label="最新工作状态采集时间" min-width="140">
<template slot-scope="scope"> <template slot-scope="scope">
@ -170,13 +170,13 @@
) )
}}</template }}</template
> </el-table-column> > </el-table-column>
<el-table-column prop="batteryVoltage" label="电源电压"> </el-table-column> <el-table-column prop="workingStatus.batteryVoltage" label="电源电压"> </el-table-column>
<el-table-column prop="opTemperature" label="工作温度"> </el-table-column> <el-table-column prop="workingStatus.opTemperature" label="工作温度"> </el-table-column>
<el-table-column prop="batteryCapacity" label="电池电量"> </el-table-column> <el-table-column prop="workingStatus.batteryCapacity" label="电池电量"> </el-table-column>
<el-table-column prop="floatingCharge" label="浮充状态"> </el-table-column> <el-table-column prop="workingStatus.floatingCharge" label="浮充状态"> </el-table-column>
<el-table-column prop="totalWorkingTime" label="工作总时间"> </el-table-column> <el-table-column prop="workingStatus.totalWorkingTime" label="工作总时间"> </el-table-column>
<el-table-column prop="workingTime" label="连续工作时间"> </el-table-column> <el-table-column prop="workingStatus.workingTime" label="连续工作时间"> </el-table-column>
<el-table-column prop="connectionState" label="网络连接状态"> </el-table-column> <el-table-column prop="workingStatus.connectionState" label="网络连接状态"> </el-table-column>
<el-table-column prop="workingStatus.wsUpdateTime" label="最新运行状态采集时间" min-width="140"> <el-table-column prop="workingStatus.wsUpdateTime" label="最新运行状态采集时间" min-width="140">

@ -188,7 +188,7 @@ export default {
<style lang="less"> <style lang="less">
.blindMenuDialog { .blindMenuDialog {
.treeBoxList { .treeBoxList {
height: 520px; height: 550px;
overflow: auto; overflow: auto;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

@ -21,10 +21,10 @@ module.exports = defineConfig({
proxy: { proxy: {
"/api": { "/api": {
//表示拦截以/api开头的请求路径 //表示拦截以/api开头的请求路径
target: "http://localhost:8080", // 使用本地端口,这个端口是 PuTTY SSH 隧道映射的本地端口 //target: "http://localhost:8080", // 使用本地端口,这个端口是 PuTTY SSH 隧道映射的本地端口
//target: "http://192.168.1.190:8080", //liu 本机ip 需要去掉/Api //target: "http://192.168.1.190:8080", //liu 本机ip 需要去掉/Api
//target: "http://192.168.50.7:8093", //liu 本机ip 需要去掉/Api //target: "http://192.168.50.7:8093", //liu 本机ip 需要去掉/Api
//target: "http://192.168.111.211:80", //东视 target: "http://61.169.135.146:40080/", //东视
changOrigin: true, //是否开启跨域 changOrigin: true, //是否开启跨域
pathRewrite: { pathRewrite: {
"^/api": "/api", //重写api把api变成空字符因为我们真正请求的路径是没有api的 "^/api": "/api", //重写api把api变成空字符因为我们真正请求的路径是没有api的

Loading…
Cancel
Save