diff --git a/public/antd_color.less b/public/antd_color.less index 151ce43..b746b9c 100644 --- a/public/antd_color.less +++ b/public/antd_color.less @@ -1397,7 +1397,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;} .ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;} .ant-tag-geekblue {color: #2f54eb;background: #f0f5ff;border-color: #adc6ff;} .ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;} -.ant-tag-purple {color: #722ed1;background: color(~`colorPalette("@{heading-color}", 3)`);border-color: #d3adf7;} +.ant-tag-purple {color: #722ed1;background: #f9f0ff;border-color: #d3adf7;} .ant-tag-purple-inverse {color: #fff;background: #722ed1;border-color: #722ed1;} .ant-time-picker-panel {color: @text-color;} .ant-time-picker-panel-inner {background-color: #fff;background-clip: padding-box;border-radius: 4px;box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);} diff --git a/src/views/roadwayManage/model.vue b/src/views/roadwayManage/model.vue index b8d4c05..0eccc36 100644 --- a/src/views/roadwayManage/model.vue +++ b/src/views/roadwayManage/model.vue @@ -392,13 +392,10 @@ export default { this.rightType = value //判断渲染右货架单伸或者双伸的时会用到,在这里赋值给data实例 }, handleSelectCamera(){ - this.$api.httpApi.getCameraList({ - data: { - pageNum:0, - pageSize:0, - } + this.$api.httpApi.getAllCameras({ + }).then(res => { - this.cameraList = res.data.list; + this.cameraList = res.data; }).catch(err => { });