fix: BUG修改

src/assets/js/api/equipmentCenter/cameraList.js

@@ -33,6 +33,7 @@ export const deleteVideoGroupApi = data => post('xmgl/videoGroup/delete', data);
 export const editVideoGroupApi = data => post('xmgl/videoGroup/edit', data); 
 export const getVideoGroupApi = data => post('xmgl/videoGroup/list', data); 
 export const getVideoTreeGroupApi = data => get('xmgl/videoGroup/tree/list', data); 
+export const getVideoTreeGroupVideoApi = data => post('xmgl/videoItem/selectProjectVideoTreeList', data); 
 
 // 上传第三方平台
 export const sendVideoInfoApi = data => post('xmgl/videoItem/sendVideoInfo', data); 

src/views/equipmentCenter/videoManage/videoConfig.vue

@@ -1165,6 +1165,7 @@ import {
 import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage";
 import cameraList from "./cameraList";
 import cameraListLc from "./cameraList_lc";
+
 export default {
   data() {
     return {
@@ -1319,9 +1320,15 @@ export default {
         groupId: [
           {
             required: true,
-            message: "请选择",
+            validator: (rule, value, callback) => {
+              if (!this.currentVideoTypeDetail.groupId) {
+                callback(new Error("请输入"));
+              } else {
+                callback();
+              }
+            },
             trigger: "change",
-          }, // 必
+          },
         ],
         videoName: [
           {
@@ -1466,15 +1473,12 @@ export default {
   },
   components: { cameraList, cameraListLc, gdMap },
   methods: {
+    validateGroupId() {},
     // 树形控件点击
     treeFormClick(data) {
-      console.log(data, 888999);
       this.selectFormVal = data.groupName;
       this.selectFormTreeData = data;
       this.currentVideoTypeDetail.groupId = data.id;
-      console.log(this.currentVideoTypeDetail.groupId,777888)
-      console.log(this.$refs.addVideoDialog,777888)
-      this.$refs.addVideoDialog.validateField("groupId");
     },
     // 树形控件点击
     treeClick(data) {
@@ -1484,7 +1488,7 @@ export default {
     },
     // 选择父级组件框值修改
     selectFormChange(e) {
-      console.log(e,666777)
+      console.log(e, 666777);
       if (!e) {
         this.selectFormVal = "";
         this.selectFormTreeData = {};
@@ -1572,6 +1576,7 @@ export default {
       this.Popup.newVideo = true;
       this.getAll();
       this.currentVideoTypeDetail.coverUr = "";
+      this.currentVideoTypeDetail.groupId = "";
       this.isRouterAlive = false;
       this.$nextTick(() => {
         this.$refs.addVideoDialog.clearValidate();

src/views/projectFront/materialManage/materialEntryManage.vue

@@ -83,8 +83,8 @@
             label="入场有效时间"
           >
           <template slot-scope="scope">
-              开始：{{scope.row.entryTime}} <br/>
+              开始：{{scope.row.entryBeginTime}} <br/>
-              结束：{{scope.row.entryTime}}
+              结束：{{scope.row.entryEndTime}}
             </template>
         </el-table-column>
           <el-table-column align="center" label="操作" width="280">
@@ -299,8 +299,8 @@ export default {
         type: 1
       };
       if(this.queryInfo.timeRange && this.queryInfo.timeRange.length > 0){
-        data.entryTime_begin = this.queryInfo.timeRange[0];
+        data.entryBeginTime_begin = this.queryInfo.timeRange[0];
-        data.entryTime_end = this.queryInfo.timeRange[1];
+        data.entryEndTime_end = this.queryInfo.timeRange[1];
       }
       materialEntryRecordPageApi(data).then((res) => {
         console.log("返回的值", res);

src/views/projectFront/materialManage/materialExitManage.vue

@@ -83,8 +83,8 @@
             label="出场有效时间"
           >
           <template slot-scope="scope">
-              开始：{{scope.row.entryTime}} <br/>
+              开始：{{scope.row.entryBeginTime}} <br/>
-              结束：{{scope.row.entryTime}}
+              结束：{{scope.row.entryEndTime}}
             </template>
         </el-table-column>
           <el-table-column align="center" label="操作" width="280">
@@ -295,8 +295,8 @@ export default {
         type: 2
       };
       if(this.queryInfo.timeRange && this.queryInfo.timeRange.length > 0){
-        data.entryTime_begin = this.queryInfo.timeRange[0];
+        data.entryBeginTime_begin = this.queryInfo.timeRange[0];
-        data.entryTime_end = this.queryInfo.timeRange[1];
+        data.entryEndTime_end = this.queryInfo.timeRange[1];
       }
       materialEntryRecordPageApi(data).then((res) => {
         console.log("返回的值", res);

src/views/projectFront/projectSummary/manageTeam.vue

@@ -183,7 +183,6 @@ import {
   checkPhone,
   IdentityCodeValid,
 } from '@/assets/js/util.js'
-
 export default {
   mounted() {
     this.getList()

src/views/projectFront/videoManage/overview.vue

@@ -30,7 +30,25 @@
         </div>
         <div class="videoBox" v-else>
           <vue-scroll style="width: 100%;">
-            <el-collapse v-model="activeNames" style="padding: 0 20px">
+            <el-tree
+              :data="videoTreeData"
+              node-key="id"
+              ref="treeNode"
+              label="name"
+              :expand-on-click-node="false"
+              :default-expand-all="false"
+              @node-click="changeTreeVideo"
+            >
+              <span class="custom-tree-node" slot-scope="{ node, data }">
+                <img
+                      v-if="data.deviceType == 2 && data.videoId"
+                      src="@/assets/images/icon-video2-white.png"
+                    />
+                    <img v-else-if="data.deviceType != 2 && data.videoId" src="@/assets/images/icon-video-white.png" />
+                <span :title="data.name">{{ data.name }}</span>
+              </span>
+            </el-tree>
+            <!-- <el-collapse v-model="activeNames" style="padding: 0 20px">
               <el-collapse-item
                 :title="item.name"
                 :name="index"
@@ -52,7 +70,7 @@
                   </li>
                 </ul>
               </el-collapse-item>
-            </el-collapse>
+            </el-collapse> -->
           </vue-scroll>
         </div>
       </div>
@@ -74,7 +92,8 @@
 <script>
 import {
   selectProjectVideoListApi,
-  selectUserVideoListApi
+  selectUserVideoListApi,
+  getVideoTreeGroupVideoApi
 } from '@/assets/js/api/equipmentCenter/cameraList'
 import videoModule from '@/components/videoModule/videoModule.vue'
 import closePage from '@/components/closePage'
@@ -82,6 +101,7 @@ export default {
   components: { videoModule, closePage },
   data() {
     return {
+      videoTreeData: [],
       devList: [],
       selectList: [],
       dataType: 1,
@@ -106,10 +126,21 @@ export default {
     // } else {
     //   this.loadData2()
     // }
-    this.loadData()
+    // this.loadData()
+    this.getVideoTreeGroup();
   },
 
   methods: {
+    //获取视频分组列表
+    getVideoTreeGroup() {
+      getVideoTreeGroupVideoApi({ projectSn: this.$store.state.projectSn }).then(
+        (res) => {
+          console.log("获取视频分组列表", res);
+          this.videoTreeData = res.result.videoList;
+          this.dataType = res.result.type
+        }
+      );
+    },
     changeVideo(item) {
       console.log('点击了列表----')
 
@@ -117,6 +148,16 @@ export default {
       this.selectList = [item]
       console.log('右边的值', this.selectList)
     },
+    // 切换视频分组
+    changeTreeVideo(item) {
+      console.log('点击了列表----')
+
+      console.log(item, 'xxxxxxxxxx')
+      if(item.videoId){
+        this.selectList = [item]
+      }
+      console.log('右边的值', this.selectList)
+    },
     loadData() {
       selectProjectVideoListApi({
         projectSn: this.$store.state.projectSn
@@ -189,4 +230,19 @@ export default {
   float: left;
   width: calc(100% - 300px);
 }
+
+// 树形选择样式
+/deep/.el-tree-node:focus > .el-tree-node__content{
+  background-color: rgba(168, 191, 230, 0.69);
+}
+.custom-tree-node{
+  display: flex;
+  align-items: center;
+  span{
+    color: white;
+  }
+  img {
+      margin-right: 8px;
+    }
+}
 </style>