diff --git a/public/antd_color.less b/public/antd_color.less index 3f31489..b746b9c 100644 --- a/public/antd_color.less +++ b/public/antd_color.less @@ -30,7 +30,7 @@ button::-moz-focus-inner, [type='submit']::-moz-focus-inner {border-style: none;} fieldset {border: 0;} legend {color: inherit;} -mark {background-color: color(~`colorPalette("@{heading-color}", 1)`);} +mark {background-color: #feffe6;} ::selection {color: #fff;background: @primary-color;} .anticon {color: inherit;} html {--antd-wave-shadow-color: @primary-color;} @@ -1383,7 +1383,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;} .ant-tag-volcano-inverse {color: #fff;background: #fa541c;border-color: #fa541c;} .ant-tag-orange {color: #fa8c16;background: #fff7e6;border-color: #ffd591;} .ant-tag-orange-inverse {color: #fff;background: #fa8c16;border-color: #fa8c16;} -.ant-tag-yellow {color: #fadb14;background: color(~`colorPalette("@{heading-color}", 1)`);border-color: #fffb8f;} +.ant-tag-yellow {color: #fadb14;background: #feffe6;border-color: #fffb8f;} .ant-tag-yellow-inverse {color: #fff;background: #fadb14;border-color: #fadb14;} .ant-tag-gold {color: #faad14;background: #fffbe6;border-color: #ffe58f;} .ant-tag-gold-inverse {color: #fff;background: #faad14;border-color: #faad14;} diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js index 1facb85..f2ed64a 100644 --- a/src/api/http/http-api.js +++ b/src/api/http/http-api.js @@ -56,11 +56,6 @@ export default { url: "/camera/page", name: "获取球机列表" }, - getVideoServer:{ - method: "GET", - url: "/realTime/videoServer", - name: "获取视频服务器" - }, getAllCameras:{ method: "GET", url: "/realTime/allCameras", diff --git a/src/views/cameraManage/model.vue b/src/views/cameraManage/model.vue index 3096e12..d6bab9e 100644 --- a/src/views/cameraManage/model.vue +++ b/src/views/cameraManage/model.vue @@ -271,8 +271,6 @@ export default { }; }, mounted() { - - this.setVideoServer() if (this.$route.query.modelType == 'test') { this.isShow = true this.id = this.$route.query.modelData.id @@ -363,17 +361,6 @@ export default { } }, - - setVideoServer(){ - this.$api.httpApi.getVideoServer({ - data: {} - }).then(res => { - - - }).catch(err => { - console.log(err) - }) - }, getConfigIoList(){ this.$axios.post('/camera/'+this.id+'/io/list', { data: { diff --git a/src/views/realTimeMonitoring/index.vue b/src/views/realTimeMonitoring/index.vue index edbfc06..dd961b5 100644 --- a/src/views/realTimeMonitoring/index.vue +++ b/src/views/realTimeMonitoring/index.vue @@ -63,7 +63,6 @@ export default { //inject: ['reload'], mounted() { this.getClientHeight() - this.setVideoServer() this.getRealTimeList() this.tabKey = sessionStorage.getItem('tabKey'); @@ -130,18 +129,6 @@ export default { console.log("stop") player.destroy() } - }, - setVideoServer(){ - this.$api.httpApi.getVideoServer({ - data: {} - }).then(res => { - if(res.code == 200) { - WebRtcPlayer.setServer(res.data.toString()); - } - - }).catch(err => { - console.log(err) - }) } },