mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-20 15:19:52 +08:00
update 站点列表页面添加运营商搜索
This commit is contained in:
@@ -334,6 +334,9 @@
|
|||||||
<if test="stationDTO.publicFlag != null and stationDTO.publicFlag != ''">
|
<if test="stationDTO.publicFlag != null and stationDTO.publicFlag != ''">
|
||||||
and t1.public_flag = #{stationDTO.publicFlag,jdbcType=VARCHAR}
|
and t1.public_flag = #{stationDTO.publicFlag,jdbcType=VARCHAR}
|
||||||
</if>
|
</if>
|
||||||
|
<if test="stationDTO.merchantId != null and stationDTO.merchantId != ''">
|
||||||
|
and t1.merchant_id = #{stationDTO.merchantId,jdbcType=VARCHAR}
|
||||||
|
</if>
|
||||||
<!-- 数据范围过滤 -->
|
<!-- 数据范围过滤 -->
|
||||||
<if test="stationDTO.merchantDeptIds != null and stationDTO.merchantDeptIds.size() != 0">
|
<if test="stationDTO.merchantDeptIds != null and stationDTO.merchantDeptIds.size() != 0">
|
||||||
and t3.dept_id in
|
and t3.dept_id in
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -35,9 +35,9 @@ module.exports = {
|
|||||||
proxy: {
|
proxy: {
|
||||||
// detail: https://cli.vuejs.org/config/#devserver-proxy
|
// detail: https://cli.vuejs.org/config/#devserver-proxy
|
||||||
[process.env.VUE_APP_BASE_API]: {
|
[process.env.VUE_APP_BASE_API]: {
|
||||||
// target: `http://localhost:8080`,
|
target: `http://localhost:8080`,
|
||||||
// 更改代理为本地地址
|
// 更改代理为本地地址
|
||||||
target: `http://192.168.2.6:8080`,
|
// target: `http://192.168.2.6:8080`,
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
pathRewrite: {
|
pathRewrite: {
|
||||||
["^" + process.env.VUE_APP_BASE_API]: "",
|
["^" + process.env.VUE_APP_BASE_API]: "",
|
||||||
|
|||||||
Reference in New Issue
Block a user