Skip to content

platform / fanxing_new

Go to a project
Commit 8a360e30 by 潘建波
Options

添加变倍操作

1 parent f2d908c7
Inline Side-by-side
Showing 10 changed files with 331 additions and 249 deletions
src/views/resource/Author/author.vue
......@@ -51,7 +51,7 @@
prev-text="上一页"
next-text="下一页"
:page-sizes="[20, 30, 50, 100, 200]"
layout="prev, pager, next,sizes"
layout="total, prev, pager, next,sizes, jumper"
:current-page="page"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......
src/views/resource/Codes/eventcodes.vue
......@@ -86,14 +86,14 @@
</template>
</el-table-column>
</el-table>
<div style="margin-top: 28px;">
<div style="margin-top: 28px;" hidden>
<el-pagination
style="float: right;"
background
prev-text="上一页"
next-text="下一页"
:page-sizes="[20, 30, 50, 100, 200]"
layout="prev, pager, next,sizes"
:page-sizes="[30, 50, 100, 200]"
layout="total, prev, pager, next,sizes, jumper"
:current-page="page"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......@@ -170,7 +170,7 @@ export default {
return {
total: 0,
page: 1,
pageSize: 20,
pageSize: 50,
tableData: [],
detailVisible: false,
eventCateData: [],
......@@ -188,7 +188,7 @@ export default {
},
components: {},
created() {
// this.getEventList();
this.getEventList();
this.getEventCate();
},
methods: {
......@@ -197,8 +197,14 @@ export default {
this.tableData = res.list_data;
});
},
cateChange() {
this.$api.codes.eventType({}, this.curcate).then(res => {
cateChange(unid) {
let offset = (this.page - 1) * this.pageSize;
let obj = {
limit: this.pageSize,
offset: offset
};
this.tableData = [];
this.$api.codes.eventType(obj, unid).then(res => {
this.tableData = res.list_data;
});
},
......
src/views/resource/Codes/trfficcodes.vue
......@@ -33,7 +33,7 @@
type="index"
align="center"
label="#"
width="40"
width="60"
></el-table-column>
<el-table-column align="center" prop="code_unid" label="code_unid">
</el-table-column>
......@@ -77,14 +77,14 @@
</template>
</el-table-column>
</el-table>
<div style="margin-top: 28px;">
<div style="margin-top: 28px;" hidden>
<el-pagination
style="float: right;"
background
prev-text="上一页"
next-text="下一页"
:page-sizes="[20, 30, 50, 100, 200]"
layout="prev, pager, next,sizes"
layout="total, prev, pager, next,sizes, jumper"
:current-page="page"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......@@ -242,34 +242,54 @@ export default {
});
},
saveAddCode() {
this.$api.codes
.addTrafficCode(this.codeData, this.curCateUnid)
.then(res => {
let data = {
code_unid: this.codeData.code_unid,
code: this.codeData.code,
name: this.codeData.name,
note: this.codeData.note,
active: this.codeData.active
};
this.$api.codes.addTrafficCode(data, this.curCateUnid).then(res => {
console.log(res);
this.detailVisible = false;
this.cateChange(this.curCateUnid);
});
},
saveEditCode() {
let data = {
"code_unid": this.codeData.code_unid,
"code":this.codeData.code,
"name":this.codeData.name,
"note":this.codeData.note,
"active":this.codeData.active }
code_unid: this.codeData.code_unid,
code: this.codeData.code,
name: this.codeData.name,
note: this.codeData.note,
active: this.codeData.active
};
this.$api.codes
.editTrafficCode(
data,
this.curCateUnid,
this.codeData.code_unid
)
.editTrafficCode(data, this.curCateUnid, this.codeData.code_unid)
.then(res => {
console.log(res);
this.detailVisible = false;
this.cateChange(this.curCateUnid);
});
},
deleteCode(index, row) {
this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.$api.codes
.editTrafficCode(row, this.curCateUnid, row.code_unid)
.deleteTrafficCode(this.curCateUnid, row.code_unid)
.then(res => {
console.log(res);
this.cateChange(this.curCateUnid);
});
})
.catch(() => {
this.$message({
type: "info",
message: "已取消删除"
});
});
},
handleSizeChange(val) {
......
src/views/resource/analysis.vue
......@@ -85,7 +85,7 @@
prev-text="上一页"
next-text="下一页"
:page-sizes="[30, 50, 100, 200]"
layout="prev, pager, next,sizes"
layout="total, prev, pager, next,sizes, jumper"
:current-page="page"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......
src/views/resource/store_confs.vue
......@@ -3,11 +3,21 @@
<div class="content">
<div style="padding:8px 20px;">
<span class="inputBox">
<el-input v-model="storename" placeholder="请输入存储配置名称"></el-input>
<el-input
v-model="storename"
placeholder="请输入存储配置名称"
></el-input>
</span>
<el-button type="primary" style="position: relative;top: -2px;" @click="query">查询</el-button>
<el-button
type="primary"
style="position: relative;top: -2px;"
@click="query"
>查询</el-button
>
<span style="float: right;">
<el-button type="info" icon="el-icon-search" @click="add">添加</el-button>
<el-button type="info" icon="el-icon-search" @click="add"
>添加</el-button
>
</span>
</div>
<div style="padding: 0 15px 20px 23px;">
......@@ -16,24 +26,21 @@
:data="tableData"
stripe
border
style="width: 100%">
<el-table-column
align="center"
prop="name"
label="名称">
style="width: 100%"
>
<el-table-column align="center" prop="name" label="名称">
</el-table-column>
<el-table-column
prop="create_dt"
align="center"
label="上传时间">
<el-table-column prop="create_dt" align="center" label="上传时间">
</el-table-column>
<el-table-column
align="center"
prop="task_list"
label="应用任务">
<el-table-column align="center" prop="task_list" label="应用任务">
<template slot-scope="scope">
<el-tooltip :content="scope.row.ellipsis" placement="bottom" effect="light" :visible-arrow=false>
<span class="ellipsis">{{scope.row.ellipsis}}</span>
<el-tooltip
:content="scope.row.ellipsis"
placement="bottom"
effect="light"
:visible-arrow="false"
>
<span class="ellipsis">{{ scope.row.ellipsis }}</span>
</el-tooltip>
</template>
</el-table-column>
......@@ -41,14 +48,31 @@
align="center"
width="300"
prop="operation"
label="操作">
label="操作"
>
<template slot-scope="scope">
<el-tooltip content="详情" placement="bottom" effect="light" :visible-arrow=false>
<span class="el-icon-info editIcon" @click="detail(scope.$index, scope.row)"></span>
<el-tooltip
content="详情"
placement="bottom"
effect="light"
:visible-arrow="false"
>
<span
class="el-icon-info editIcon"
@click="detail(scope.$index, scope.row)"
></span>
</el-tooltip>
<span class="tableSpanBorder"></span>
<el-tooltip content="删除" placement="bottom" effect="light" :visible-arrow=false>
<span class="el-icon-delete delIcon" @click="delFun(scope.$index, scope.row)"></span>
<el-tooltip
content="删除"
placement="bottom"
effect="light"
:visible-arrow="false"
>
<span
class="el-icon-delete delIcon"
@click="delFun(scope.$index, scope.row)"
></span>
</el-tooltip>
</template>
</el-table-column>
......@@ -60,22 +84,19 @@
prev-text="上一页"
next-text="下一页"
:page-sizes="[30, 50, 100, 200]"
layout="prev, pager, next,sizes"
layout="total, prev, pager, next,sizes, jumper"
:current-page="page"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:total="total">
:total="total"
>
</el-pagination>
<div style="clear: both;"></div>
</div>
</div>
</div>
<el-dialog
title="添加"
:visible.sync="addVisible"
width="450px">
<el-dialog title="添加" :visible.sync="addVisible" width="450px">
<div>
<el-form label-position="left" label-width="120px">
<el-form-item label="配置名称">
......@@ -86,17 +107,21 @@
ref="upload"
action="uploadUrl"
:http-request="httpRequest"
:on-success="uploadsuccess"
multiple
name="file"
:auto-upload="false">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
:auto-upload="false"
>
<el-button slot="trigger" size="small" type="primary"
>选取文件</el-button
>
<!-- <div slot="tip" class="el-upload__tip">只能上传视频文件</div> -->
</el-upload>
</el-form-item>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="addVisible=false">取 消</el-button>
<el-button @click="addVisible = false">取 消</el-button>
<el-button type="primary" @click="save">上 传</el-button>
</span>
</el-dialog>
......@@ -104,73 +129,70 @@
<el-dialog title="详情" :visible.sync="detailVisible" width="30%">
<div class="title">任务列表</div>
<div class="maxHeight">
<el-tree
:props="props"
:load="loadNode"
lazy>
</el-tree>
<el-tree :props="props" :load="loadNode" lazy> </el-tree>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data(){
return{
addVisible:false,
uploadUrl: '',
names:'',
file:[],
export default {
data() {
return {
addVisible: false,
uploadUrl: "",
names: "",
file: [],
props: {
label: 'name',
children: 'child',
isLeaf: 'leaf'
label: "name",
children: "child",
isLeaf: "leaf"
},
detailData:[],
dev_unid: localStorage.getItem('dev_unid'),
resource:{
detailData: [],
dev_unid: localStorage.getItem("dev_unid"),
resource: {
picture_busy: 0,
picture_free: 0,
video_busy: 0,
video_free: 0,
video_free: 0
},
total:0,
page:1,
pageSize:30,
total: 0,
page: 1,
pageSize: 30,
tableData: [],
devsList:[],
selectDevs:'',
detailVisible:false,
storename:'',
curentSubList:[],
tableHeight:window.opsTableHeight
}
},
components:{
devsList: [],
selectDevs: "",
detailVisible: false,
storename: "",
curentSubList: [],
tableHeight: window.opsTableHeight
};
},
mounted(){
components: {},
mounted() {
this.query();
},
methods:{
methods: {
// 自定义的上传函数
httpRequest(param) {
this.file=[];
this.file = [];
// 一般情况下是在这里创建FormData对象，但我们需要上传多个文件，为避免发送多次请求，因此在这里只进行文件的获取，param可以拿到文件上传的所有信息
this.file.push(param.file)
this.file.push(param.file);
},
save(){
save() {
this.$refs.upload.submit(); // 这里是执行文件上传的函数，其实也就是获取我们要上传的文件
// 最重要的就是这段代码
var upData = new FormData() // 首先创建FormData对象
this.file.forEach((file)=>{
upData.append('file', file); // 因为要上传多个文件，所以需要遍历一下才行
upData.append('name', this.names);
var upData = new FormData(); // 首先创建FormData对象
this.file.forEach(file => {
upData.append("file", file); // 因为要上传多个文件，所以需要遍历一下才行
upData.append("name", this.names);
upData.append("is_temp", 0);
})
this.$api.resource.uploadStore(upData).then(res=>{
});
this.$api.resource.uploadStore(upData).then(res => {
this.query();
})
});
},
uploadsuccess() {
this.addVisible = false;
},
loadNode(node, resolve) {
if (node.level === 0) {
......@@ -178,244 +200,249 @@
}
if (node.level > 1) return resolve([]);
this.$api.resource.getSubTask({},node.data.unid).then(res=>{
if(res.list_data==null){
res.list_data=[];
this.$api.resource.getSubTask({}, node.data.unid).then(res => {
if (res.list_data == null) {
res.list_data = [];
}
res.list_data.forEach(item=>{
item.name=item.subtask_name;
item['leaf']=true;
})
resolve(res.list_data)
})
res.list_data.forEach(item => {
item.name = item.subtask_name;
item["leaf"] = true;
});
resolve(res.list_data);
});
},
query(){
this.tableData=[];
query() {
this.tableData = [];
let offset = (this.page - 1) * this.pageSize;
this.$api.resource.getStoreConList({
this.$api.resource
.getStoreConList(
{
limit: this.pageSize,
offset: offset,
name__like: this.storename,
},this.dev_unid).then((res)=>{
this.total=res.total_num;
if(res.list_data==null){
this.tableData=[]
}else{
this.tableData=res.list_data;
}
this.tableData.forEach(list=>{
let ellipsisText='';
list.task_list.forEach(item=>{
ellipsisText+=item.name+','
})
ellipsisText=ellipsisText.substring(0,ellipsisText.length-1);
list['ellipsis']=ellipsisText;
name__like: this.storename
},
this.dev_unid
)
.then(res => {
this.total = res.total_num;
if (res.list_data == null) {
this.tableData = [];
} else {
this.tableData = res.list_data;
}
this.tableData.forEach(list => {
let ellipsisText = "";
list.task_list.forEach(item => {
ellipsisText += item.name + ",";
});
ellipsisText = ellipsisText.substring(0, ellipsisText.length - 1);
list["ellipsis"] = ellipsisText;
//树状图有子节点
list['leaf']=false;
})
console.log(this.tableData)
}).catch((error)=>{
list["leaf"] = false;
});
console.log(this.tableData);
})
.catch(error => {});
},
add(){
this.addVisible=true;
add() {
this.addVisible = true;
},
taskFormatter(row, column, cellValue, index){
let columnText='';
row.task_list.forEach(item=>{
columnText+=item.name+','
})
columnText=columnText.substring(0,columnText.length-1);
return columnText
taskFormatter(row, column, cellValue, index) {
let columnText = "";
row.task_list.forEach(item => {
columnText += item.name + ",";
});
columnText = columnText.substring(0, columnText.length - 1);
return columnText;
},
handleSizeChange(val) {
this.pageSize=val;
this.pageSize = val;
this.query();
},
handleCurrentChange(val) {
this.page=val;
this.page = val;
this.query();
},
detail(index,row){
this.detailVisible=true;
this.curentSubList=[];
this.curentSubList=row.task_list;
detail(index, row) {
this.detailVisible = true;
this.curentSubList = [];
this.curentSubList = row.task_list;
},
delFun(index,row){
this.$confirm('此操作将永久删除该选项, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$api.resource.delStore({},row.unid).then(res=>{
if(res.ecode==200){
delFun(index, row) {
this.$confirm("此操作将永久删除该选项, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.$api.resource.delStore({}, row.unid).then(res => {
if (res.ecode == 200) {
this.$message({
type: 'success',
message: '删除成功!'
type: "success",
message: "删除成功!"
});
this.query();
}
});
})
}).catch(() => {
.catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
type: "info",
message: "已取消删除"
});
});
}
},
}
};
</script>
<style lang="scss" scoped>
.topCon{
.topCon {
background: $white-back-color;
margin-bottom: 12px;
height: 100px;
.left{
.left {
display: inline-block;
margin: {
top: 22px;
left: 30px;
};
img{
width:65px ;
}
img {
width: 65px;
height: 55px;
margin-right: 11px;
}
.topText{
font-size:24px;
font-family:MicrosoftYaHeiUI-Bold,MicrosoftYaHeiUI;
font-weight:bold;
.topText {
font-size: 24px;
font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
font-weight: bold;
margin-bottom: 4px;
}
.bottomText{
font-size:14px;
font-family:MicrosoftYaHeiUI;
.bottomText {
font-size: 14px;
font-family: MicrosoftYaHeiUI;
}
}
.right{
.right {
float: right;
.topText{
font-size:28px;
font-family:MicrosoftYaHeiUI-Bold,MicrosoftYaHeiUI;
font-weight:bold;
.topText {
font-size: 28px;
font-family: MicrosoftYaHeiUI-Bold, MicrosoftYaHeiUI;
font-weight: bold;
}
.bottomText{
.bottomText {
position: relative;
top: -1px;
font-size:14px;
font-family:MicrosoftYaHeiUI;
font-size: 14px;
font-family: MicrosoftYaHeiUI;
}
}
.textCon{
.textCon {
display: inline-block;
vertical-align: top;
}
.border{
.border {
display: inline-block;
height: 40px;
border: {
left: 2px solid $border-color;
};
}
.rightBox{
}
.rightBox {
margin-top: 14px;
display: inline-block;
img{
margin:{
top:15px;
img {
margin: {
top: 15px;
right: 22px;
}
}
}
.rightBox:nth-of-type(1){
img{
.rightBox:nth-of-type(1) {
img {
width: 34px;
height: 34px;
}
.textCon{
margin-right:114px ;
.textCon {
margin-right: 114px;
}
}
.rightBox:nth-of-type(2){
.rightBox:nth-of-type(2) {
position: relative;
top: 4px;
img{
img {
width: 40px;
height: 40px;
margin-left: 102px;
}
.textCon{
margin-right:101px ;
.textCon {
margin-right: 101px;
}
}
.rightBox:nth-of-type(3){
img{
.rightBox:nth-of-type(3) {
img {
width: 34px;
height: 35px;
margin-left: 104px;
}
.textCon{
margin-right:184px ;
}
.textCon {
margin-right: 184px;
}
}
.title{
}
.title {
font-size: 18px;
margin-bottom: 6px;
}
.maxHeight{
}
.maxHeight {
max-height: 400px;
overflow-y: auto;
}
.ellipsis{
}
.ellipsis {
display: inline-block;
width: 200px;
overflow: hidden;
text-overflow:ellipsis;
text-overflow: ellipsis;
white-space: nowrap;
}
.resourceDiv{
}
.resourceDiv {
display: inline-block;
margin-left: 10%;
span{
span {
margin-right: 5%;
}
}
.content{
background: #FFFFFF;
}
.inputBox{
}
.content {
background: #ffffff;
}
.inputBox {
margin-right: 20px;
}
.selectBox{
}
.selectBox {
margin-right: 20px;
}
.editIcon{
}
.editIcon {
cursor: pointer;
color:#0069ff;
font-size:16px;
}
.editIcon2{
color: #0069ff;
font-size: 16px;
}
.editIcon2 {
cursor: pointer;
color:#87d14b;
font-size:16px;
}
.playIcon{
color: #87d14b;
font-size: 16px;
}
.playIcon {
cursor: pointer;
color:#34b3a2;
font-size:16px;
}
.pauseIcon{
color: #34b3a2;
font-size: 16px;
}
.pauseIcon {
cursor: pointer;
color:#ffc62e;
font-size:14px;
}
.delIcon{
color: #ffc62e;
font-size: 14px;
}
.delIcon {
cursor: pointer;
color:#f2365a;
font-size:16px;
}
color: #f2365a;
font-size: 16px;
}
</style>
src/views/resource/treeComponents/cameraDialog.vue
......@@ -207,7 +207,7 @@ export default {
unid: this.addVideoParam.addr_unid
};
this.$emit("getAllData", data);
// this.$parent.$parent.$parent.submitLaterGet(data)
// this.$parent.$parent.$parent.$parent.submitLaterGet(data);
this.cameraAddVisible = false;
} else {
this.$message.error(res.enote);
......@@ -251,6 +251,11 @@ export default {
});
}
}
},
created(){
this.dirCodeList = localStorage.getItem("卡口方向")
? JSON.parse(localStorage.getItem("卡口方向"))
: [];
}
};
</script>
......
src/views/resource/treeComponents/cameraTree.vue
......@@ -21,7 +21,7 @@
data.vchan_name == "" ? "未命名" : data.vchan_name
}}</span>
</span>
<span class="tree-btn" v-if="data.label || data.label == ''">
<span class="tree-btn" v-if="(data.label || data.label == '') && data.vtype ? false:true" >
<i class="el-icon-plus" @click.stop="nodeAddClick(node, data)"></i>
<i
class="el-icon-edit"
......
src/views/resource/treeComponents/videoTree.vue
......@@ -135,7 +135,6 @@ export default {
console.log("error", req);
},
handleNodeClick(data) {
debugger
this.$emit("clickHandle", data, "video");
// this.$parent.$parent.getVideoTable(data,'video')
},
......
src/views/resource/videoEquipment.vue
......@@ -314,8 +314,8 @@ export default {
.then(res => {
this.cameraTree = res.vchan_struct;
this.cameraArr = [];
this.cameraBuildTree(res.vchan_struct);
this.getTable(data, "camera");
this.cameraTreeData = this.cameraBuildTree(res.vchan_struct);
// this.getTable(data, "camera");
});
},
syncBuildTree(data) {
......@@ -394,6 +394,7 @@ export default {
obj["label"] =
data[i].vchan_name === "" ? "未命名" : data[i].vchan_name;
obj["type"] = data[i].vchan_type;
obj["vtype"] = "camera";
obj["root"] = "手动添加相机资源";
obj["orgNode"] = orgObject;
obj["addrNode"] = addrObject;
......@@ -459,6 +460,10 @@ export default {
vchan_type: "camera",
org_unid: data.unid
};
if (data.vtype) {
this.formattterData.push(data);
return;
}
this.$api.resource
.getCameraTable(search_params, this.dev_unid)
.then(res => {
......
src/views/sceneManage/setting/ytconfig.vue
......@@ -54,7 +54,7 @@
</div>
</div>
<div class="control-right-box">
<div class="slider-box">
<!-- <div class="slider-box">
<span class="title">光圈</span>
<el-slider class="slider-item" v-model="value1" show-input></el-slider>
</div>
......@@ -69,6 +69,17 @@
<div class="slider-box">
<span class="title">速度</span>
<el-slider class="slider-item" v-model="value4" show-input></el-slider>
</div> -->
<div class="slider-box" style="margin-bottom:6vh;margin-top:3vh">
<span class="title">变倍</span>
<span class="el-icon-circle-plus s-icon s-plus"
@mousedown="Ytontroller(10)"
@mouseup="stopYtontroller(11)"
></span>
<span class="el-icon-remove s-icon"
@mousedown="Ytontroller(9)"
@mouseup="stopYtontroller(11)"
></span>
</div>
<div class="right-bottom-box">
<div class="setyzw item-box">
......@@ -207,8 +218,9 @@ export default {
.title {
float: left;
width: 2vw;
width: 2.3vw;
line-height: 35px;
font-size 16px
}
.slider-item {
......@@ -239,4 +251,12 @@ export default {
.yzw-box .control-btn:hover{
color #409EFF
}
.s-icon {
font-size 25px
line-height 35px
}
.s-plus {
margin-right 20px
margin-left 10px
}
</style>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!