| public/index.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/pages/cameraAccess/components/CameraInfo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/pages/cameraAccess/components/scene/Editor.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/pages/library/components/personList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/pages/library/index/App.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
public/index.html
@@ -341,7 +341,16 @@ outline: none!important; border-color: #3D68E1!important; } */ .el-select-dropdown__list{ text-align: left; } .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label:before{ margin-left: -8px!important; margin-right: 0; } .el-input.is-disabled .el-input__suffix{ visibility: hidden; } </style> </head> src/pages/cameraAccess/components/CameraInfo.vue
@@ -9,7 +9,7 @@ </el-col> <el-col :span="9" :offset="1"> <el-form-item label="坐标" style="width:100%;"> <label slot="label"> 坐标</label> <label slot="label">坐标</label> <el-col :span="11"> <el-input v-model="form.latitude" @@ -59,7 +59,7 @@ </el-select> </el-form-item> </el-col> <el-col :span="9" :offset="1" style="padding-left: 11px;"> <el-col :span="9" :offset="1" > <el-form-item label="事件声音"> <div class="flex-wrap" style="margin-left:-10px"> <el-switch v-model="form.voiceEnable" active-color="#409eff" :width="50"></el-switch> src/pages/cameraAccess/components/scene/Editor.vue
@@ -23,7 +23,7 @@ :class="{ init: index == 0 }" v-cloak v-for="(sdkItem, index) in sdkGroup" :key="sdkItem.id" :key="index" > <div class="connection" v-if="index !== 0"> <el-select @@ -213,6 +213,7 @@ ></el-input>--> <el-select :disabled="optArgItem.operators.length==1" v-model="optArgItem.operator" size="mini" @change="selOperator(optArgItem)" @@ -560,7 +561,6 @@ this.sdkGroup[index].isSpread = !this.sdkGroup[index].isSpread }, addOptionalArg(sdkItem) { debugger sdkItem.initAddOptional = false sdkItem.optArg.forEach(arg => { sdkItem.optNames.forEach(name => { @@ -591,7 +591,11 @@ this.setOptArgValueOptions(copyArgTemp) } //默认选中第一个operator //if (copyArgTemp.operators.length == 1) { this.$set(copyArgTemp, 'operator', copyArgTemp.operators[0].operator) //} if (copyArgTemp.default_value) { this.$set(copyArgTemp, 'sdk_arg_value', copyArgTemp.default_value) } @@ -635,7 +639,10 @@ if (argObj.type == 'option') { this.setOptArgValueOptions(argObj); } debugger //默认选中第一个operator //if (argObj.operators.length == 1) { this.$set(argObj, 'operator', argObj.operators[0].operator) //} //替换新的参数配置对象 sdkItem.optArg.forEach((arg, index) => { if (arg.sort == optArgItem.sort) { @@ -1092,9 +1099,7 @@ // return // } let ruleInfo = JSON.parse(ruleTxt); debugger; //let ruleInfo = JSON.parse(ruleTxt) this.editRule(ruleInfo) // 如果是联动任务, 查询联动摄像机列表, 将树选中的列表更改为该条规则所需要的摄像机, 并备份当前的选中状态, 规则保存后恢复 // if (this.isLinkRule) { @@ -1182,10 +1187,10 @@ } }) if (optItem) { if (optItem.operators.length > 1) { //if (optItem.operators.length > 1) { optItem.operator = arg.operator //this.selOperator(optItem) } //} //赋值 optItem.sdk_arg_value = arg.sdk_arg_value @@ -1199,6 +1204,8 @@ if (optItem.type == 'option') { this.setOptArgValueOptions(optItem) } optArg.push(optItem) } else { defaultArg.forEach(d => { src/pages/library/components/personList.vue
@@ -55,7 +55,7 @@ <el-col :span="2"> <div class="text-left"> <upload limitTypes=".jpg,.png,.jpeg,.gif,.mp4" limitTypes=".jpg,.png,.jpeg" limitSize uploadBtntext="上传照片" uploadBtnIcon @@ -188,7 +188,7 @@ </el-table-column> </el-table> </div> <div class="pt5 pb20" style="height:40px;position:relative"> <div class="pt5 " style="height:40px;position:relative"> <el-pagination @current-change="refrash" :current-page="BaseManageData.page" @@ -815,18 +815,33 @@ } } }, // tosearch(item) { // // console.log("跳转地址", item) // var curWwwPath = window.document.location.href; // var pathname = window.document.location.pathname; // var pos = curWwwPath.indexOf(pathname); // var localhostPath = curWwwPath.substring(0, pos); //ip+port // var href = localhostPath + "/Layout/Searching" // let captureId = item.id == "" ? item.personId : item.id // var url = item.personPicUrl ? item.personPicUrl : item.personPicUrl // // console.log("跳转地址",href,"url",url) // var compType = 0 // window.open(href + '?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + url + '&compType=' + compType) // }, tosearch(item) { // console.log("跳转地址", item) var curWwwPath = window.document.location.href; var pathname = window.document.location.pathname; var pos = curWwwPath.indexOf(pathname); var localhostPath = curWwwPath.substring(0, pos); //ip+port var href = localhostPath + "/Layout/Searching" //let captureId = item.id == "" ? item.baseInfo[0].targetId : item.id let captureId = item.id == "" ? item.personId : item.id var url = item.personPicUrl ? item.personPicUrl : item.personPicUrl // console.log("跳转地址",href,"url",url) var compType = 0 window.open(href + '?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + url + '&compType=' + compType) let imgUrl = item.personPicUrl ? item.personPicUrl : item.personPicUrl let compType = 1 // 数据来自于es if (!item.id || item.id == "") { compType = 0 // 数据来自于底库 } // window.open(href + '?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + url + '&compType=' + compType) let message = 'toSearch?showType=findByPic&targetId=' + captureId + '&picSmUrl=' + imgUrl + '&compType=' + compType; window.parent.postMessage({ msg: message }, "*") }, copyClick(row) { this.BaseManageData.personId = row.id src/pages/library/index/App.vue
@@ -126,9 +126,11 @@ box-sizing: border-box; background-color: #e9ebf2; min-width: 1315px; height: 100%; } .base-overflow { overflow: visible !important; height: 100%; //overflow: visible !important; background-color: #ffffff; box-sizing: border-box; // padding: 20px 10px 0 10px; @@ -143,6 +145,7 @@ border-radius: 5px; } .data-left-box { height: 100%; @media screen and (max-width: 1440px) { width: 23%; } @@ -156,6 +159,8 @@ border-right: 1px solid #e0e0e0; } .data-right-box { height: calc(100% - 40px); overflow-y: auto; @media screen and (max-width: 1440px) { width: 77%; }
