diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index d139e20..3f2aa60 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -94,11 +94,11 @@ limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } - }, - { - test: /\.js$/, - loader: '@open-wc/webpack-import-meta-loader' } + // { + // test: /\.js$/, + // loader: '@open-wc/webpack-import-meta-loader' + // } ] }, plugins: [new VueLoaderPlugin()], diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index d139e20..3f2aa60 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -94,11 +94,11 @@ limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } - }, - { - test: /\.js$/, - loader: '@open-wc/webpack-import-meta-loader' } + // { + // test: /\.js$/, + // loader: '@open-wc/webpack-import-meta-loader' + // } ] }, plugins: [new VueLoaderPlugin()], diff --git a/config/dev.env.js b/config/dev.env.js index e57df7d..36f7d4a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,9 +6,9 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - BASE_API: '"http://111.198.10.15:11409/smartwell"' + // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index d139e20..3f2aa60 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -94,11 +94,11 @@ limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } - }, - { - test: /\.js$/, - loader: '@open-wc/webpack-import-meta-loader' } + // { + // test: /\.js$/, + // loader: '@open-wc/webpack-import-meta-loader' + // } ] }, plugins: [new VueLoaderPlugin()], diff --git a/config/dev.env.js b/config/dev.env.js index e57df7d..36f7d4a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,9 +6,9 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - BASE_API: '"http://111.198.10.15:11409/smartwell"' + // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/package.json b/package.json index d3b9271..471cdb3 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "vuex": "3.0.1" }, "devDependencies": { - "@open-wc/webpack-import-meta-loader": "^0.4.7", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index d139e20..3f2aa60 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -94,11 +94,11 @@ limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } - }, - { - test: /\.js$/, - loader: '@open-wc/webpack-import-meta-loader' } + // { + // test: /\.js$/, + // loader: '@open-wc/webpack-import-meta-loader' + // } ] }, plugins: [new VueLoaderPlugin()], diff --git a/config/dev.env.js b/config/dev.env.js index e57df7d..36f7d4a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,9 +6,9 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - BASE_API: '"http://111.198.10.15:11409/smartwell"' + // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/package.json b/package.json index d3b9271..471cdb3 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "vuex": "3.0.1" }, "devDependencies": { - "@open-wc/webpack-import-meta-loader": "^0.4.7", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", diff --git a/src/api/area.js b/src/api/area.js index 974ce81..c5d88cf 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -39,6 +39,13 @@ params }) } +export function getDoorAreaTree(params) { + return request({ + url: 'device/getAreas', + method: 'get', + params + }) +} // 区域类型查询 export function getAreaType() { return request({ diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index d139e20..3f2aa60 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -94,11 +94,11 @@ limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } - }, - { - test: /\.js$/, - loader: '@open-wc/webpack-import-meta-loader' } + // { + // test: /\.js$/, + // loader: '@open-wc/webpack-import-meta-loader' + // } ] }, plugins: [new VueLoaderPlugin()], diff --git a/config/dev.env.js b/config/dev.env.js index e57df7d..36f7d4a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,9 +6,9 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - BASE_API: '"http://111.198.10.15:11409/smartwell"' + // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/package.json b/package.json index d3b9271..471cdb3 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "vuex": "3.0.1" }, "devDependencies": { - "@open-wc/webpack-import-meta-loader": "^0.4.7", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", diff --git a/src/api/area.js b/src/api/area.js index 974ce81..c5d88cf 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -39,6 +39,13 @@ params }) } +export function getDoorAreaTree(params) { + return request({ + url: 'device/getAreas', + method: 'get', + params + }) +} // 区域类型查询 export function getAreaType() { return request({ diff --git a/src/api/data.js b/src/api/data.js index db5c8d0..d1fdd27 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -18,6 +18,14 @@ params }) } +// 水表数据查询 +export function getWatchData(params) { + return request({ + url: 'waterMeterData/listPage', + method: 'get', + params + }) +} // 物位数据查询 export function getObjectData(params) { diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index d139e20..3f2aa60 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -94,11 +94,11 @@ limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } - }, - { - test: /\.js$/, - loader: '@open-wc/webpack-import-meta-loader' } + // { + // test: /\.js$/, + // loader: '@open-wc/webpack-import-meta-loader' + // } ] }, plugins: [new VueLoaderPlugin()], diff --git a/config/dev.env.js b/config/dev.env.js index e57df7d..36f7d4a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,9 +6,9 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - BASE_API: '"http://111.198.10.15:11409/smartwell"' + // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/package.json b/package.json index d3b9271..471cdb3 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "vuex": "3.0.1" }, "devDependencies": { - "@open-wc/webpack-import-meta-loader": "^0.4.7", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", diff --git a/src/api/area.js b/src/api/area.js index 974ce81..c5d88cf 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -39,6 +39,13 @@ params }) } +export function getDoorAreaTree(params) { + return request({ + url: 'device/getAreas', + method: 'get', + params + }) +} // 区域类型查询 export function getAreaType() { return request({ diff --git a/src/api/data.js b/src/api/data.js index db5c8d0..d1fdd27 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -18,6 +18,14 @@ params }) } +// 水表数据查询 +export function getWatchData(params) { + return request({ + url: 'waterMeterData/listPage', + method: 'get', + params + }) +} // 物位数据查询 export function getObjectData(params) { diff --git a/src/api/overview.js b/src/api/overview.js index 2e62e69..12d78c2 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -2,6 +2,20 @@ * 井总览模块接口 */ import request from '@/utils/request' + +// 首页 +export function getWatchStatistic() { + return request({ + url: 'waterStatistic/overview', + method: 'get' + }) +} +export function waterMeterCount() { + return request({ + url: 'waterMeterData/count', + method: 'get' + }) +} // 井查询 export function getWellList(params) { return request({ diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index d139e20..3f2aa60 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -94,11 +94,11 @@ limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } - }, - { - test: /\.js$/, - loader: '@open-wc/webpack-import-meta-loader' } + // { + // test: /\.js$/, + // loader: '@open-wc/webpack-import-meta-loader' + // } ] }, plugins: [new VueLoaderPlugin()], diff --git a/config/dev.env.js b/config/dev.env.js index e57df7d..36f7d4a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,9 +6,9 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - BASE_API: '"http://111.198.10.15:11409/smartwell"' + // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/package.json b/package.json index d3b9271..471cdb3 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "vuex": "3.0.1" }, "devDependencies": { - "@open-wc/webpack-import-meta-loader": "^0.4.7", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", diff --git a/src/api/area.js b/src/api/area.js index 974ce81..c5d88cf 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -39,6 +39,13 @@ params }) } +export function getDoorAreaTree(params) { + return request({ + url: 'device/getAreas', + method: 'get', + params + }) +} // 区域类型查询 export function getAreaType() { return request({ diff --git a/src/api/data.js b/src/api/data.js index db5c8d0..d1fdd27 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -18,6 +18,14 @@ params }) } +// 水表数据查询 +export function getWatchData(params) { + return request({ + url: 'waterMeterData/listPage', + method: 'get', + params + }) +} // 物位数据查询 export function getObjectData(params) { diff --git a/src/api/overview.js b/src/api/overview.js index 2e62e69..12d78c2 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -2,6 +2,20 @@ * 井总览模块接口 */ import request from '@/utils/request' + +// 首页 +export function getWatchStatistic() { + return request({ + url: 'waterStatistic/overview', + method: 'get' + }) +} +export function waterMeterCount() { + return request({ + url: 'waterMeterData/count', + method: 'get' + }) +} // 井查询 export function getWellList(params) { return request({ diff --git a/src/components/AreaSelect/areaSelectDialog.vue b/src/components/AreaSelect/areaSelectDialog.vue new file mode 100644 index 0000000..fb1cd4d --- /dev/null +++ b/src/components/AreaSelect/areaSelectDialog.vue @@ -0,0 +1,100 @@ + + + + + + + + diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index d139e20..3f2aa60 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -94,11 +94,11 @@ limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } - }, - { - test: /\.js$/, - loader: '@open-wc/webpack-import-meta-loader' } + // { + // test: /\.js$/, + // loader: '@open-wc/webpack-import-meta-loader' + // } ] }, plugins: [new VueLoaderPlugin()], diff --git a/config/dev.env.js b/config/dev.env.js index e57df7d..36f7d4a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,9 +6,9 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - BASE_API: '"http://111.198.10.15:11409/smartwell"' + // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/package.json b/package.json index d3b9271..471cdb3 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "vuex": "3.0.1" }, "devDependencies": { - "@open-wc/webpack-import-meta-loader": "^0.4.7", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", diff --git a/src/api/area.js b/src/api/area.js index 974ce81..c5d88cf 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -39,6 +39,13 @@ params }) } +export function getDoorAreaTree(params) { + return request({ + url: 'device/getAreas', + method: 'get', + params + }) +} // 区域类型查询 export function getAreaType() { return request({ diff --git a/src/api/data.js b/src/api/data.js index db5c8d0..d1fdd27 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -18,6 +18,14 @@ params }) } +// 水表数据查询 +export function getWatchData(params) { + return request({ + url: 'waterMeterData/listPage', + method: 'get', + params + }) +} // 物位数据查询 export function getObjectData(params) { diff --git a/src/api/overview.js b/src/api/overview.js index 2e62e69..12d78c2 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -2,6 +2,20 @@ * 井总览模块接口 */ import request from '@/utils/request' + +// 首页 +export function getWatchStatistic() { + return request({ + url: 'waterStatistic/overview', + method: 'get' + }) +} +export function waterMeterCount() { + return request({ + url: 'waterMeterData/count', + method: 'get' + }) +} // 井查询 export function getWellList(params) { return request({ diff --git a/src/components/AreaSelect/areaSelectDialog.vue b/src/components/AreaSelect/areaSelectDialog.vue new file mode 100644 index 0000000..fb1cd4d --- /dev/null +++ b/src/components/AreaSelect/areaSelectDialog.vue @@ -0,0 +1,100 @@ + + + + + + + + diff --git a/src/components/AreaSelect/areaSelectInput.vue b/src/components/AreaSelect/areaSelectInput.vue new file mode 100644 index 0000000..bdf5dcf --- /dev/null +++ b/src/components/AreaSelect/areaSelectInput.vue @@ -0,0 +1,59 @@ + + + + + + + + diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index d139e20..3f2aa60 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -94,11 +94,11 @@ limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } - }, - { - test: /\.js$/, - loader: '@open-wc/webpack-import-meta-loader' } + // { + // test: /\.js$/, + // loader: '@open-wc/webpack-import-meta-loader' + // } ] }, plugins: [new VueLoaderPlugin()], diff --git a/config/dev.env.js b/config/dev.env.js index e57df7d..36f7d4a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,9 +6,9 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - BASE_API: '"http://111.198.10.15:11409/smartwell"' + // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/package.json b/package.json index d3b9271..471cdb3 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "vuex": "3.0.1" }, "devDependencies": { - "@open-wc/webpack-import-meta-loader": "^0.4.7", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", diff --git a/src/api/area.js b/src/api/area.js index 974ce81..c5d88cf 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -39,6 +39,13 @@ params }) } +export function getDoorAreaTree(params) { + return request({ + url: 'device/getAreas', + method: 'get', + params + }) +} // 区域类型查询 export function getAreaType() { return request({ diff --git a/src/api/data.js b/src/api/data.js index db5c8d0..d1fdd27 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -18,6 +18,14 @@ params }) } +// 水表数据查询 +export function getWatchData(params) { + return request({ + url: 'waterMeterData/listPage', + method: 'get', + params + }) +} // 物位数据查询 export function getObjectData(params) { diff --git a/src/api/overview.js b/src/api/overview.js index 2e62e69..12d78c2 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -2,6 +2,20 @@ * 井总览模块接口 */ import request from '@/utils/request' + +// 首页 +export function getWatchStatistic() { + return request({ + url: 'waterStatistic/overview', + method: 'get' + }) +} +export function waterMeterCount() { + return request({ + url: 'waterMeterData/count', + method: 'get' + }) +} // 井查询 export function getWellList(params) { return request({ diff --git a/src/components/AreaSelect/areaSelectDialog.vue b/src/components/AreaSelect/areaSelectDialog.vue new file mode 100644 index 0000000..fb1cd4d --- /dev/null +++ b/src/components/AreaSelect/areaSelectDialog.vue @@ -0,0 +1,100 @@ + + + + + + + + diff --git a/src/components/AreaSelect/areaSelectInput.vue b/src/components/AreaSelect/areaSelectInput.vue new file mode 100644 index 0000000..bdf5dcf --- /dev/null +++ b/src/components/AreaSelect/areaSelectInput.vue @@ -0,0 +1,59 @@ + + + + + + + + diff --git a/src/components/AreaSelect/areaSelectTree.vue b/src/components/AreaSelect/areaSelectTree.vue new file mode 100644 index 0000000..c587fca --- /dev/null +++ b/src/components/AreaSelect/areaSelectTree.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index d139e20..3f2aa60 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -94,11 +94,11 @@ limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } - }, - { - test: /\.js$/, - loader: '@open-wc/webpack-import-meta-loader' } + // { + // test: /\.js$/, + // loader: '@open-wc/webpack-import-meta-loader' + // } ] }, plugins: [new VueLoaderPlugin()], diff --git a/config/dev.env.js b/config/dev.env.js index e57df7d..36f7d4a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,9 +6,9 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - BASE_API: '"http://111.198.10.15:11409/smartwell"' + // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/package.json b/package.json index d3b9271..471cdb3 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "vuex": "3.0.1" }, "devDependencies": { - "@open-wc/webpack-import-meta-loader": "^0.4.7", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", diff --git a/src/api/area.js b/src/api/area.js index 974ce81..c5d88cf 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -39,6 +39,13 @@ params }) } +export function getDoorAreaTree(params) { + return request({ + url: 'device/getAreas', + method: 'get', + params + }) +} // 区域类型查询 export function getAreaType() { return request({ diff --git a/src/api/data.js b/src/api/data.js index db5c8d0..d1fdd27 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -18,6 +18,14 @@ params }) } +// 水表数据查询 +export function getWatchData(params) { + return request({ + url: 'waterMeterData/listPage', + method: 'get', + params + }) +} // 物位数据查询 export function getObjectData(params) { diff --git a/src/api/overview.js b/src/api/overview.js index 2e62e69..12d78c2 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -2,6 +2,20 @@ * 井总览模块接口 */ import request from '@/utils/request' + +// 首页 +export function getWatchStatistic() { + return request({ + url: 'waterStatistic/overview', + method: 'get' + }) +} +export function waterMeterCount() { + return request({ + url: 'waterMeterData/count', + method: 'get' + }) +} // 井查询 export function getWellList(params) { return request({ diff --git a/src/components/AreaSelect/areaSelectDialog.vue b/src/components/AreaSelect/areaSelectDialog.vue new file mode 100644 index 0000000..fb1cd4d --- /dev/null +++ b/src/components/AreaSelect/areaSelectDialog.vue @@ -0,0 +1,100 @@ + + + + + + + + diff --git a/src/components/AreaSelect/areaSelectInput.vue b/src/components/AreaSelect/areaSelectInput.vue new file mode 100644 index 0000000..bdf5dcf --- /dev/null +++ b/src/components/AreaSelect/areaSelectInput.vue @@ -0,0 +1,59 @@ + + + + + + + + diff --git a/src/components/AreaSelect/areaSelectTree.vue b/src/components/AreaSelect/areaSelectTree.vue new file mode 100644 index 0000000..c587fca --- /dev/null +++ b/src/components/AreaSelect/areaSelectTree.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/components/AreaSelect/singleSelect.vue b/src/components/AreaSelect/singleSelect.vue new file mode 100644 index 0000000..ba15b20 --- /dev/null +++ b/src/components/AreaSelect/singleSelect.vue @@ -0,0 +1,278 @@ + + + + + + + diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index d139e20..3f2aa60 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -94,11 +94,11 @@ limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } - }, - { - test: /\.js$/, - loader: '@open-wc/webpack-import-meta-loader' } + // { + // test: /\.js$/, + // loader: '@open-wc/webpack-import-meta-loader' + // } ] }, plugins: [new VueLoaderPlugin()], diff --git a/config/dev.env.js b/config/dev.env.js index e57df7d..36f7d4a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,9 +6,9 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - BASE_API: '"http://111.198.10.15:11409/smartwell"' + // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/package.json b/package.json index d3b9271..471cdb3 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "vuex": "3.0.1" }, "devDependencies": { - "@open-wc/webpack-import-meta-loader": "^0.4.7", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", diff --git a/src/api/area.js b/src/api/area.js index 974ce81..c5d88cf 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -39,6 +39,13 @@ params }) } +export function getDoorAreaTree(params) { + return request({ + url: 'device/getAreas', + method: 'get', + params + }) +} // 区域类型查询 export function getAreaType() { return request({ diff --git a/src/api/data.js b/src/api/data.js index db5c8d0..d1fdd27 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -18,6 +18,14 @@ params }) } +// 水表数据查询 +export function getWatchData(params) { + return request({ + url: 'waterMeterData/listPage', + method: 'get', + params + }) +} // 物位数据查询 export function getObjectData(params) { diff --git a/src/api/overview.js b/src/api/overview.js index 2e62e69..12d78c2 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -2,6 +2,20 @@ * 井总览模块接口 */ import request from '@/utils/request' + +// 首页 +export function getWatchStatistic() { + return request({ + url: 'waterStatistic/overview', + method: 'get' + }) +} +export function waterMeterCount() { + return request({ + url: 'waterMeterData/count', + method: 'get' + }) +} // 井查询 export function getWellList(params) { return request({ diff --git a/src/components/AreaSelect/areaSelectDialog.vue b/src/components/AreaSelect/areaSelectDialog.vue new file mode 100644 index 0000000..fb1cd4d --- /dev/null +++ b/src/components/AreaSelect/areaSelectDialog.vue @@ -0,0 +1,100 @@ + + + + + + + + diff --git a/src/components/AreaSelect/areaSelectInput.vue b/src/components/AreaSelect/areaSelectInput.vue new file mode 100644 index 0000000..bdf5dcf --- /dev/null +++ b/src/components/AreaSelect/areaSelectInput.vue @@ -0,0 +1,59 @@ + + + + + + + + diff --git a/src/components/AreaSelect/areaSelectTree.vue b/src/components/AreaSelect/areaSelectTree.vue new file mode 100644 index 0000000..c587fca --- /dev/null +++ b/src/components/AreaSelect/areaSelectTree.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/components/AreaSelect/singleSelect.vue b/src/components/AreaSelect/singleSelect.vue new file mode 100644 index 0000000..ba15b20 --- /dev/null +++ b/src/components/AreaSelect/singleSelect.vue @@ -0,0 +1,278 @@ + + + + + + + diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue new file mode 100644 index 0000000..d70262c --- /dev/null +++ b/src/components/BigData/Card1/index.vue @@ -0,0 +1,109 @@ + + + + + diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js index d139e20..3f2aa60 100644 --- a/build/webpack.base.conf.js +++ b/build/webpack.base.conf.js @@ -94,11 +94,11 @@ limit: 10000, name: utils.assetsPath('fonts/[name].[hash:7].[ext]') } - }, - { - test: /\.js$/, - loader: '@open-wc/webpack-import-meta-loader' } + // { + // test: /\.js$/, + // loader: '@open-wc/webpack-import-meta-loader' + // } ] }, plugins: [new VueLoaderPlugin()], diff --git a/config/dev.env.js b/config/dev.env.js index e57df7d..36f7d4a 100644 --- a/config/dev.env.js +++ b/config/dev.env.js @@ -6,9 +6,9 @@ // 将两个配置对象合并，最终结果是 NODE_ENV：‘"development"' module.exports = merge(prodEnv, { NODE_ENV: '"development"', - // BASE_API: '"http://42.81.160.165:2022/smartwell"' // BASE_API: '"http://111.198.10.15:11304"' // BASE_API: '"http://111.198.10.15:11643"' - BASE_API: '"http://111.198.10.15:11409/smartwell"' + // BASE_API: '"http://111.198.10.15:11409/smartwell"' //可以用 + BASE_API: '"http://192.168.43.66:11643/smartwell"' //彭先洪 }) diff --git a/package.json b/package.json index d3b9271..471cdb3 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "vuex": "3.0.1" }, "devDependencies": { - "@open-wc/webpack-import-meta-loader": "^0.4.7", "autoprefixer": "8.5.0", "babel-core": "6.26.0", "babel-eslint": "8.2.6", diff --git a/src/api/area.js b/src/api/area.js index 974ce81..c5d88cf 100644 --- a/src/api/area.js +++ b/src/api/area.js @@ -39,6 +39,13 @@ params }) } +export function getDoorAreaTree(params) { + return request({ + url: 'device/getAreas', + method: 'get', + params + }) +} // 区域类型查询 export function getAreaType() { return request({ diff --git a/src/api/data.js b/src/api/data.js index db5c8d0..d1fdd27 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -18,6 +18,14 @@ params }) } +// 水表数据查询 +export function getWatchData(params) { + return request({ + url: 'waterMeterData/listPage', + method: 'get', + params + }) +} // 物位数据查询 export function getObjectData(params) { diff --git a/src/api/overview.js b/src/api/overview.js index 2e62e69..12d78c2 100644 --- a/src/api/overview.js +++ b/src/api/overview.js @@ -2,6 +2,20 @@ * 井总览模块接口 */ import request from '@/utils/request' + +// 首页 +export function getWatchStatistic() { + return request({ + url: 'waterStatistic/overview', + method: 'get' + }) +} +export function waterMeterCount() { + return request({ + url: 'waterMeterData/count', + method: 'get' + }) +} // 井查询 export function getWellList(params) { return request({ diff --git a/src/components/AreaSelect/areaSelectDialog.vue b/src/components/AreaSelect/areaSelectDialog.vue new file mode 100644 index 0000000..fb1cd4d --- /dev/null +++ b/src/components/AreaSelect/areaSelectDialog.vue @@ -0,0 +1,100 @@ + + + + + + + + diff --git a/src/components/AreaSelect/areaSelectInput.vue b/src/components/AreaSelect/areaSelectInput.vue new file mode 100644 index 0000000..bdf5dcf --- /dev/null +++ b/src/components/AreaSelect/areaSelectInput.vue @@ -0,0 +1,59 @@ + + + + + + + + diff --git a/src/components/AreaSelect/areaSelectTree.vue b/src/components/AreaSelect/areaSelectTree.vue new file mode 100644 index 0000000..c587fca --- /dev/null +++ b/src/components/AreaSelect/areaSelectTree.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/components/AreaSelect/singleSelect.vue b/src/components/AreaSelect/singleSelect.vue new file mode 100644 index 0000000..ba15b20 --- /dev/null +++ b/src/components/AreaSelect/singleSelect.vue @@ -0,0 +1,278 @@ + + + + + + + diff --git a/src/components/BigData/Card1/index.vue b/src/components/BigData/Card1/index.vue new file mode 100644 index 0000000..d70262c --- /dev/null +++ b/src/components/BigData/Card1/index.vue @@ -0,0 +1,109 @@ + + + + + diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue index 1acabef..2bd7a1b 100644 --- a/src/components/DeptSelect/index.vue +++ b/src/components/DeptSelect/index.vue @@ -1,7 +1,7 @@