111

package.json

@@ -19,6 +19,7 @@
     "swiper": "^5.4.5",
     "vue": "^2.6.11",
     "vue-awesome-swiper": "^3.1.3",
+    "vue-color": "^2.8.1",
     "vue-router": "^3.2.0",
     "vuex": "^3.4.0"
   },

public/static/dahua/index.html

@@ -14,7 +14,7 @@
 </body>
 <script type="module">
   import WSPlayer from "./src/WSPlayer/WSPlayer.js";
-  var recordPlayer = new WSPlayer({
+  let recordPlayer = new WSPlayer({
     el: 'ws-record-player', // 必传
     type: 'record', // real | record
     serverIp: '36.26.62.70',
@@ -22,7 +22,6 @@
     showControl: true,
   })
   let url = location.href;
-  console.log(url)
   let rtsps = url.split('?')[1];
   let token = url.split('?')[2];
   let rtsp = rtsps + '?' + token;

public/static/dahua/src/WSPlayer/RecordPlayer.js

@@ -3,6 +3,7 @@ import {Spinner} from './spin.js'
 import CONSTANT from './CONSTANT.js'
 
 const PlayerControl = window.PlayerControl;
+console.log(PlayerControl)
 
 
 /* ---------------- RecordPlayerItem ---------------- */
@@ -182,7 +183,7 @@ class RecordPlayerItem extends PlayerItem {
         }).spin(this.$el[0])
         let self = this
         this.player = new PlayerControl(Object.assign({
-            wsURL: this.wsPlayer.wsURL
+            wsURL: this.wsPlayer.wsURL,
         }, options))
         this.options = options
         this.timeLong = options.endTime - options.startTime
@@ -283,11 +284,11 @@ class RecordPlayerItem extends PlayerItem {
     }
     /**
      * 时间跳转
-     * @param {*} time 
+     * @param {*} time
      */
     playByTime(time) {
         this.player.playByTime(time)
     }
 }
 
-export default RecordPlayerItem
+export default RecordPlayerItem

src/components/HeaderElement.vue

@@ -73,9 +73,10 @@
                   width="400"
                   trigger="hover">
                 <div class="color_flex">
-                  <div v-for="item in colorList" :style="{backgroundColor: item.color}" :key="item.id" class="box" @click="cut(item.color)">
-                    <span>点击换肤</span>
-                  </div>
+                  <slider-picker :value="color" @input="cut"></slider-picker>
+<!--                  <div v-for="item in colorList" :style="{backgroundColor: item.color}" :key="item.id" class="box" @click="cut(item.color)">-->
+<!--                    <span>点击换肤</span>-->
+<!--                  </div>-->
                 </div>
                 <i slot="reference" class="colour"></i>
               </el-popover>
@@ -96,11 +97,15 @@
 <script>
 import { mapState, mapActions } from 'vuex'
 import { findUpdate, getFarmId } from '../utils/api';
+import { Slider } from 'vue-color'
 export default {
   name: "HeaderElement",
   computed: {
     ...mapState(['color', 'farmList', 'farmId'])
   },
+  components: {
+    'slider-picker': Slider
+  },
   data() {
     return {
       userName: localStorage.getItem('UserName'),
@@ -143,10 +148,11 @@ export default {
   methods: {
     ...mapActions(['setModeAsync', 'setColorAsync', 'GetFarm', 'setFarmIdAsync']),
     cut(data) {
-      this.setColorAsync(data)
+      console.log(data)
+      this.setColorAsync(data.hex)
       let params = {
         id: localStorage.getItem('UserId'),
-        color: data
+        color: data.hex
       }
       findUpdate(params).then(res => {
         console.log(res)

src/components/XForm.vue

@@ -43,7 +43,7 @@
                 <span  :style="{cursor: 'pointer', color: item.value === day ? color : '#000' }" @click="onSelectText(item.value)">{{item.text}}</span>
               </template>
               <template v-else-if="item.type === 'button'">
-                <el-button @click="manage(item.click)">{{item.text}}</el-button>
+                <el-button  @click="manage(item.click)">{{item.text}}</el-button>
               </template>
             </el-form-item>
           </el-col>

src/views/BioSafety/CarAdmin.vue

@@ -317,9 +317,9 @@ export default {
     clickEvent(row) {
       getCarWashVideo({
         happendTime: row.alarmDate,
-        channelId: row.nodeCode,
+        channelName: row.alarmPosition,
       }).then((res) => {
-        if (res.code === 10000) {
+        if (res.code === 0) {
           this.rtsp = res.URL;
           this.videoVisible = true;
         }