diff --git a/public/antd_color.less b/public/antd_color.less index ad995ad..b746b9c 100644 --- a/public/antd_color.less +++ b/public/antd_color.less @@ -40,7 +40,7 @@ html {--antd-wave-shadow-color: @primary-color;} .ant-alert-success .ant-alert-icon {color: #52c41a;} .ant-alert-info {background-color: #e6f7ff;border: 1px solid #91d5ff;} .ant-alert-info .ant-alert-icon {color: #1890ff;} -.ant-alert-warning {background-color: color(~`colorPalette("@{heading-color}", 1)`);border: 1px solid #ffe58f;} +.ant-alert-warning {background-color: #fffbe6;border: 1px solid #ffe58f;} .ant-alert-warning .ant-alert-icon {color: #faad14;} .ant-alert-error {background-color: #fff1f0;border: 1px solid #ffa39e;} .ant-alert-error .ant-alert-icon {color: #f5222d;} @@ -1385,7 +1385,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;} .ant-tag-orange-inverse {color: #fff;background: #fa8c16;border-color: #fa8c16;} .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: color(~`colorPalette("@{heading-color}", 1)`);border-color: #ffe58f;} +.ant-tag-gold {color: #faad14;background: #fffbe6;border-color: #ffe58f;} .ant-tag-gold-inverse {color: #fff;background: #faad14;border-color: #faad14;} .ant-tag-cyan {color: #13c2c2;background: #e6fffb;border-color: #87e8de;} .ant-tag-cyan-inverse {color: #fff;background: #13c2c2;border-color: #13c2c2;} diff --git a/src/router/index.js b/src/router/index.js index a3983e3..3d337b8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -111,6 +111,16 @@ const routes = [{ }, component: () => import('@/views/historyCheck/index'), }, + + { + path: 'checkHistory1', + name: 'checkHistory1', + meta: { + icon: 'tag', + name: '库位历史', + }, + component: () => import('@/views/historyCheck/index'), + }, // { // path: 'stockHistory', // name: 'stockHistory', diff --git a/src/store/modules/styles.js b/src/store/modules/styles.js index 19abe70..de2bb0e 100644 --- a/src/store/modules/styles.js +++ b/src/store/modules/styles.js @@ -8,24 +8,24 @@ const store = { state: { data:{ "theme":{ - "primary-color":"rgba(184, 68, 13, 1)" + "primary-color":"rgba(33, 56, 207, 1)" }, "title":{ "text":"北起院智能视觉系统", "style":{ "color":"rgba(255, 255, 255, 1)", - "background-color":"rgba(163, 60, 12, 1)", + "background-color":"rgba(6, 87, 207, 1)", "font-size":"24px" } }, "menu":{ "default":{ "color":"rgba(230, 224, 224, 1)", - "background-color":"rgba(163, 60, 12, 1)" + "background-color":"rgba(6, 87, 207, 1)" }, "select":{ "color":"rgba(255, 255, 255, 1)", - "background-color":"rgba(184, 68, 13, 1)" + "background-color":"rgba(33, 56, 207, 1)" } } } diff --git a/src/views/historyMonitoring/index.vue b/src/views/historyMonitoring/index.vue index 4bdef1e..90ee633 100644 --- a/src/views/historyMonitoring/index.vue +++ b/src/views/historyMonitoring/index.vue @@ -273,9 +273,19 @@ export default { }, showModel(record) { this.visible = true - this.vid1 = videoUrl + record.videoPath1; + if(!record.videoPath1.includes('http')){ + + this.vid1 = videoUrl + record.videoPath1; + }else{ + this.vid1 = record.videoPath1; + } console.log(this.vid1) - this.vid2 = videoUrl + record.videoPath2; + if(!record.videoPath2.includes('http')){ + + this.vid2 = videoUrl + record.videoPath2; + }else{ + this.vid2 = record.videoPath2; + } }, closeModel(visible, data) {