diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 2135a3a2..b4d45b9c 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -9,7 +9,7 @@ spring: url: jdbc:mysql://39.105.17.128:33068/scenic_controls?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: jqzhgk password: 3d*fu%HGrSXjyK5 -# url: jdbc:mysql://localhost:13306/scenic_controls?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://192.168.130.109:13306/scenic_controls?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: root # password: root # 从库数据源 diff --git a/ruoyi-ui/src/views/system/management/tourism-resources/basicResources/tourBasic/index.vue b/ruoyi-ui/src/views/system/management/tourism-resources/basicResources/tourBasic/index.vue index 27bc4a9e..2c79590e 100644 --- a/ruoyi-ui/src/views/system/management/tourism-resources/basicResources/tourBasic/index.vue +++ b/ruoyi-ui/src/views/system/management/tourism-resources/basicResources/tourBasic/index.vue @@ -827,10 +827,13 @@ export default { }, /** 查询旅游场所基础信息列表 */ - getList() { + getList(val) { this.loading = true; - this.idType = "A01" - + if (val&&val!=''){ + this.idType = val + }else{ + this.idType = "A01" + } listTourBasic(this.queryParams).then(response => { this.tourBasicList = response.rows; this.total = response.total; diff --git a/ruoyi-ui/src/views/system/management/tourism-resources/emergencyInfo/emergency/index.vue b/ruoyi-ui/src/views/system/management/tourism-resources/emergencyInfo/emergency/index.vue index 3863e581..400cfc0d 100644 --- a/ruoyi-ui/src/views/system/management/tourism-resources/emergencyInfo/emergency/index.vue +++ b/ruoyi-ui/src/views/system/management/tourism-resources/emergencyInfo/emergency/index.vue @@ -469,10 +469,13 @@ export default { }, methods: { /** 查询应急场所基础信息 列表 */ - getList() { + getList(val) { this.loading = true; - this.idType = "E01" - + if (val&&val!=''){ + this.idType = val + }else{ + this.idType = "E01" + } listEmergency(this.queryParams).then(response => { this.emergencyList = response.rows; this.total = response.total; diff --git a/ruoyi-ui/src/views/system/management/tourism-resources/iotInfo/iot/index.vue b/ruoyi-ui/src/views/system/management/tourism-resources/iotInfo/iot/index.vue index f8bb800c..932d94d7 100644 --- a/ruoyi-ui/src/views/system/management/tourism-resources/iotInfo/iot/index.vue +++ b/ruoyi-ui/src/views/system/management/tourism-resources/iotInfo/iot/index.vue @@ -437,9 +437,13 @@ export default { }, methods: { /** 查询物联设备基础信息 列表 */ - getList() { + getList(val) { this.loading = true; - this.idType = "D01" + if (val&&val!=''){ + this.idType = val + }else{ + this.idType = "D01" + } listIot(this.queryParams).then(response => { this.iotList = response.rows; diff --git a/ruoyi-ui/src/views/system/management/tourism-resources/publicserviceInfo/publicservice/index.vue b/ruoyi-ui/src/views/system/management/tourism-resources/publicserviceInfo/publicservice/index.vue index a1f05230..158341a3 100644 --- a/ruoyi-ui/src/views/system/management/tourism-resources/publicserviceInfo/publicservice/index.vue +++ b/ruoyi-ui/src/views/system/management/tourism-resources/publicserviceInfo/publicservice/index.vue @@ -590,9 +590,14 @@ export default { }, methods: { /** 查询公共服务基础信息 列表 */ - getList() { + getList(val) { this.loading = true; - this.idType = "C01" + if (val&&val!=''){ + this.idType = val + }else{ + this.idType = "C01" + + } listPublicservice(this.queryParams).then(response => { this.publicserviceList = response.rows; diff --git a/ruoyi-ui/src/views/system/management/tourism-resources/touristInfo/tourist/index.vue b/ruoyi-ui/src/views/system/management/tourism-resources/touristInfo/tourist/index.vue index e124fb99..4ca7426c 100644 --- a/ruoyi-ui/src/views/system/management/tourism-resources/touristInfo/tourist/index.vue +++ b/ruoyi-ui/src/views/system/management/tourism-resources/touristInfo/tourist/index.vue @@ -581,9 +581,13 @@ export default { }, methods: { /** 查询游客服务基础信息 列表 */ - getList() { + getList(val) { this.loading = true; - this.idType = "F01" + if (val&&val!=''){ + this.idType = val + }else{ + this.idType = "F01" + } listTourist(this.queryParams).then(response => { this.touristList = response.rows; diff --git a/ruoyi-ui/src/views/system/management/tourism-resources/utils/resources.js b/ruoyi-ui/src/views/system/management/tourism-resources/utils/resources.js index e8b6c946..2937fe92 100644 --- a/ruoyi-ui/src/views/system/management/tourism-resources/utils/resources.js +++ b/ruoyi-ui/src/views/system/management/tourism-resources/utils/resources.js @@ -414,7 +414,7 @@ export default { this_.queryParams.type = val.id this_.type = val.id this_.typeName = val.label - this.getList() + this.getList(val.code) }, //省市县 getCustomersSource(el) { diff --git a/ruoyi-ui/src/views/system/management/tourism-resources/vehicleInfo/vehicle/index.vue b/ruoyi-ui/src/views/system/management/tourism-resources/vehicleInfo/vehicle/index.vue index 4284b2df..8b883802 100644 --- a/ruoyi-ui/src/views/system/management/tourism-resources/vehicleInfo/vehicle/index.vue +++ b/ruoyi-ui/src/views/system/management/tourism-resources/vehicleInfo/vehicle/index.vue @@ -431,9 +431,14 @@ export default { }, methods: { /** 查询车辆基础信息 列表 */ - getList() { + getList(val) { this.loading = true; - this.idType = "G01" + if (val&&val!=''){ + this.idType = val + }else{ + this.idType = "G01" + + } listVehicle(this.queryParams).then(response => { this.vehicleList = response.rows; diff --git a/ruoyi-ui/src/views/system/management/tourism-resources/venueInfo/venue/index.vue b/ruoyi-ui/src/views/system/management/tourism-resources/venueInfo/venue/index.vue index 3fcadd4d..89a6c33a 100644 --- a/ruoyi-ui/src/views/system/management/tourism-resources/venueInfo/venue/index.vue +++ b/ruoyi-ui/src/views/system/management/tourism-resources/venueInfo/venue/index.vue @@ -636,9 +636,13 @@ export default { }, methods: { /** 查询文化场馆基础信息 列表 */ - getList() { + getList(val) { this.loading = true; - this.idType = "B01" + if (val&&val!=''){ + this.idType = val + }else{ + this.idType = "B01" + } listVenue(this.queryParams).then(response => { this.venueList = response.rows; diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index b4b98279..810562e2 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://39.105.17.128:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2.023! - target: `http://localhost:8080/`,//用户名:admin 密码Cjy@123abc + target: `http://localhost:8080/`,//用户名:admin 密码CJYjqgk@2023! + // target: `http://39.105.17.128:8096/`,//用户名:cjyadmin/密码:CJYjqgk@2023! + // target: `http://192.168.130.102:8080/`,//用户名:admin 密码Cjy@123abc changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''