diff --git a/.env.production b/.env.production index 0b3c40b..bdead2a 100644 --- a/.env.production +++ b/.env.production @@ -6,5 +6,5 @@ ENV = 'production' # 苏州应急执法计划管理系统/生产环境 # VUE_APP_BASE_API = 'http://192.168.0.105:9033' -VUE_APP_BASE_API = 'http://39.101.188.84:9033/pharmaceuticals' +VUE_APP_BASE_API = 'http://39.101.188.84:9033' diff --git a/src/api/yingji/keyEnterprise.js b/src/api/yingji/keyEnterprise.js index b7c39ae..8c4648c 100644 --- a/src/api/yingji/keyEnterprise.js +++ b/src/api/yingji/keyEnterprise.js @@ -59,7 +59,7 @@ export function businessList(data) { params: data }) } -//查询单条企业信息执法详情 +//查询执法列表 export function enforcingDetail(data) { return request({ url: `/pharmaceuticals/bPlanEnterprise/getZhifa`, @@ -68,6 +68,7 @@ export function enforcingDetail(data) { }) } + // 根据字段查询字典信息 export function listDist(query) { return request({ diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue index 407be9f..4194247 100644 --- a/src/layout/newyjLayout.vue +++ b/src/layout/newyjLayout.vue @@ -49,7 +49,7 @@ 退出登录 -
+
进入管理平台
@@ -104,6 +104,7 @@ export default { ...mapState({ dept: (state) => state.user.dept, username: (state) => state.user.name, + roles:(state) => state.user.roles, }), }, watch: { diff --git a/src/permission.js b/src/permission.js index 477bbf4..40baf7c 100644 --- a/src/permission.js +++ b/src/permission.js @@ -20,7 +20,7 @@ router.beforeEach((to, from, next) => { NProgress.done() } else { if (store.getters.roles.length === 0) { - console.log(router.options); + // console.log(router.options); isRelogin.show = true // 判断当前用户是否已拉取完user_info信息 store.dispatch('GetInfo').then(() => { diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue index 68c3041..8ad3079 100644 --- a/src/views/components/dialog/index.vue +++ b/src/views/components/dialog/index.vue @@ -161,13 +161,13 @@ header-align="center" > --> - - + -->
- 全部 + 全部 已检查 - 未检查 + 未检查
@@ -90,9 +90,9 @@ @@ -174,9 +174,9 @@ export default { district: "", plannedYear: "", //检测状态 - checkStatus: "00", + checkStatus: "", }, - checkList: ["00"], + checkList: [""], checkListTwo: [], listDes: [ { @@ -316,7 +316,7 @@ export default { district: "", plannedYear: "", //检测状态 - checkStatus: "00", + checkStatus: "", }; this.searchBefore = { pageSize: 10, @@ -418,18 +418,25 @@ export default { }, // 导出 exportFile() { - // console.log(this.multipleSelection) + this.$confirm(`确认根据您的搜索条件导出搜索之后的数据吗?`, "警告", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.download( + "/pharmaceuticals/bPlanEnterprise/export", + { + ...this.form, + }, + `执法列表.xlsx` + ); + }) + .catch(() => {}); }, }, mounted() { this.checkListTwo = this.checkList; - // this.$nextTick(()=>{ - // let dom = document.getElementsByClassName('tables'); - // let height = dom[0].getBoundingClientRect(); - // let windowHeight = window.innerHeight; - // let relativeHeight = windowHeight - height.top - // this.main.height = relativeHeight - 80 - // }) }, }; diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue index d97743d..3846c63 100644 --- a/src/views/yingji/enterprise.vue +++ b/src/views/yingji/enterprise.vue @@ -9,6 +9,7 @@ placeholder="请选择" :options="xzList" :props="props" + > @@ -201,10 +202,10 @@ export default { uscCode: "", }, props: { - value: "county", + value: "subdistrict", label: "institutionName", }, - + xzqh:'', searchBefore: { pageSize: 10, pageNum: 1, @@ -334,9 +335,9 @@ export default { value: "", }, ], - addShow:false, - details:null, - detailLoad:true, + addShow: false, + details: null, + detailLoad: true, }; }, created() { @@ -367,8 +368,10 @@ export default { }, getDict() { xzTree().then((res1) => { + console.log(res1); this.xzList = res1.data; this.filterComparment(this.xzList); + console.log(this.xzList); }); listDist({ list: "economic_categories,category,major_hazard_level,entpr_color", @@ -376,7 +379,6 @@ export default { this.options = res.data; }); }, - filterComparment(e) { e.forEach((value, index) => { if (value.children.length >= 1) { @@ -391,7 +393,7 @@ export default { if (this.form.subdistrict) { this.form.subdistrict = this.form.subdistrict[1]; } - this.searchBefore ={...this.searchBefore, ...this.form}; + this.searchBefore = { ...this.searchBefore, ...this.form }; this.getList(); }, chongzhiList() { @@ -418,7 +420,6 @@ export default { }, getList() { this.load1 = true; - businessList(this.searchBefore).then((res) => { this.tableData = res.data.list; this.total = res.data.total; diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue index 223692b..55a3e3c 100644 --- a/src/views/yingji/planManage.vue +++ b/src/views/yingji/planManage.vue @@ -206,7 +206,21 @@ }, // 导出 exportFile(){ - console.log(this.multipleSelection) + this.$confirm(`确认根据您的搜索条件导出搜索之后的数据吗?`, "警告", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + this.download( + "/pharmaceuticals/bPlanManage/export", + { + ...this.form, + }, + `执法列表.xlsx` + ); + }) + .catch(() => {}); }, // 新增计划 newProject(){ diff --git a/vue.config.js b/vue.config.js index 9b487e2..6e66aa1 100644 --- a/vue.config.js +++ b/vue.config.js @@ -49,7 +49,8 @@ module.exports = { // }, // }, '/api': { - target: `http://39.101.188.84:9033`, + // target: `http://39.101.188.84:9033`, + target: `http://192.168.0.108:9033`, changeOrigin: true, pathRewrite: { '^/api': ''