Merge branch 'release-sy-v1.0.0' of http://gitlab.datameta.com/project/water/shuili-vue into release-sy-v1.0.0

src/api/reservoir/index.js

@@ -175,9 +175,17 @@ export const getReservoirCZMonitorEchartsData = (data) =>{
 }
 
 // 获取视频列表/safe/operation/Play
-export const getOperationPlayDataList = (data) => {
+export const getOperationPlay = (data) => {
   return request({
-    url: `/safe/operation/Play`,
+    url: `/safe/operation/play`,
+    method: 'post',
+    data
+  })
+}
+
+export const getVideoDataList = (data) => {
+  return request({
+    url: `/safe/operation/reservoirList`,
     method: 'post',
     data
   })

src/views/reservoir/safeOperation/components/VideoAnalysis.vue

@@ -1,19 +1,20 @@
 <template>
   <div class="video-analysis">
     <div class="videoSelect">
-      <!-- <el-select
+      <el-select
         placeholder="请选择视频"
         v-model="activeVideo"
         size="mini"
         style="width: 240px"
+        @change="change"
       >
         <el-option
           v-for="item in videoList"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
+          :key="item"
+          :label="item"
+          :value="item"
         />
-      </el-select> -->
+      </el-select>
     </div>
     <el-tabs v-model="activeName">
       <el-tab-pane label="实时视频" name="realTime">
@@ -35,7 +36,7 @@
   </div>
 </template>
 <script>
-import { getOperationPlayDataList } from "@/api/reservoir";
+import { getVideoDataList, getOperationPlay} from "@/api/reservoir";
 
 export default {
   props: {
@@ -50,26 +51,32 @@ export default {
       videoUrl: "",
       activeVideo: "",
       videoList: [
-        {
-          label: "实时视频",
-          value: "0",
-        },
       ],
     };
   },
   created() {
-    getOperationPlayDataList({
+    getVideoDataList({
       pageNum: 1,
       pageSize: 100,
       resCode: this.resCode,
     }).then((res) => {
       if (res.data) {
-        this.videoList = res.data;
-        this.videoUrl = (res.data.urlsMap && res.data.urlsMap.flvPlayUrl) || "";
+        this.videoList = res.data.cameraIds;
       }
     });
   },
-  methods: {},
+  methods: {
+    change(val) {
+      console.log("cameraId-watch >>>>>  ", val);
+      getOperationPlay({
+        cameraId: val,
+      }).then((res) => {
+      if (res.data) {
+        this.videoUrl = res.data.urlsMap.flvPlayUrl;
+      }
+    });
+    },
+  },
 };
 </script>
 <style scoped lang="scss">