Browse Source

Merge branch 'release-sy-v1.0.0' into 'dev'

fix: 修复Bug

See merge request project/water/shuili-vue!32
master_tdsql
潘裕艺 1 year ago
parent
commit
fac5ebf905
  1. 2
      src/api/dike/index.js
  2. 9
      src/api/sluice/index.js
  3. 4
      src/views/aiSupervision/fourPredictions/index.vue
  4. 4
      src/views/aiSupervision/layerManage/index.vue
  5. 4
      src/views/aiSupervision/waterSetting/index.vue
  6. 32
      src/views/dike/runManage/enginerring/patrolRouteSettings/index.vue
  7. 22
      src/views/dike/runManage/maintenance/maintenanceManage/index.vue
  8. 11
      src/views/dike/runManage/maintenance/maintenancePlan/index.vue
  9. 15
      src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
  10. 11
      src/views/dike/runManage/pestAnimalControl/controlManage/index.vue
  11. 11
      src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue
  12. 11
      src/views/dike/runManage/pestAnimalControl/planManagement/index.vue
  13. 11
      src/views/dike/runManage/superVisionInspetion/methodsManage/index.vue
  14. 11
      src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
  15. 118
      vue.config.js

2
src/api/dike/index.js

@ -29,7 +29,7 @@ export function getDikeYhPlanList(data) {
}
// 修改维养记录状态
export function updateDikeYhRecordStatus(data) {
export function updateYhRecordStatus(data) {
return request({
url: `/run/df/yh/record/status`,
method: 'put',

9
src/api/sluice/index.js

@ -104,6 +104,15 @@ export function getSluiceYhRecordDetails(id) {
})
}
// 修改维养记录状态
export function updateYhRecordStatus(data) {
return request({
url: `/run/sz/yh/record/status`,
method: 'put',
data
})
}
// 巡查记录-巡查记录详情
export function getSluicePatrolDetails(id) {
return request({

4
src/views/aiSupervision/fourPredictions/index.vue

@ -1,7 +1,5 @@
<template>
<Layout>
<router-view />
</Layout>
<Layout> </Layout>
</template>
<script>

4
src/views/aiSupervision/layerManage/index.vue

@ -1,7 +1,5 @@
<template>
<Layout>
<router-view />
</Layout>
<Layout> </Layout>
</template>
<script>

4
src/views/aiSupervision/waterSetting/index.vue

@ -1,7 +1,5 @@
<template>
<Layout>
<router-view />
</Layout>
<Layout> </Layout>
</template>
<script>

32
src/views/dike/runManage/enginerring/patrolRouteSettings/index.vue

@ -1,31 +1,31 @@
<!-- 巡查路线设置-堤防 -->
<script>
import GaoDeMap from "../components/GaoDeMap.vue"
import GaoDeMap from "../components/GaoDeMap.vue";
export default {
name: '',
name: "",
components: {
GaoDeMap
GaoDeMap,
},
data() {
return {
selectTab: 'first'
}
},
methods: {
selectTab: "first",
};
},
created(){
}
}
methods: {},
created() {},
};
</script>
<template>
<div class="slider-right">
<div class="top-title">
<el-button class="back-btn" size="mini" @click="
$router.go(-1);" icon="el-icon-back" />
{{ $route.query.name || '基础信息管理' }}
<el-button
class="back-btn"
size="mini"
@click="$router.go(-1)"
icon="el-icon-back"
/>
{{ $route.query.name || "基础信息管理" }}
</div>
<div class="map-box">
<el-tabs v-model="selectTab" class="tab">
@ -85,4 +85,4 @@ export default {
}
}
}
</style>
</style>

22
src/views/dike/runManage/maintenance/maintenanceManage/index.vue

@ -77,7 +77,8 @@
:page-sizes="pageData.pageSizes"
layout="total, prev, pager, next, sizes, jumper"
:total="pageData.total"
@size-change="getTableData()"
@current-change="(e) => handleCurrentPageChange(e)"
@size-change="(e) => handlePageSizeChange(e)"
>
</el-pagination>
</div>
@ -112,16 +113,7 @@ export default {
value: "",
},
], //
tableData: [
{
id: 1,
dikeName: "北江大堤",
dikeCode: "BHA100000001",
engineeringManagementUnit: "北江流域局",
waterAdministrativeDepartment: "北江流域局",
updateTime: "2023-9-5 10:00:00",
},
],
tableData: [],
};
},
created() {
@ -136,6 +128,14 @@ export default {
this.getTableData();
},
methods: {
handleCurrentPageChange(page) {
this.pageData.pageNum = page;
this.getTableData();
},
handlePageSizeChange(pageSize) {
this.pageData.pageSize = pageSize;
this.getTableData();
},
//
getTableData() {
getDikeYhProjectList({

11
src/views/dike/runManage/maintenance/maintenancePlan/index.vue

@ -108,6 +108,14 @@ export default {
},
},
methods: {
handleCurrentPageChange(page) {
this.pageData.pageNum = page;
this.getTableData();
},
handlePageSizeChange(pageSize) {
this.pageData.pageSize = pageSize;
this.getTableData();
},
//
deleteTableItem(row) {
deleteDFMaintenancePlan(row.id).then((res) => {
@ -375,7 +383,8 @@ export default {
:page-sizes="pageData.pageSizes"
layout="total, prev, pager, next, sizes, jumper"
:total="pageData.total"
@size-change="getTableData()"
@current-change="(e) => handleCurrentPageChange(e)"
@size-change="(e) => handlePageSizeChange(e)"
>
</el-pagination>
</div>

15
src/views/dike/runManage/maintenance/maintenanceRecords/index.vue

@ -11,7 +11,7 @@ import {
listUser,
} from "@/api/management";
import { getDikeYhRecordList, updateDikeYhRecordStatus } from "@/api/dike";
import { getDikeYhRecordList, updateYhRecordStatus } from "@/api/dike";
export default {
name: "InspectionItems",
data() {
@ -79,6 +79,14 @@ export default {
},
},
methods: {
handleCurrentPageChange(page) {
this.pageData.pageNum = page;
this.getTableData();
},
handlePageSizeChange(pageSize) {
this.pageData.pageSize = pageSize;
this.getTableData();
},
//
deleteTableItem(row) {
deleteDFMaintenanceRecords(row.id).then((res) => {
@ -135,7 +143,7 @@ export default {
},
//
confirmPlanDetails(row) {
updateDikeYhRecordStatus({
updateYhRecordStatus({
id: row.id,
status: "1",
}).then(() => {
@ -470,7 +478,8 @@ export default {
:page-sizes="pageData.pageSizes"
layout="total, prev, pager, next, sizes, jumper"
:total="pageData.total"
@size-change="getTableData()"
@current-change="(e) => handleCurrentPageChange(e)"
@size-change="(e) => handlePageSizeChange(e)"
>
</el-pagination>
</div>

11
src/views/dike/runManage/pestAnimalControl/controlManage/index.vue

@ -70,7 +70,8 @@
:page-sizes="pageData.pageSizes"
layout="total, prev, pager, next, sizes, jumper"
:total="pageData.total"
@size-change="getTableData()"
@current-change="(e) => handleCurrentPageChange(e)"
@size-change="(e) => handlePageSizeChange(e)"
>
</el-pagination>
</div>
@ -232,6 +233,14 @@ export default {
this.getTableData();
},
methods: {
handleCurrentPageChange(page) {
this.pageData.pageNum = page;
this.getTableData();
},
handlePageSizeChange(pageSize) {
this.pageData.pageSize = pageSize;
this.getTableData();
},
//
getTableData() {
getDikeAnimalProList({

11
src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue

@ -114,6 +114,14 @@ export default {
},
},
methods: {
handleCurrentPageChange(page) {
this.pageData.pageNum = page;
this.getTableData();
},
handlePageSizeChange(pageSize) {
this.pageData.pageSize = pageSize;
this.getTableData();
},
//
deleteTableItem(row) {
deleteDikeAnimalRecordDetails(row.id).then(() => {
@ -484,7 +492,8 @@ export default {
:page-sizes="pageData.pageSizes"
layout="total, prev, pager, next, sizes, jumper"
:total="pageData.total"
@size-change="getTableData()"
@current-change="(e) => handleCurrentPageChange(e)"
@size-change="(e) => handlePageSizeChange(e)"
>
</el-pagination>
</div>

11
src/views/dike/runManage/pestAnimalControl/planManagement/index.vue

@ -101,6 +101,14 @@ export default {
},
},
methods: {
handleCurrentPageChange(page) {
this.pageData.pageNum = page;
this.getTableData();
},
handlePageSizeChange(pageSize) {
this.pageData.pageSize = pageSize;
this.getTableData();
},
//
resolveDikeGrad(dikeGrad) {
return (
@ -456,7 +464,8 @@ export default {
:page-sizes="pageData.pageSizes"
layout="total, prev, pager, next, sizes, jumper"
:total="pageData.total"
@size-change="getTableData()"
@current-change="(e) => handleCurrentPageChange(e)"
@size-change="(e) => handlePageSizeChange(e)"
>
</el-pagination>
</div>

11
src/views/dike/runManage/superVisionInspetion/methodsManage/index.vue

@ -102,6 +102,14 @@ export default {
},
},
methods: {
handleCurrentPageChange(page) {
this.pageData.pageNum = page;
this.getTableData();
},
handlePageSizeChange(pageSize) {
this.pageData.pageSize = pageSize;
this.getTableData();
},
//
resolveDikeGrad(dikeGrad) {
return (
@ -295,7 +303,8 @@ export default {
:page-sizes="pageData.pageSizes"
layout="total, prev, pager, next, sizes, jumper"
:total="pageData.total"
@size-change="getTableData()"
@current-change="(e) => handleCurrentPageChange(e)"
@size-change="(e) => handlePageSizeChange(e)"
>
</el-pagination>
</div>

11
src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue

@ -10,6 +10,7 @@ import {
putSluiceYhRecord,
deleteSluiceYhRecord,
getSluiceYhPlanDetails,
updateYhRecordStatus,
} from "@/api/sluice";
export default {
name: "maintenanceRecords",
@ -132,7 +133,15 @@ export default {
});
},
//
confirmPlanDetails(row) {},
confirmPlanDetails(row) {
updateYhRecordStatus({
id: row.id,
status: "1",
}).then(() => {
this.getTableData();
this.$message.success("确认成功");
});
},
resetForm() {
this.$refs.ruleForm.resetFields();
this.dialogVisible = false;

118
vue.config.js

@ -1,15 +1,15 @@
'use strict'
const path = require('path')
const defaultSettings = require('./src/settings.js')
'use strict';
const path = require('path');
const defaultSettings = require('./src/settings.js');
// const httpConfig = require('./public/config')
const webpack = require("webpack")
const webpack = require('webpack');
function resolve(dir) {
return path.join(__dirname, dir)
return path.join(__dirname, dir);
}
const name = defaultSettings.title || '广东省水工程运行管理系统' // 标题
const name = defaultSettings.title || '广东省水工程运行管理系统'; // 标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口
const port = process.env.port || process.env.npm_config_port || 80; // 端口
// vue.config.js 配置说明
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@ -18,7 +18,7 @@ module.exports = {
// 部署生产环境和开发环境下的URL。
// 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。
publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
// 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist)
outputDir: 'dist',
// 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)
@ -44,7 +44,7 @@ module.exports = {
// }
// },
[process.env.VUE_APP_BASE_API]: {
target: "http://shuili-admin.product.dev.com:30115",
target: 'http://shuili-admin.product.dev.com:30115',
// target: "http://127.0.0.1:18082",
changeOrigin: true,
pathRewrite: {
@ -61,25 +61,23 @@ module.exports = {
'@': resolve('src')
}
},
devtool: 'source-map',
plugins: [
new webpack.ProvidePlugin({
$: "jquery",
jQuery: "jquery",
"window.jQuery": "jquery",
"window.$": "jquery",
Popper: ["popper.js", "default"]
$: 'jquery',
jQuery: 'jquery',
'window.jQuery': 'jquery',
'window.$': 'jquery',
Popper: ['popper.js', 'default']
})
]
},
chainWebpack(config) {
config.plugins.delete('preload') // TODO: need test
config.plugins.delete('prefetch') // TODO: need test
config.plugins.delete('preload'); // TODO: need test
config.plugins.delete('prefetch'); // TODO: need test
// set svg-sprite-loader
config.module
.rule('svg')
.exclude.add(resolve('src/assets/icons'))
.end()
config.module.rule('svg').exclude.add(resolve('src/assets/icons')).end();
config.module
.rule('icons')
.test(/\.svg$/)
@ -90,49 +88,47 @@ module.exports = {
.options({
symbolId: 'icon-[name]'
})
.end()
.end();
config
.when(process.env.NODE_ENV !== 'development',
config => {
config
.plugin('ScriptExtHtmlWebpackPlugin')
.after('html')
.use('script-ext-html-webpack-plugin', [{
// `runtime` must same as runtimeChunk name. default is `runtime`
inline: /runtime\..*\.js$/
}])
.end()
config
.optimization.splitChunks({
chunks: 'all',
cacheGroups: {
libs: {
name: 'chunk-libs',
test: /[\\/]node_modules[\\/]/,
priority: 10,
chunks: 'initial' // only package third parties that are initially dependent
},
elementUI: {
name: 'chunk-elementUI', // split elementUI into a single package
priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
},
commons: {
name: 'chunk-commons',
test: resolve('src/components'), // can customize your rules
minChunks: 3, // minimum common number
priority: 5,
reuseExistingChunk: true
}
}
})
config.optimization.runtimeChunk('single'),
config.when(process.env.NODE_ENV !== 'development', (config) => {
config
.plugin('ScriptExtHtmlWebpackPlugin')
.after('html')
.use('script-ext-html-webpack-plugin', [
{
from: path.resolve(__dirname, './public/robots.txt'),//防爬虫文件
to: './',//到根目录下
// `runtime` must same as runtimeChunk name. default is `runtime`
inline: /runtime\..*\.js$/
}
])
.end();
config.optimization.splitChunks({
chunks: 'all',
cacheGroups: {
libs: {
name: 'chunk-libs',
test: /[\\/]node_modules[\\/]/,
priority: 10,
chunks: 'initial' // only package third parties that are initially dependent
},
elementUI: {
name: 'chunk-elementUI', // split elementUI into a single package
priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
},
commons: {
name: 'chunk-commons',
test: resolve('src/components'), // can customize your rules
minChunks: 3, // minimum common number
priority: 5,
reuseExistingChunk: true
}
}
)
});
config.optimization.runtimeChunk('single'),
{
from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
to: './' //到根目录下
};
});
}
}
};

Loading…
Cancel
Save