Explorar el Código

[FE]:修改视频监控样式

xiayu3 %!s(int64=4) %!d(string=hace) años
padre
commit
5037b22804

+ 5 - 5
security-protection-platform/src/modules/attendance/components/DeptStaffCascader/index.vue

@ -63,11 +63,11 @@ export default {
63 63
          }
64 64
        })
65 65
66
        if (this.source.length > 0) {
67
          const orgId = this.source[0].value
68
          // const depId = this.source[0].children[0].value
69
          this.staff = [orgId]
70
        }
66
        // if (this.source.length > 0) {
67
        //   const orgId = this.source[0].value
68
        //   // const depId = this.source[0].children[0].value
69
        //   this.staff = [orgId]
70
        // }
71 71
72 72
        this.$emit('inited')
73 73
      }, err => {

+ 19 - 15
security-protection-platform/src/modules/attendance/report/index.vue

@ -158,12 +158,16 @@ export default {
158 158
    },
159 159
    // 搜索
160 160
    handSearchDay () {
161
      this.dailyForm.current = 1
162
      this.getDailyTable()
161
      if (this.dailyForm.workDay && this.dailyForm.orgId) {
162
        this.dailyForm.current = 1
163
        this.getDailyTable()
164
      } else { return this.$Message.warning('请选择时间和部门') }
163 165
    },
164 166
    handSearchMonth () {
165
      this.monthlyForm.current = 1
166
      this.getMonthTable()
167
      if (this.monthlyForm.month && this.monthlyForm.orgId) {
168
        this.monthlyForm.current = 1
169
        this.getMonthTable()
170
      } else { return this.$Message.warning('请选择时间和部门') }
167 171
    },
168 172
    // 分页
169 173
    onChangeDay (val) {
@ -176,21 +180,21 @@ export default {
176 180
    },
177 181
    // 重置日报数据
178 182
    resetDailyData() {
179
      let now = new Date()
180
      this.dailyForm = {
181
        workDay: formatDateTime(now, 'yyyy-MM-dd'),
182
        userid: null,
183
        depId: '',
184
        orgId: '',
185
        current: 1,
186
        pageSize: 10
187
      }
183
      this.$nextTick(() => {
184
        this.dailyForm = {
185
          workDay: '',
186
          userid: null,
187
          depId: '',
188
          orgId: '',
189
          current: 1,
190
          pageSize: 10
191
        }
192
      })
188 193
    },
189 194
    // 重置月报数据
190 195
    resetMonthData() {
191
      let now = new Date()
192 196
      this.monthlyForm = {
193
        month: formatDateTime(new Date().setMonth(now.getMonth() - 1), 'yyyy-MM'),
197
        month: '',
194 198
        userid: null,
195 199
        depId: '',
196 200
        orgId: '',

+ 13 - 3
security-protection-platform/src/modules/videoSurveillance/components/rtmpVideoPlay/index.vue

@ -60,9 +60,19 @@ export default {
60 60
    handlePlayerInited (player) {
61 61
      this.$player = player
62 62
      window.player = this
63
      var myButton = player.controlBar.addChild('button')
64
      myButton.addClass('vjs-play-control')
65
      myButton.on('click', () => {
63
      let distinguishBtn = player.controlBar.addChild('button')
64
      distinguishBtn.addClass('aidicon')
65
      distinguishBtn.addClass('aidicon-image-outline')
66
      distinguishBtn.setAttribute('title', '识别记录')
67
      distinguishBtn.size = '20'
68
      distinguishBtn.on('click', () => {
69
        this.$emit('goDistinguishRecord')
70
      })
71
      let repalyBtn = player.controlBar.addChild('button')
72
      repalyBtn.addClass('aidicon')
73
      repalyBtn.addClass('aidicon-piechart-outline')
74
      repalyBtn.setAttribute('title', '视频回放')
75
      repalyBtn.on('click', () => {
66 76
        this.$emit('videoReplay', this.list[0].id)
67 77
      })
68 78
    },

+ 9 - 3
security-protection-platform/src/modules/videoSurveillance/index.vue

@ -16,7 +16,7 @@
16 16
    </div>
17 17
    <div class="page-bottom">
18 18
      <div v-for="(item,index) in videoList" :key="index" :value="item.id" style="width:400px;margin:24px 0px 0 24px;">
19
        <rtmp-video :list="getVideoPlayList(item)" @videoReplay="handleReview"></rtmp-video>
19
        <rtmp-video :list="getVideoPlayList(item)" @goDistinguishRecord="goDistinguishRecord" @videoReplay="handleReview"></rtmp-video>
20 20
      </div>
21 21
    </div>
22 22
    <t-pager :page-size="videoPageSize" :current="videoCurrent" :total="videoTotal" :sizer-range="[ 5, 10, 20, 30 ]" class="pager" show-elevator @on-change="onChangeGate"></t-pager>
@ -87,7 +87,6 @@ export default {
87 87
    getSceneList () {
88 88
      this.sceneList = []
89 89
      this.videoList = []
90
      console.log(this.organizationList)
91 90
      this.organizationList.forEach((element, index) => {
92 91
        if (element.id === this.gateFieldData) {
93 92
          sysapi.getMonitorScene(this.organizationList[index].id).then((resp) => {
@ -100,7 +99,6 @@ export default {
100 99
    // 向服务器发送请求获取视频回放数据
101 100
    async queryMonitorVideoLog (data) {
102 101
      let res = []
103
      // console.log(this.beginDay, this.endDay)
104 102
      if (data) {
105 103
        res = await sysapi.queryMonitorVideoLog({ params: { id: this.replayId, ...data } })
106 104
      } else {
@ -142,6 +140,7 @@ export default {
142 140
    getVideoSurveillanceData (id) {
143 141
      this.paramsObj.page = this.videoCurrent
144 142
      sysapi.getVideoSurveillanceData({ params: { monitorSceneId: id } }).then(res => {
143
        console.log(res);
145 144
        this.videoList = res.data.data
146 145
      })
147 146
    },
@ -230,5 +229,12 @@ export default {
230 229
  .btn-outline-secondary {
231 230
    background: none;
232 231
  }
232
  .video-js .vjs-control:focus, .video-js .vjs-control:focus:before, .video-js .vjs-control:hover:before{
233
    color:#0089d4;
234
    text-shadow: none;
235
  }
236
  .video-js .vjs-control{
237
    cursor: pointer;
238
  }
233 239
}
234 240
</style>

+ 6 - 0
security-protection-platform/src/routes.js

@ -40,6 +40,12 @@ export const constantRoutes = [
40 40
        path: '',
41 41
        component: () => import(/* webpackChunkName: "videoSurveillance" */ './modules/videoSurveillance'),
42 42
        meta: { title: '视频监控', icon: 'video' }
43
      },
44
      {
45
        path: '/videoSurveillance/distinguishRecord',
46
        component: () => import(/* webpackChunkName: "videoSurveillance" */ './modules/videoSurveillance/distinguishRecord'),
47
        meta: { title: '视频监控', icon: 'video' },
48
        hidden: true
43 49
      }
44 50
    ]
45 51
  },