diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 36e5383f..9bd8fc90 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -18,7 +18,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口,默认为8080 - port: 8080 + port: 8081 servlet: # 应用的访问路径 context-path: / @@ -54,7 +54,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: laobaigan + active: druid # 文件上传 servlet: multipart: diff --git a/ruoyi-ui/src/assets/styles/picture-common.scss b/ruoyi-ui/src/assets/styles/picture-common.scss index 5975bfc0..f712c71a 100644 --- a/ruoyi-ui/src/assets/styles/picture-common.scss +++ b/ruoyi-ui/src/assets/styles/picture-common.scss @@ -861,6 +861,20 @@ text-align: center; background: transparent !important; color: #fff !important; } + .el-input__inner::-webkit-input-placeholder { + /* WebKit browsers,webkit内核浏览器 */ + color: rgba(255,255,255, 1) !important; +} + + .el-input__inner:-moz-placeholder { + /* Mozilla Firefox 4 to 18 */ + color: rgba($p-secondary-color, 1) !important; + } + + .el-input__inner::-moz-placeholder { + /* Mozilla Firefox 19+ */ + color: rgba($p-secondary-color, 1) !important; + } .el-range-separator { color: #fff !important; diff --git a/ruoyi-ui/src/views/picture/scenic-flow/index.vue b/ruoyi-ui/src/views/picture/scenic-flow/index.vue index 6f641333..408ce3f6 100644 --- a/ruoyi-ui/src/views/picture/scenic-flow/index.vue +++ b/ruoyi-ui/src/views/picture/scenic-flow/index.vue @@ -77,6 +77,12 @@ + + @@ -164,6 +170,7 @@ export default { return { showDialog: false, flowState: '进客流', + week:'', cityOptions: [ { value: '石家庄市', diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index a28c18eb..4432b808 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -35,9 +35,9 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - //target: `http://localhost:8080/`,//用户名:admin 密码CJYjqgk@2023! + target: `http://localhost:8081/`,//用户名:admin 密码CJYjqgk@2023! //target: `http://39.105.17.128:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023! - target: `http://192.168.130.109:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023! 文硕 + //target: `http://192.168.130.109:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023! 文硕 //target: `http://192.168.130.16:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023! 线上 //target: `http://192.168.130.155:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023! 马松