diff --git a/.env.production b/.env.production index cfc4212..0b3c40b 100644 --- a/.env.production +++ b/.env.production @@ -5,4 +5,6 @@ VUE_APP_TITLE = 苏州应急执法计划管理系统 ENV = 'production' # 苏州应急执法计划管理系统/生产环境 -VUE_APP_BASE_API = 'http://192.168.0.105:9033' +# VUE_APP_BASE_API = 'http://192.168.0.105:9033' +VUE_APP_BASE_API = 'http://39.101.188.84:9033/pharmaceuticals' + diff --git a/public/index.html b/public/index.html index ac2a223..925455c 100644 --- a/public/index.html +++ b/public/index.html @@ -1,228 +1,208 @@ - - - - - - - - + + + + + <%= webpackConfig.name %> - - + +
-
-
-
-
-
正在加载系统资源，请耐心等待
-
-
+
+
+
+
+
正在加载系统资源，请耐心等待
+
+ diff --git a/src/api/yingji/index.js b/src/api/yingji/index.js index 368347d..c298451 100644 --- a/src/api/yingji/index.js +++ b/src/api/yingji/index.js @@ -12,7 +12,7 @@ export default { // 行政区划 tree(params) { return request({ - url: "/administrative/tree", + url: "/pharmaceuticals/administrative/tree", method: "get", params, }); @@ -20,7 +20,7 @@ export default { // 导入excel importExcel(data) { return request({ - url: "/bKeyEnterprise/common/importExcel", + url: "/pharmaceuticals/bKeyEnterprise/common/importExcel", method: "post", data, }); @@ -28,16 +28,15 @@ export default { // 企业基本信息 basicList(params) { return request({ - url: "/info/list", + url: "/pharmaceuticals/info/list", method: "get", params, }) }, // 查看，新增，修改，删除计划管理表 get\delete 传参是params put\post 传参是data bPlanManage(method,data = null, params = null, id){ - console.log(id) return request({ - url: `/bPlanManage${id ? `/${id}` : ''}`, + url: `/pharmaceuticals/bPlanManage${id ? `/${id}` : ''}`, method, data, params @@ -45,13 +44,13 @@ export default { }, bPlanManageTwo(id){ return request({ - url: `/bPlanManage/${id}`, + url: `/pharmaceuticals/bPlanManage/${id}`, method:'get', }); }, dictdata(params){ return request({ - url: `/dictdata`, + url: `/pharmaceuticals/dictdata`, method:'get', params }); diff --git a/src/api/yingji/keyEnterprise.js b/src/api/yingji/keyEnterprise.js index 8e989e3..b7c39ae 100644 --- a/src/api/yingji/keyEnterprise.js +++ b/src/api/yingji/keyEnterprise.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 分页条件查询省重点企业 export function listEnterprise(query) { return request({ - url: '/bKeyEnterprise', + url: '/pharmaceuticals/bKeyEnterprise', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listEnterprise(query) { // 新增省重点企业 export function addEnterprise(data) { return request({ - url: '/bKeyEnterprise', + url: '/pharmaceuticals/bKeyEnterprise', method: 'post', data }) @@ -20,7 +20,7 @@ export function addEnterprise(data) { //修改省重点企业 export function updateEnterprise(data) { return request({ - url: '/bKeyEnterprise', + url: '/pharmaceuticals/bKeyEnterprise', method: 'put', data }) @@ -28,7 +28,7 @@ export function updateEnterprise(data) { //删除省重点企业 export function deleteEnterprise(data) { return request({ - url: '/bKeyEnterprise', + url: '/pharmaceuticals/bKeyEnterprise', method: 'delete', params: data }) @@ -36,7 +36,7 @@ export function deleteEnterprise(data) { //导入省重点企业 export function exportEnterprise(data) { return request({ - url: '/bKeyEnterprise/common/importExcel', + url: '/pharmaceuticals/bKeyEnterprise/common/importExcel', method: 'post', data, headers: { @@ -47,14 +47,14 @@ export function exportEnterprise(data) { //通过主键查询单条省重点企业 export function getEnterprise(id) { return request({ - url: `/bKeyEnterprise/${id}`, + url: `/pharmaceuticals/bKeyEnterprise/${id}`, method: 'get', }) } //查询企业信息列表 export function businessList(data) { return request({ - url: `/info/list`, + url: `/pharmaceuticals/info/list`, method: 'get', params: data }) @@ -62,7 +62,7 @@ export function businessList(data) { //查询单条企业信息执法详情 export function enforcingDetail(data) { return request({ - url: `/bPlanEnterprise/getZhifa`, + url: `/pharmaceuticals/bPlanEnterprise/getZhifa`, method: 'get', params: data @@ -71,7 +71,7 @@ export function enforcingDetail(data) { // 根据字段查询字典信息 export function listDist(query) { return request({ - url: '/dictdata', + url: '/pharmaceuticals/dictdata', method: 'get', params: query }) @@ -80,7 +80,7 @@ export function listDist(query) { // 行政区划树结构 export function xzTree(id) { return request({ - url: '/administrative/tree', + url: '/pharmaceuticals/administrative/tree', method: 'get', }) } diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue index e972999..407be9f 100644 --- a/src/layout/newyjLayout.vue +++ b/src/layout/newyjLayout.vue @@ -38,7 +38,9 @@
- 苏州市应急管理局 张三 + {{ dept.deptName }}    {{ username }} +
@@ -47,6 +49,9 @@ 退出登录 +
+ 进入管理平台 +
@@ -55,6 +60,7 @@
diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue index ee340b6..ed6687b 100644 --- a/src/views/yingji/enforcing.vue +++ b/src/views/yingji/enforcing.vue @@ -37,7 +37,7 @@
- 全部 + 全部 已检查 未检查 @@ -47,6 +47,9 @@
搜索
+
+ 重置 +
导出excel @@ -133,7 +136,13 @@ v-for="(item, index) in listDes" :key="index" > - {{ item.value }} + {{ + item.value == "null" + ? "" + : item.value == "false" + ? "暂无" + : item.value + }}
@@ -165,9 +174,9 @@ export default { district: "", plannedYear: "", //检测状态 - checkStatus: "", + checkStatus: "00", }, - checkList: [""], + checkList: ["00"], checkListTwo: [], listDes: [ { @@ -276,11 +285,6 @@ export default { label: "重大危险源等级", value: "", }, - { - eng: "operatingStatus", - label: "经营状态", - value: "", - }, { eng: "regAddr", label: "注册地址", @@ -307,6 +311,24 @@ export default { this.xzList(); }, methods: { + reset() { + this.form = { + district: "", + plannedYear: "", + //检测状态 + checkStatus: "00", + }; + this.searchBefore = { + pageSize: 10, + pageNum: 1, + }; + }, + //重置列表 + chongzhiList() { + this.reset(); + this.getList(); + }, + xzList() { xzTree().then((res) => { console.log(res); @@ -348,7 +370,7 @@ export default { }, searchList() { this.form.district = this.district[this.district.length - 1]; - this.searchBefore = Object.assign(this.searchBefore, this.form); + this.searchBefore = { ...this.searchBefore, ...this.form }; this.getList(); }, getList() { @@ -365,12 +387,12 @@ export default { this.checkList = this.checkList.slice(-1); if (this.checkList.length > 0) { this.checkListTwo = this.checkList; - this.form.checkStatus = this.checkList[0] + this.form.checkStatus = this.checkList[0]; } else { this.checkList = this.checkListTwo; } }, - + // tabs不同行给不同class tableRowClassName({ row, rowIndex }) { if (rowIndex % 2 !== 0) { @@ -390,9 +412,8 @@ export default { }, // 页码，当前页切换事件 pagesChange(pages) { - console.log(pages); - this.searchBefore.pageNum = pages.current; - this.searchBefore.pageSize = pages.size; + this.searchBefore.pageNum = pages.pageNum; + this.searchBefore.pageSize = pages.pageSize; this.getList(); }, // 导出 diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue index 45310e2..d97743d 100644 --- a/src/views/yingji/enterprise.vue +++ b/src/views/yingji/enterprise.vue @@ -1,316 +1,534 @@ +
+ + }, + 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 - 50 + // }) + }, +}; + + .pagination { + margin-top: 10px; + } +} + \ No newline at end of file diff --git a/src/views/yingji/focusEnter.vue b/src/views/yingji/focusEnter.vue index c34231a..0733660 100644 --- a/src/views/yingji/focusEnter.vue +++ b/src/views/yingji/focusEnter.vue @@ -68,7 +68,7 @@ @@ -148,7 +149,7 @@ @@ -162,7 +163,6 @@ size="small" > - @@ -227,7 +227,7 @@
- {{ parseTime(details.year, "{y}") }} + {{ $moment(new Date(details.year)).format("yyyy-MM") }} {{ details.enterpriseName }} @@ -298,17 +298,15 @@ export default { addShow: false, //详情 details: {}, - // rules: { - // enterpriseName: [ - // { required: true, message: "请输入企业名称", trigger: "blur" }, - // ], - // entCode: [ - // { required: true, message: "请输入企业代码", trigger: "blur" }, - // ], - // remark: [{ required: true, message: "请输入备注", trigger: "blur" }], - // type: [{ required: true, message: "请输入大类", trigger: "blur" }], - // year: [{ required: true, message: "请选择年份", trigger: "blur" }], - // }, + rules: { + enterpriseName: [ + { required: true, message: "请输入企业名称", trigger: "blur" }, + ], + entCode: [ + { required: true, message: "请输入企业信用代码", trigger: "blur" }, + ], + year: [{ required: true, message: "请选择年份", trigger: "blur" }], + }, //总数 total: 0, fileList: [], @@ -320,7 +318,7 @@ export default { methods: { handleRemove() {}, searchList() { - this.searchBefore = Object.assign(this.searchBefore, this.queryParms); + this.searchBefore = { ...this.searchBefore, ...this.queryParms }; this.getList(); }, reset() { @@ -348,7 +346,9 @@ export default { //获取列表 getList() { this.loading = true; + // console.log(this.searchBefore); listEnterprise(this.searchBefore).then((res) => { + // console.log(res); this.tableData = res.data.list; this.loading = false; this.total = res.data.total; @@ -375,6 +375,7 @@ export default { //查看详情 look(e) { getEnterprise(e.id).then((res) => { + console.log(res); this.details = res.data; this.addShow = true; }); @@ -457,8 +458,9 @@ export default { }, // 页码，当前页切换事件 pagesChange(pages) { - this.searchBefore.pageSize = pages.size; - this.searchBefore.pageNum = pages.current; + // console.log(pages); + this.searchBefore.pageSize = pages.pageSize; + this.searchBefore.pageNum = pages.pageNum; this.getList(); }, handleSuccess() {}, diff --git a/vue.config.js b/vue.config.js index d0d60d0..9b487e2 100644 --- a/vue.config.js +++ b/vue.config.js @@ -25,7 +25,7 @@ module.exports = { // 部署生产环境和开发环境下的URL。 // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === "production" ? "/mudu-manage/" : "/", + publicPath: process.env.NODE_ENV === "production" ? "/demo/suzhouyingjiPC/" : "/", // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） outputDir: "dist", // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） @@ -49,7 +49,7 @@ module.exports = { // }, // }, '/api': { - target: `http://39.101.188.84:9033/pharmaceuticals`, + target: `http://39.101.188.84:9033`, changeOrigin: true, pathRewrite: { '^/api': ''