suzhou-jichuang-lanhai
/
suzhouyingjiPC
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/suzhouyingjiPC into dhy

Browse Source
dhy
杜函宇 1 year ago
parent 58044d23ab d4c37c7945
commit 0fd34fcaf4
5 changed files with 64 additions and 31 deletions
Show Stats Download Patch File Download Diff File

7
.env.development
Unescape View File

@ -2,7 +2,7 @@
# @Author: 张涛
# @Date: 2023-07-18 13:04:50
# @LastEditors: JC9527
# @LastEditTime: 2023-10-07 16:09:34
# @LastEditTime: 2023-10-10 15:17:22
# @FilePath: \Mudu2PC\.env.development
###
# 页面标题
@ -12,8 +12,9 @@ VUE_APP_TITLE = 苏州应急执法计划管理系统
ENV = 'development'
# 苏州应急执法计划管理系统/开发环境
VUE_APP_BASE_API = 'http://39.101.188.84:9033'
# VUE_APP_BASE_API = 'http://180.108.205.123:13002'
# VUE_APP_BASE_API = 'http://39.101.188.84:9033'
# VUE_APP_BASE_API = 'http://192.168.0.105:9033'
VUE_APP_BASE_API = 'http://180.108.205.123:13002'
# VUE_APP_BASE_API = '/api'

3
src/permission.js
Unescape View File

@ -96,7 +96,8 @@ router.beforeEach((to, from, next) => {
next(`/login`) // 否则全部重定向到登录页
} else {
console.log('路由拦截跳转登录页')
next()
// next()
location.href = 'http://180.108.205.123:8090/sso-server/oauth2/login?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F'
}
NProgress.done()
}

26
src/views/components/dialog/index.vue
Unescape View File

@ -161,7 +161,7 @@
header-align="center"
>
<template slot-scope="scope">
<span>{{ componendDistrict("0" + scope.row.subdistrict) || '/' }}</span>
<span>{{ componendDistrict(scope.row.subdistrict) || '/' }}</span>
</template>
</el-table-column>
<el-table-column
@ -450,7 +450,7 @@ export default {
})
}
})
console.log(name)
// console.log(name)
return name
},
// 匹配重大危险源等级
@ -483,20 +483,20 @@ export default {
// console.log('123')
if(Array.isArray(this.form.subdistrict)){
if(this.form.subdistrict.length == 2) {
this.subdistrict = this.form.subdistrict[1].slice(1, 11);
this.subdistrict = this.form.subdistrict[1].slice(0, 10);
obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
} else if(this.form.subdistrict.length == 1) {
this.subdistrict = this.form.subdistrict[0].slice(1, 8);
this.subdistrict = this.form.subdistrict[0].slice(0, 7);
obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
} else {
obj = {...this.pages,...this.form}
}
} else {
if(this.county){
let subdistrict = this.form.subdistrict.slice(1, 8);
let subdistrict = this.form.subdistrict.slice(0, 7);
obj = { ...this.pages, ...this.form,subdistrict };
} else {
let subdistrict = this.form.subdistrict.slice(1, 8);
let subdistrict = this.form.subdistrict.slice(0, 7);
obj = { ...this.pages, ...this.form,subdistrict };
}
}
@ -506,7 +506,7 @@ export default {
// this.subdistrict = this.form.subdistrict.slice(1, 8);
// obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
// } else if(this.dept.ancestors.split(',').length == 3){
this.subdistrict = this.form.subdistrict.slice(1, 11);
this.subdistrict = this.form.subdistrict.slice(0, 10);
obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
// }
}
@ -540,9 +540,9 @@ export default {
this.$refs.mypagination.defaultPages();
// let obj = {...this.pages,...this.form}
if(this.dept.ancestors.split(',').length == 2){
this.subdistrict = this.workingArea.slice(1, 8);
this.subdistrict = this.workingArea.slice(0, 7);
} else if(this.dept.ancestors.split(',').length == 3){
this.subdistrict = this.form.subdistrict.slice(1, 11);
this.subdistrict = this.form.subdistrict.slice(0, 10);
}
this.getTable({...this.pages,...this.form,subdistrict:this.subdistrict});
},
@ -680,13 +680,13 @@ export default {
if(this.dept.ancestors.split(',').length == 2){
if(Array.isArray(this.form.subdistrict)) {
if(this.form.subdistrict.length == 2) {
this.subdistrict = this.form.subdistrict[1].slice(1, 11);
this.subdistrict = this.form.subdistrict[1].slice(0, 10);
}
} else {
this.subdistrict = this.form.subdistrict.slice(1, 8);
this.subdistrict = this.form.subdistrict.slice(0, 7);
}
} else if(this.dept.ancestors.split(',').length == 3){
this.subdistrict = this.form.subdistrict.slice(1, 11);
this.subdistrict = this.form.subdistrict.slice(0, 10);
}
// console.log(this.subdistrict,'this.subdistrict')
// console.log(this.form,'this.form')
@ -831,7 +831,7 @@ export default {
})
this.listOne.map((item)=>{
if(item.institutionName == dept.deptName) {
console.log(item.county)
// console.log(item.county)
this.form.subdistrict = item.county
this.workingArea = item.county
this.county = true;

2
src/views/yingji/enterprise.vue
Unescape View File

@ -117,7 +117,7 @@
header-align="center"
>
<template slot-scope="scope">
<span>{{ componendDistrict(scope.row.subdistrict) }}</span>
<span>{{ componendDistrict(scope.row.subdistrict) || '/' }}</span>
</template>
</el-table-column>
<el-table-column

57
src/views/yingji/planManage.vue
Unescape View File

@ -4,7 +4,7 @@
* @Author: JC9527
* @Date: 2023-09-04 10:20:06
* @LastEditors: JC9527
* @LastEditTime: 2023-10-09 09:48:01
* @LastEditTime: 2023-10-10 10:08:28
-->
<template>
<div class="plan-management">
@ -57,13 +57,13 @@
row-key="id"
:row-class-name="tableRowClassName"
>
<el-table-column
<!-- <el-table-column
type="selection"
reserve-selection
width="55"
header-align="center"
>
</el-table-column>
</el-table-column> -->
<el-table-column
prop="plannedYear"
label="计划年月"
@ -137,8 +137,8 @@
:default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
<el-table-column prop="district" label="行政区划" header-align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="amount" label="企业总数" header-align="center"></el-table-column>
<el-table-column prop="district" label="行政区划" header-align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="amount" label="企业总数" header-align="center"></el-table-column>
<el-table-column prop="planNumb" label="已计划数" header-align="center"></el-table-column>
<el-table-column prop="keyCount" label="已计划省重点数" header-align="center"></el-table-column>
<el-table-column prop="keyCount" label="剩余重点数" header-align="center"></el-table-column>
@ -246,7 +246,8 @@
isExpandAll: true,
// 重新渲染表格状态
refreshTable: true,
county:false
county:false,
multipleSelection:[],
}
},
computed: {
@ -267,7 +268,7 @@
if(!this.disabled) {
if(Array.isArray(newForm.district)){
if(newForm.district.length == 2) {
let district = this.form.district[1].slice(1, 11);
let district = this.form.district[1].slice(0, 11);
obj = { ...this.pages, ...this.form,district };
} else if(newForm.district.length == 1) {
let district = this.form.district[0].slice(0, 8);
@ -282,7 +283,7 @@
let district = this.form.district.slice(0, 8);
obj = { ...this.pages, ...this.form,district };
} else {
let district = this.form.district.slice(1, 11);
let district = this.form.district.slice(0, 11);
obj = { ...this.pages, ...this.form,district };
}
}
@ -325,8 +326,26 @@
// 页码，当前页切换事件
pagesChange(pages){
// console.log('123123页码发生变化')
this.getList(pages)
this.pages = pages
let district
if(this.dept.ancestors.split(',').length == 2){
if(Array.isArray(this.form.district)) {
if(this.form.district.length == 2) {
district = this.form.district[1].slice(0, 11);
}
} else {
district = this.form.district.slice(0, 8);
}
} else if(this.dept.ancestors.split(',').length == 3){
district = this.form.district[1].slice(0, 11);
} else {
if(this.form.district.length == 2) {
district = this.form.district[1].slice(0, 11);
} else {
district = this.form.district[0].slice(0, 8);
}
}
this.getList({...pages,...this.form,district:district})
},
// 选中的数据
handleSelectionChange(val) {
@ -335,6 +354,18 @@
},
// 导出
exportFile(){
// let arr = []
// this.multipleSelection.map((item)=>{
// arr.push(item.enterpriseId)
// })
// this.download(
// "/pharmaceuticals/bPlanEnterprise/exportplan",
// {
// enterpriseId:arr.join(',')
// },
// `计划管理.xlsx`
// );
// this.multipleSelection.length > 0 ? `确认导出选中的数据吗？` :
this.$confirm(`确认根据您的搜索条件导出搜索之后的数据吗?`, "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@ -396,10 +427,10 @@
if(!this.disabled) {
if(Array.isArray(this.form.district)){
if(this.form.district.length == 2) {
let district = this.form.district[1].slice(1, 11);
let district = this.form.district[1].slice(0, 11);
obj = { ...this.pages, ...this.form,district };
} else if(this.form.district.length == 1) {
let district = this.form.district[0].slice(1, 8);
let district = this.form.district[0].slice(0, 8);
obj = { ...this.pages, ...this.form,district };
} else {
obj = { ...this.pages, ...this.form};
@ -408,10 +439,10 @@
} else {
// 判断是区县
if(this.county){
let district = this.form.district.slice(1, 8);
let district = this.form.district.slice(0, 8);
obj = { ...this.pages, ...this.form,district };
} else {
let district = this.form.district.slice(1, 11);
let district = this.form.district.slice(0, 11);
obj = { ...this.pages, ...this.form,district };
}
}

Write Preview
Loading…
Cancel
Save