diff --git a/src/views/cameraChannel/index.vue b/src/views/cameraChannel/index.vue index 954c4d7..581f8f0 100644 --- a/src/views/cameraChannel/index.vue +++ b/src/views/cameraChannel/index.vue @@ -47,10 +47,10 @@ disabled > --> - {{ scope.row.status == 1 ? "开启" : "关闭" }} @@ -208,6 +208,14 @@ export default { margin-top: 16px; height: calc(100% - 48px); //background: #fcc; + .el-tag--dark.el-tag--success { + background: linear-gradient(180deg, #67c23a 10%, #3fb504 100%); + border-color: transparent; + } + .el-tag--dark.el-tag--warning { + background: linear-gradient(180deg, #e6a23c 10%, #e78c04 100%); + border-color: transparent; + } } } diff --git a/src/views/pictureRotation/index.vue b/src/views/pictureRotation/index.vue index 340a97a..9376664 100644 --- a/src/views/pictureRotation/index.vue +++ b/src/views/pictureRotation/index.vue @@ -241,6 +241,7 @@ export default { this.colNum = parseInt(localStorage.getItem("col")) ? parseInt(localStorage.getItem("col")) : 2; + this.pageSize = this.rowradio * this.colradio; this.setdialog = false; this.$message.success("设置成功"); this.getPicData(); @@ -324,7 +325,7 @@ export default { this.colradio = this.colNum = parseInt(localStorage.getItem("col")) ? parseInt(localStorage.getItem("col")) : 2; - + this.pageSize = this.rowradio * this.colradio; this.toggleCountdown(); }, created() {}, diff --git a/vue.config.js b/vue.config.js index e3ab0d5..3e6b409 100644 --- a/vue.config.js +++ b/vue.config.js @@ -28,11 +28,11 @@ module.exports = defineConfig({ proxy: { "/api": { //表示拦截以/api开头的请求路径 - target: "http://47.96.238.157:8093", //阿里云服务器环境 - //target: "http://180.166.218.222:40080", //dell + //target: "http://47.96.238.157:8093", //阿里云服务器环境 + target: "http://180.166.218.222:40080", //dell changOrigin: true, //是否开启跨域 pathRewrite: { - "^/api": "", //重写api,把api变成空字符,因为我们真正请求的路径是没有api的 + "^/api": "/api", //重写api,把api变成空字符,因为我们真正请求的路径是没有api的 }, }, },