admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-18 20:25:29 +08:00
parent f3d82c92d5
commit 21cf0da076
3 changed files with 75 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/js/http.js
View File

@ -82,7 +82,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上 // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
axios.defaults.baseURL ='http://192.168.34.221:19111/' //郭圣雄本地 axios.defaults.baseURL ='http://192.168.34.221:19111/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地

1
src/views/equipmentCenter/videoManage/videoConfig.vue
View File

@ -2104,6 +2104,7 @@ export default {
//编辑 //编辑
params.projectSn = this.configInfoParams.projectSn; params.projectSn = this.configInfoParams.projectSn;
params.itemId = this.currentVideoTypeDetail.itemId; params.itemId = this.currentVideoTypeDetail.itemId;
params.parentObj = JSON.stringify(this.selectFormTreeData);
console.log("编辑内容", this.currentVideoTypeDetail); console.log("编辑内容", this.currentVideoTypeDetail);
editVideoItemApi(params).then((res) => { editVideoItemApi(params).then((res) => {
console.log("编辑成功", res); console.log("编辑成功", res);

129
src/views/projectFront/videoManage/overview.vue
View File

@ -2,7 +2,7 @@
<div class="fullHeight videoOverview"> <div class="fullHeight videoOverview">
<closePage></closePage> <closePage></closePage>
<div class="header"> <div class="header">
<span>{{topTitle}}</span> <span>{{ topTitle }}</span>
</div> </div>
<div class="videoContent"> <div class="videoContent">
<div class="videoListBox fullHeight"> <div class="videoListBox fullHeight">
@ -29,7 +29,7 @@
</vue-scroll> </vue-scroll>
</div> </div>
<div class="videoBox" v-else> <div class="videoBox" v-else>
<vue-scroll style="width: 100%;"> <vue-scroll style="width: 100%">
<el-tree <el-tree
:data="videoTreeData" :data="videoTreeData"
node-key="id" node-key="id"
@ -41,11 +41,22 @@
> >
<span class="custom-tree-node" slot-scope="{ node, data }"> <span class="custom-tree-node" slot-scope="{ node, data }">
<img <img
v-if="data.deviceType == 2 && data.videoId" v-if="data.deviceType == 2 && data.videoId"
src="@/assets/images/icon-video2-white.png" src="@/assets/images/icon-video2-white.png"
/> />
<img v-else-if="data.deviceType != 2 && data.videoId" src="@/assets/images/icon-video-white.png" /> <img
<span :title="data.name">{{ data.name }}</span> v-else-if="data.deviceType != 2 && data.videoId"
src="@/assets/images/icon-video-white.png"
/>
<el-tooltip
class="item"
effect="dark"
:content="data.name"
placement="top-start"
>
<span>{{ data.name }}</span>
</el-tooltip>
</span> </span>
</el-tree> </el-tree>
<!-- <el-collapse v-model="activeNames" style="padding: 0 20px"> <!-- <el-collapse v-model="activeNames" style="padding: 0 20px">
@ -93,10 +104,10 @@
import { import {
selectProjectVideoListApi, selectProjectVideoListApi,
selectUserVideoListApi, selectUserVideoListApi,
getVideoTreeGroupVideoApi getVideoTreeGroupVideoApi,
} from '@/assets/js/api/equipmentCenter/cameraList' } from "@/assets/js/api/equipmentCenter/cameraList";
import videoModule from '@/components/videoModule/videoModule.vue' import videoModule from "@/components/videoModule/videoModule.vue";
import closePage from '@/components/closePage' import closePage from "@/components/closePage";
export default { export default {
components: { videoModule, closePage }, components: { videoModule, closePage },
data() { data() {
@ -107,15 +118,15 @@ export default {
dataType: 1, dataType: 1,
activeNames: [0], activeNames: [0],
screens: {}, screens: {},
pluginType: '', pluginType: "",
topTitle: '视频管理中心', topTitle: "视频管理中心",
COMPANY: COMPANY COMPANY: COMPANY,
} };
}, },
created() { created() {
console.log(COMPANY) console.log(COMPANY);
if(COMPANY == 'agjt'){ if (COMPANY == "agjt") {
this.topTitle = "AI训练模型" this.topTitle = "AI训练模型";
} }
}, },
mounted() { mounted() {
@ -133,57 +144,57 @@ export default {
methods: { methods: {
//获取视频分组列表 //获取视频分组列表
getVideoTreeGroup() { getVideoTreeGroup() {
getVideoTreeGroupVideoApi({ projectSn: this.$store.state.projectSn }).then( getVideoTreeGroupVideoApi({
(res) => { projectSn: this.$store.state.projectSn,
console.log("获取视频分组列表", res); }).then((res) => {
this.videoTreeData = res.result.videoList; console.log("获取视频分组列表", res);
this.dataType = res.result.type this.videoTreeData = res.result.videoList;
} this.dataType = res.result.type;
); });
}, },
changeVideo(item) { changeVideo(item) {
console.log('点击了列表----') console.log("点击了列表----");
console.log(item, 'xxxxxxxxxx') console.log(item, "xxxxxxxxxx");
this.selectList = [item] this.selectList = [item];
console.log('右边的值', this.selectList) console.log("右边的值", this.selectList);
}, },
// 切换视频分组 // 切换视频分组
changeTreeVideo(item) { changeTreeVideo(item) {
console.log('点击了列表----') console.log("点击了列表----");
console.log(item, 'xxxxxxxxxx') console.log(item, "xxxxxxxxxx");
if(item.videoId){ if (item.videoId) {
this.selectList = [item] this.selectList = [item];
} }
console.log('右边的值', this.selectList) console.log("右边的值", this.selectList);
}, },
loadData() { loadData() {
selectProjectVideoListApi({ selectProjectVideoListApi({
projectSn: this.$store.state.projectSn projectSn: this.$store.state.projectSn,
}).then((res) => { }).then((res) => {
var DATA = res.result.videoList var DATA = res.result.videoList;
this.devList = DATA this.devList = DATA;
this.selectList = this.devList this.selectList = this.devList;
console.log('视频的列表', res.result) console.log("视频的列表", res.result);
this.dataType = res.result.type this.dataType = res.result.type;
}) });
}, },
loadData2() { loadData2() {
selectUserVideoListApi({ selectUserVideoListApi({
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
userId: this.$store.state.userInfo.userId userId: this.$store.state.userInfo.userId,
}).then((res) => { }).then((res) => {
var DATA = res.result.videoList var DATA = res.result.videoList;
this.devList = DATA this.devList = DATA;
this.dataType = res.result.type this.dataType = res.result.type;
}) });
} },
} },
} };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import './style.less'; @import "./style.less";
.videoListBox { .videoListBox {
float: left; float: left;
width: 300px; width: 300px;
@ -232,17 +243,23 @@ export default {
} }
// 树形选择样式 // 树形选择样式
/deep/.el-tree-node:focus > .el-tree-node__content{ /deep/.el-tree-node:focus > .el-tree-node__content {
background-color: rgba(168, 191, 230, 0.69); background-color: rgba(168, 191, 230, 0.69);
} }
.custom-tree-node{ .custom-tree-node {
width: 80%;
display: flex; display: flex;
align-items: center; align-items: center;
span{ span {
display: inline-block;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
width: 85%;
color: white; color: white;
} }
img { img {
margin-right: 8px; margin-right: 8px;
} }
} }
</style> </style>