From 9375fcf8fd44c3cb5f11e727a474766b56006208 Mon Sep 17 00:00:00 2001 From: dhy1725534722 <1725534722@qq.com> Date: Wed, 20 Sep 2023 15:16:55 +0800 Subject: [PATCH 01/64] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 3 +++ vue.config.js | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.env.production b/.env.production index bdead2a..c213c90 100644 --- a/.env.production +++ b/.env.production @@ -8,3 +8,6 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://192.168.0.105:9033' VUE_APP_BASE_API = 'http://39.101.188.84:9033' + +# 路由懒加载 +VUE_CLI_BABEL_TRANSPILE_MODULES = true \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index 6e66aa1..cf32605 100644 --- a/vue.config.js +++ b/vue.config.js @@ -49,8 +49,8 @@ module.exports = { // }, // }, '/api': { - // target: `http://39.101.188.84:9033`, - target: `http://192.168.0.108:9033`, + target: `http://39.101.188.84:9033`, + // target: `http://192.168.0.108:9033`, changeOrigin: true, pathRewrite: { '^/api': '' From ef7338a718956cfa9f2cf5e2c95a30b43dc6ed26 Mon Sep 17 00:00:00 2001 From: dhy1725534722 <1725534722@qq.com> Date: Wed, 20 Sep 2023 15:28:48 +0800 Subject: [PATCH 02/64] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mudu/article.js | 44 ---- src/api/mudu/check.js | 44 ---- src/api/mudu/directory.js | 44 ---- src/api/mudu/equipment.js | 46 ---- src/api/mudu/hcheck.js | 65 ----- src/api/mudu/history.js | 45 ---- src/api/mudu/likes.js | 54 ---- src/api/mudu/manage.js | 44 ---- src/api/mudu/management.js | 44 ---- src/api/mudu/materials.js | 44 ---- src/api/mudu/monitor.js | 44 ---- src/api/mudu/order.js | 55 ---- src/api/mudu/point.js | 47 ---- src/api/mudu/principal.js | 45 ---- src/api/mudu/profile.js | 44 ---- src/api/mudu/receiver.js | 45 ---- src/api/mudu/records.js | 46 ---- src/api/mudu/train.js | 44 ---- src/api/mudu/transportation.js | 47 ---- src/api/mudu/trouble.js | 64 ----- src/views/components/dialog/index.vue | 352 ++++++++++++++++---------- src/views/index.vue | 16 +- 22 files changed, 222 insertions(+), 1101 deletions(-) delete mode 100644 src/api/mudu/article.js delete mode 100644 src/api/mudu/check.js delete mode 100644 src/api/mudu/directory.js delete mode 100644 src/api/mudu/equipment.js delete mode 100644 src/api/mudu/hcheck.js delete mode 100644 src/api/mudu/history.js delete mode 100644 src/api/mudu/likes.js delete mode 100644 src/api/mudu/manage.js delete mode 100644 src/api/mudu/management.js delete mode 100644 src/api/mudu/materials.js delete mode 100644 src/api/mudu/monitor.js delete mode 100644 src/api/mudu/order.js delete mode 100644 src/api/mudu/point.js delete mode 100644 src/api/mudu/principal.js delete mode 100644 src/api/mudu/profile.js delete mode 100644 src/api/mudu/receiver.js delete mode 100644 src/api/mudu/records.js delete mode 100644 src/api/mudu/train.js delete mode 100644 src/api/mudu/transportation.js delete mode 100644 src/api/mudu/trouble.js diff --git a/src/api/mudu/article.js b/src/api/mudu/article.js deleted file mode 100644 index 34d1d3a..0000000 --- a/src/api/mudu/article.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询文章列表 -export function listArticle(query) { - return request({ - url: '/mudu/article/list', - method: 'get', - params: query - }) -} - -// 查询文章详细 -export function getArticle(id) { - return request({ - url: '/mudu/article/' + id, - method: 'get' - }) -} - -// 新增文章 -export function addArticle(data) { - return request({ - url: '/mudu/article', - method: 'post', - data: data - }) -} - -// 修改文章 -export function updateArticle(data) { - return request({ - url: '/mudu/article', - method: 'put', - data: data - }) -} - -// 删除文章 -export function delArticle(id) { - return request({ - url: '/mudu/article/' + id, - method: 'delete' - }) -} diff --git a/src/api/mudu/check.js b/src/api/mudu/check.js deleted file mode 100644 index ddbdb64..0000000 --- a/src/api/mudu/check.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from "@/utils/request"; - -// 查询清单式检查列表 -export function listCheck(query) { - return request({ - url: "/mudu/check/list", - method: "get", - params: query, - }); -} - -// 查询清单式检查详细 -export function getCheck(id) { - return request({ - url: "/mudu/check/" + id, - method: "get", - }); -} - -// 新增清单式检查 -export function addCheck(data) { - return request({ - url: "/mudu/check", - method: "post", - data: data, - }); -} - -// 修改清单式检查 -export function updateCheck(data) { - return request({ - url: "/mudu/check", - method: "put", - data: data, - }); -} - -// 删除清单式检查 -export function delCheck(id) { - return request({ - url: "/mudu/check/" + id, - method: "delete", - }); -} diff --git a/src/api/mudu/directory.js b/src/api/mudu/directory.js deleted file mode 100644 index fa54588..0000000 --- a/src/api/mudu/directory.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询服务企业名录库列表 -export function listDirectory(query) { - return request({ - url: '/mudu/directory/list', - method: 'get', - params: query - }) -} - -// 查询服务企业名录库详细 -export function getDirectory(id) { - return request({ - url: '/mudu/directory/' + id, - method: 'get' - }) -} - -// 新增服务企业名录库 -export function addDirectory(data) { - return request({ - url: '/mudu/directory', - method: 'post', - data: data - }) -} - -// 修改服务企业名录库 -export function updateDirectory(data) { - return request({ - url: '/mudu/directory', - method: 'put', - data: data - }) -} - -// 删除服务企业名录库 -export function delDirectory(id) { - return request({ - url: '/mudu/directory/' + id, - method: 'delete' - }) -} diff --git a/src/api/mudu/equipment.js b/src/api/mudu/equipment.js deleted file mode 100644 index accc472..0000000 --- a/src/api/mudu/equipment.js +++ /dev/null @@ -1,46 +0,0 @@ -import request from '@/utils/request' - -// 查询特种设备列表 -export function listEquipment(query) { - return request({ - url: '/mudu/equipment/list', - method: 'get', - params: query - }) -} - -// 查询特种设备详细 -export function getEquipment(id) { - return request({ - url: '/mudu/equipment/' + id, - method: 'get' - }) -} - -// 新增特种设备 -export function addEquipment(data) { - return request({ - url: '/mudu/equipment', - method: 'post', - data: data - }) -} - -// 修改特种设备 -export function updateEquipment(data) { - return request({ - url: '/mudu/equipment', - method: 'put', - data: data - }) -} - -// 删除特种设备 -export function delEquipment(id) { - return request({ - url: '/mudu/equipment/' + id, - method: 'delete' - }) -} - - diff --git a/src/api/mudu/hcheck.js b/src/api/mudu/hcheck.js deleted file mode 100644 index 346aa63..0000000 --- a/src/api/mudu/hcheck.js +++ /dev/null @@ -1,65 +0,0 @@ -import request from "@/utils/request"; - -// 查询巡查工单列表 -export function listHcheck(query) { - return request({ - url: "/mudu/hcheck/list", - method: "get", - params: query, - }); -} - -// 查询巡查工单详细 -export function getHcheck(id) { - return request({ - url: "/mudu/hcheck/" + id, - method: "get", - }); -} - -// 新增巡查工单 -export function addHcheck(data) { - return request({ - url: "/mudu/hcheck", - method: "post", - data: data, - }); -} - -// 修改巡查工单 -export function updateHcheck(data) { - return request({ - url: "/mudu/hcheck", - method: "put", - data: data, - }); -} - -// 删除巡查工单 -export function delHcheck(id) { - return request({ - url: "/mudu/hcheck/" + id, - method: "delete", - }); -} - -// 导出巡查工单 -export function exportHcheck(data) { - return request({ - url: "/mudu/hcheck/export", - method: "post", - data, - }); -} - -// 导入巡查工单 -export function importHcheckTable(data) { - return request({ - url: "/mudu/hcheck/importExcel", - method: "post", - headers: { - "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", - }, - data, - }); -} diff --git a/src/api/mudu/history.js b/src/api/mudu/history.js deleted file mode 100644 index 3beb4c8..0000000 --- a/src/api/mudu/history.js +++ /dev/null @@ -1,45 +0,0 @@ -import request from '@/utils/request' - -// 查询浏览记录列表 -export function listHistory(query) { - return request({ - url: '/mudu/history/list', - method: 'get', - params: query - }) -} - -// 查询浏览记录详细 -export function getHistory(id) { - return request({ - url: '/mudu/history/' + id, - method: 'get' - }) -} - -// 新增浏览记录 -export function addHistory(data) { - return request({ - url: '/mudu/history', - method: 'post', - data: data - }) -} - -// 修改浏览记录 -export function updateHistory(data) { - return request({ - url: '/mudu/history', - method: 'put', - data: data - }) -} - -// 删除浏览记录 -export function delHistory(id) { - return request({ - url: '/mudu/history/' + id, - method: 'delete' - }) - -} diff --git a/src/api/mudu/likes.js b/src/api/mudu/likes.js deleted file mode 100644 index cae8647..0000000 --- a/src/api/mudu/likes.js +++ /dev/null @@ -1,54 +0,0 @@ -import request from '@/utils/request' - -// 查询点赞列表 -export function listLikes(query) { - return request({ - url: '/mudu/likes/list', - method: 'get', - params: query - }) -} - -// 查询点赞详细 -export function getLikes(id) { - return request({ - url: '/mudu/likes/' + id, - method: 'get' - }) -} - -// 新增点赞 -export function addLikes(data) { - return request({ - url: '/mudu/likes', - method: 'post', - data: data - }) -} - -// 修改点赞 -export function updateLikes(data) { - return request({ - url: '/mudu/likes', - method: 'put', - data: data - }) -} - -// 删除点赞 -export function delLikes(id) { - return request({ - url: '/mudu/likes/' + id, - method: 'delete' - }) - -} - -// 导出点赞 -export function exportLikes(data) { - return request({ - url: '/mudu/likes/export', - method: 'post', - data - }) -} diff --git a/src/api/mudu/manage.js b/src/api/mudu/manage.js deleted file mode 100644 index 8194ca3..0000000 --- a/src/api/mudu/manage.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询全镇公共物资管理列表 -export function listManage(query) { - return request({ - url: '/mudu/manage/list', - method: 'get', - params: query - }) -} - -// 查询全镇公共物资管理详细 -export function getManage(id) { - return request({ - url: '/mudu/manage/' + id, - method: 'get' - }) -} - -// 新增全镇公共物资管理 -export function addManage(data) { - return request({ - url: '/mudu/manage', - method: 'post', - data: data - }) -} - -// 修改全镇公共物资管理 -export function updateManage(data) { - return request({ - url: '/mudu/manage', - method: 'put', - data: data - }) -} - -// 删除全镇公共物资管理 -export function delManage(id) { - return request({ - url: '/mudu/manage/' + id, - method: 'delete' - }) -} diff --git a/src/api/mudu/management.js b/src/api/mudu/management.js deleted file mode 100644 index 38d6d31..0000000 --- a/src/api/mudu/management.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询风险企业管理列表 -export function listManagement(query) { - return request({ - url: '/mudu/management/list', - method: 'get', - params: query - }) -} - -// 查询风险企业管理详细 -export function getManagement(id) { - return request({ - url: '/mudu/management/' + id, - method: 'get' - }) -} - -// 新增风险企业管理 -export function addManagement(data) { - return request({ - url: '/mudu/management', - method: 'post', - data: data - }) -} - -// 修改风险企业管理 -export function updateManagement(data) { - return request({ - url: '/mudu/management', - method: 'put', - data: data - }) -} - -// 删除风险企业管理 -export function delManagement(id) { - return request({ - url: '/mudu/management/' + id, - method: 'delete' - }) -} diff --git a/src/api/mudu/materials.js b/src/api/mudu/materials.js deleted file mode 100644 index 53b071e..0000000 --- a/src/api/mudu/materials.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询园内专有物资管理列表 -export function listMaterials(query) { - return request({ - url: '/mudu/materials/list', - method: 'get', - params: query - }) -} - -// 查询园内专有物资管理详细 -export function getMaterials(id) { - return request({ - url: '/mudu/materials/' + id, - method: 'get' - }) -} - -// 新增园内专有物资管理 -export function addMaterials(data) { - return request({ - url: '/mudu/materials', - method: 'post', - data: data - }) -} - -// 修改园内专有物资管理 -export function updateMaterials(data) { - return request({ - url: '/mudu/materials', - method: 'put', - data: data - }) -} - -// 删除园内专有物资管理 -export function delMaterials(id) { - return request({ - url: '/mudu/materials/' + id, - method: 'delete' - }) -} diff --git a/src/api/mudu/monitor.js b/src/api/mudu/monitor.js deleted file mode 100644 index d150eab..0000000 --- a/src/api/mudu/monitor.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询园内监控管理列表 -export function listMonitor(query) { - return request({ - url: '/mudu/monitor/list', - method: 'get', - params: query - }) -} - -// 查询园内监控管理详细 -export function getMonitor(id) { - return request({ - url: '/mudu/monitor/' + id, - method: 'get' - }) -} - -// 新增园内监控管理 -export function addMonitor(data) { - return request({ - url: '/mudu/monitor', - method: 'post', - data: data - }) -} - -// 修改园内监控管理 -export function updateMonitor(data) { - return request({ - url: '/mudu/monitor', - method: 'put', - data: data - }) -} - -// 删除园内监控管理 -export function delMonitor(id) { - return request({ - url: '/mudu/monitor/' + id, - method: 'delete' - }) -} diff --git a/src/api/mudu/order.js b/src/api/mudu/order.js deleted file mode 100644 index 5647200..0000000 --- a/src/api/mudu/order.js +++ /dev/null @@ -1,55 +0,0 @@ -import request from '@/utils/request' - -// 查询隐患巡查工单列表 -export function listOrder(query) { - return request({ - url: '/mudu/order/list', - method: 'get', - params: query - }) -} - -// 查询隐患巡查工单详细 -export function getOrder(id) { - return request({ - url: '/mudu/order/' + id, - method: 'get' - }) -} - -// 新增隐患巡查工单 -export function addOrder(data) { - return request({ - url: '/mudu/order', - method: 'post', - data: data - }) -} - -// 修改隐患巡查工单 -export function updateOrder(data) { - return request({ - url: '/mudu/order', - method: 'put', - data: data - }) -} - -// 删除隐患巡查工单 -export function delOrder(id) { - return request({ - url: '/mudu/order/' + id, - method: 'delete' - }) -} -// 导入隐患巡查工单 -export function importOrder(data) { - return request({ - url: '/mudu/order/importExcel', - method: 'post', - headers:{ - 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' - }, - data - }) -} diff --git a/src/api/mudu/point.js b/src/api/mudu/point.js deleted file mode 100644 index a11d67f..0000000 --- a/src/api/mudu/point.js +++ /dev/null @@ -1,47 +0,0 @@ -import request from '@/utils/request' - -// 查询点位列表 -export function listPoint(query) { - return request({ - url: '/mudu/point/list', - method: 'get', - params: query - }) -} - -// 查询点位详细 -export function getPoint(id) { - return request({ - url: '/mudu/point/' + id, - method: 'get' - }) -} - -// 新增点位 -export function addPoint(data) { - return request({ - url: '/mudu/point', - method: 'post', - data: data - }) -} - -// 修改点位 -export function updatePoint(data) { - return request({ - url: '/mudu/point', - method: 'put', - data: data - }) -} - -// 删除点位 -export function delPoint(id) { - return request({ - url: '/mudu/point/' + id, - method: 'delete' - }) - -} - - diff --git a/src/api/mudu/principal.js b/src/api/mudu/principal.js deleted file mode 100644 index 779d400..0000000 --- a/src/api/mudu/principal.js +++ /dev/null @@ -1,45 +0,0 @@ -import request from '@/utils/request' - -// 查询负责人列表 -export function listPrincipal(query) { - return request({ - url: '/mudu/principal/list', - method: 'get', - params: query - }) -} - -// 查询负责人详细 -export function getPrincipal(id) { - return request({ - url: '/mudu/principal/' + id, - method: 'get' - }) -} - -// 新增负责人 -export function addPrincipal(data) { - return request({ - url: '/mudu/principal', - method: 'post', - data: data - }) -} - -// 修改负责人 -export function updatePrincipal(data) { - return request({ - url: '/mudu/principal', - method: 'put', - data: data - }) -} - -// 删除负责人 -export function delPrincipal(id) { - return request({ - url: '/mudu/principal/' + id, - method: 'delete' - }) -} - diff --git a/src/api/mudu/profile.js b/src/api/mudu/profile.js deleted file mode 100644 index 03367c5..0000000 --- a/src/api/mudu/profile.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询园区概况列表 -export function listProfile(query) { - return request({ - url: '/mudu/profile/list', - method: 'get', - params: query - }) -} - -// 查询园区概况详细 -export function getProfile(id) { - return request({ - url: '/mudu/profile/' + id, - method: 'get' - }) -} - -// 新增园区概况 -export function addProfile(data) { - return request({ - url: '/mudu/profile', - method: 'post', - data: data - }) -} - -// 修改园区概况 -export function updateProfile(data) { - return request({ - url: '/mudu/profile', - method: 'put', - data: data - }) -} - -// 删除园区概况 -export function delProfile(id) { - return request({ - url: '/mudu/profile/' + id, - method: 'delete' - }) -} \ No newline at end of file diff --git a/src/api/mudu/receiver.js b/src/api/mudu/receiver.js deleted file mode 100644 index dcd40fb..0000000 --- a/src/api/mudu/receiver.js +++ /dev/null @@ -1,45 +0,0 @@ -import request from '@/utils/request' - -// 查询储气罐列表 -export function listReceiver(query) { - return request({ - url: '/mudu/receiver/list', - method: 'get', - params: query - }) -} - -// 查询储气罐详细 -export function getReceiver(id) { - return request({ - url: '/mudu/receiver/' + id, - method: 'get' - }) -} - -// 新增储气罐 -export function addReceiver(data) { - return request({ - url: '/mudu/receiver', - method: 'post', - data: data - }) -} - -// 修改储气罐 -export function updateReceiver(data) { - return request({ - url: '/mudu/receiver', - method: 'put', - data: data - }) -} - -// 删除储气罐 -export function delReceiver(id) { - return request({ - url: '/mudu/receiver/' + id, - method: 'delete' - }) - -} diff --git a/src/api/mudu/records.js b/src/api/mudu/records.js deleted file mode 100644 index 6b63907..0000000 --- a/src/api/mudu/records.js +++ /dev/null @@ -1,46 +0,0 @@ -import request from '@/utils/request' - -// 查询检查记录列表 -export function listRecords(query) { - return request({ - url: '/mudu/records/list', - method: 'get', - params: query - }) -} - -// 查询检查记录详细 -export function getRecords(id) { - return request({ - url: '/mudu/records/' + id, - method: 'get' - }) -} - -// 新增检查记录 -export function addRecords(data) { - return request({ - url: '/mudu/records', - method: 'post', - data: data - }) -} - -// 修改检查记录 -export function updateRecords(data) { - return request({ - url: '/mudu/records', - method: 'put', - data: data - }) -} - -// 删除检查记录 -export function delRecords(id) { - return request({ - url: '/mudu/records/' + id, - method: 'delete' - }) - -} - diff --git a/src/api/mudu/train.js b/src/api/mudu/train.js deleted file mode 100644 index 846f468..0000000 --- a/src/api/mudu/train.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询培训列表 -export function listTrain(query) { - return request({ - url: '/mudu/train/list', - method: 'get', - params: query - }) -} - -// 查询培训详细 -export function getTrain(id) { - return request({ - url: '/mudu/train/' + id, - method: 'get' - }) -} - -// 新增培训 -export function addTrain(data) { - return request({ - url: '/mudu/train', - method: 'post', - data: data - }) -} - -// 修改培训 -export function updateTrain(data) { - return request({ - url: '/mudu/train', - method: 'put', - data: data - }) -} - -// 删除培训 -export function delTrain(id) { - return request({ - url: '/mudu/train/' + id, - method: 'delete' - }) -} diff --git a/src/api/mudu/transportation.js b/src/api/mudu/transportation.js deleted file mode 100644 index 56409dd..0000000 --- a/src/api/mudu/transportation.js +++ /dev/null @@ -1,47 +0,0 @@ -import request from '@/utils/request' - -// 查询交通运输列表 -export function listTransportation(query) { - return request({ - url: '/mudu/transportation/list', - method: 'get', - params: query - }) -} - -// 查询交通运输详细 -export function getTransportation(id) { - return request({ - url: '/mudu/transportation/' + id, - method: 'get' - }) -} - -// 新增交通运输 -export function addTransportation(data) { - return request({ - url: '/mudu/transportation', - method: 'post', - data: data - }) -} - -// 修改交通运输 -export function updateTransportation(data) { - return request({ - url: '/mudu/transportation', - method: 'put', - data: data - }) -} - -// 删除交通运输 -export function delTransportation(id) { - return request({ - url: '/mudu/transportation/' + id, - method: 'delete' - }) - -} - - diff --git a/src/api/mudu/trouble.js b/src/api/mudu/trouble.js deleted file mode 100644 index ccfe51b..0000000 --- a/src/api/mudu/trouble.js +++ /dev/null @@ -1,64 +0,0 @@ -import request from "@/utils/request"; -// 查询隐患工单列表 -export function listTrouble(query) { - return request({ - url: "/mudu/trouble/list", - method: "get", - params: query, - }); -} - -// 查询隐患工单详细 -export function getTrouble(id) { - return request({ - url: "/mudu/trouble/" + id, - method: "get", - }); -} - -// 新增隐患工单 -export function addTrouble(data) { - return request({ - url: "/mudu/trouble", - method: "post", - data: data, - }); -} - -// 修改隐患工单 -export function updateTrouble(data) { - return request({ - url: "/mudu/trouble", - method: "put", - data: data, - }); -} - -// 删除隐患工单 -export function delTrouble(id) { - return request({ - url: "/mudu/trouble/" + id, - method: "delete", - }); -} - -// 导出隐患工单 -export function exportTrouble(data) { - return request({ - url: "/mudu/trouble/export", - method: "post", - data, - }); -} - -// 导入隐患工单 -export function importTroubleTable(data) { - return request({ - url: "/mudu/trouble/importExcel", - method: "post", - headers: { - "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", - }, - data, - }); -} diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue index 67c6c65..53e1fff 100644 --- a/src/views/components/dialog/index.vue +++ b/src/views/components/dialog/index.vue @@ -31,13 +31,14 @@
行政区划:
- + + @change="handleChange" + >
-
- -
-
-
搜索
-
重置
-
+
+ +
+
+
搜索
+
重置
+
@@ -168,7 +169,11 @@ header-align="center" > - + diff --git a/src/views/yingji/home.vue b/src/views/yingji/home.vue index b9f15b7..68b5d58 100644 --- a/src/views/yingji/home.vue +++ b/src/views/yingji/home.vue @@ -1,22 +1,66 @@ diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue index dcbc02d..09218ae 100644 --- a/src/views/yingji/planManage.vue +++ b/src/views/yingji/planManage.vue @@ -4,7 +4,7 @@ * @Author: JC9527 * @Date: 2023-09-04 10:20:06 * @LastEditors: JC9527 - * @LastEditTime: 2023-09-26 13:14:38 + * @LastEditTime: 2023-09-26 16:02:57 --> diff --git a/src/views/components/dialogTwo/index.vue b/src/views/components/dialogTwo/index.vue index 94c2655..9ae6db7 100644 --- a/src/views/components/dialogTwo/index.vue +++ b/src/views/components/dialogTwo/index.vue @@ -1,141 +1,148 @@ @@ -456,12 +463,18 @@ justify-content: center; flex: 1; .area-span { - font-size: 20px; + // font-size: 20px; + // font-family: 'Alibaba PuHuiTi'; + // font-weight: bold; + // color: #525966; + // line-height: 40px; + // margin-right: 100px; + font-size: 14px; font-family: 'Alibaba PuHuiTi'; - font-weight: bold; + font-weight: 400; color: #525966; line-height: 40px; - margin-right: 100px; + margin-right: 10px; } ::v-deep .el-cascader { background-color: transparent; @@ -590,7 +603,7 @@ .look,.change,.delete { display: flex; align-items: center; - // margin-right: 30px; + margin-right: 30px; cursor: pointer; img { width: 20px; From 15d595320c1b2e560d15bb09b5e516547f7794dc Mon Sep 17 00:00:00 2001 From: dhy1725534722 <1725534722@qq.com> Date: Wed, 27 Sep 2023 11:58:41 +0800 Subject: [PATCH 21/64] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/permission.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 28ea9aa..c70396a 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -127,7 +127,7 @@ export const loadView = (view) => { return (resolve) => require([`@/views/${view}`], resolve) } else { // 使用 import 实现生产环境的路由懒加载 - return () => import(`@/views/${view}`) + return (resolve) => require([`@/views/${view}`], resolve) } } From 69437c7d1a9f7b7a3c6db3854017c37239b16131 Mon Sep 17 00:00:00 2001 From: TiaStars Date: Wed, 27 Sep 2023 14:01:11 +0800 Subject: [PATCH 22/64] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=8F=8A=E6=96=B0=E5=A2=9E=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/yingji/index.js | 4 +- src/views/components/dialog/index.vue | 78 +++++++++++----- src/views/components/dialogTwo/index.vue | 106 ++++++++++++++++----- src/views/yingji/enforcing.vue | 6 +- src/views/yingji/focusEnter.vue | 6 +- src/views/yingji/planManage.vue | 114 +++++++++++++---------- 6 files changed, 210 insertions(+), 104 deletions(-) diff --git a/src/api/yingji/index.js b/src/api/yingji/index.js index ca5328a..41e9c47 100644 --- a/src/api/yingji/index.js +++ b/src/api/yingji/index.js @@ -4,7 +4,7 @@ * @Author: JC9527 * @Date: 2023-09-11 15:38:21 * @LastEditors: JC9527 - * @LastEditTime: 2023-09-27 09:30:39 + * @LastEditTime: 2023-09-27 12:39:14 */ import request from '@/utils/request' @@ -44,7 +44,7 @@ export default { }, bPlanManageTwo(id){ return request({ - url: `/pharmaceuticals/bPlanManage/${id}`, + url: `/pharmaceuticals/bPlanEnterprise/${id}`, method:'get', }); }, diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue index 62d9cad..deee8a2 100644 --- a/src/views/components/dialog/index.vue +++ b/src/views/components/dialog/index.vue @@ -57,7 +57,7 @@
经济类型:
行业类型:
重大危险源等级: 企业分色: + { + return "0" + value.dictValue == b; + }); + } + arr = a.filter((value) => { + return value.dictValue == b; + }); + return arr[0].dictLabel; + }, // 搜索 filtrate() { // if (this.form.subdistrict) { @@ -437,14 +461,16 @@ export default { let count = 0; let data = await this.$api.yingji.bPlanEnterpriseList(); this.selectList = data.data; - console.log(data) + // console.log(data) data.data.map((item) => { item["uscCode"] = item.enterpriseId; this.$nextTick(() => { this.$refs.multipleTable.toggleRowSelection(item, false); }); - if (item.isPoint == '1') { - count += 1; + if (item.isPoint == 1 && this.dept.ancestors.split(',').length == 3) { + if(item.district == this.form.subdistrict){ + count += 1; + } } }); // console.log(count,'count') @@ -578,6 +604,8 @@ export default { return; } if (this.dept.ancestors.split(',').length == 3) { + // console.log(this.unselected,'this.unselected') + // console.log(keyCount,'keyCount') if (this.count == this.unselected + keyCount) { this.nextStep = true; this.nextText = "发布计划"; @@ -615,7 +643,7 @@ export default { if (this.isamend) { obj = { ...obj, id: this.amendId }; - data = await this.$api.yingji.bPlanManage("put", obj); + data = await this.$api.yingji.bPlanEnterprise("put", obj); if (data.code == 200) { downloadLoadingInstance.close(); this.$message({ @@ -690,18 +718,20 @@ export default { }, }, async mounted() { - let listTwo = await this.$api.yingji.dictdata({ - list: "economic_categories", - }); // 经济类型大类 - let listThree = await this.$api.yingji.dictdata({ list: "category" }); // 行业类型 - let listFour = await this.$api.yingji.dictdata({ - list: "major_hazard_level", - }); // 重大危险源等级 - let listFive = await this.$api.yingji.dictdata({ list: "entpr_color" }); // 企业分色 - this.listTwo = listTwo.data.economic_categories; - this.listThree = listThree.data.category; - this.listFour = listFour.data.major_hazard_level; - this.listFive = listFive.data.entpr_color; + // let listTwo = await this.$api.yingji.dictdata({ + // list: "economic_categories", + // }); // 经济类型大类 + // let listThree = await this.$api.yingji.dictdata({ list: "category" }); // 行业类型 + // let listFour = await this.$api.yingji.dictdata({ + // list: "major_hazard_level", + // }); // 重大危险源等级 + // let listFive = await this.$api.yingji.dictdata({ list: "entpr_color" }); // 企业分色 + let dictdata = await this.$api.yingji.dictdata({ list: "economic_categories,category,major_hazard_level,entpr_color",}) + this.optionstwo = dictdata.data; + // this.listTwo = listTwo.data.economic_categories; + // this.listThree = listThree.data.category; + // this.listFour = listFour.data.major_hazard_level; + // this.listFive = listFive.data.entpr_color; }, }; diff --git a/src/views/components/dialogTwo/index.vue b/src/views/components/dialogTwo/index.vue index 9ae6db7..8924564 100644 --- a/src/views/components/dialogTwo/index.vue +++ b/src/views/components/dialogTwo/index.vue @@ -42,11 +42,13 @@ @change="handleChange"> -
-
+
+ +
搜索
+
重置