From 99edce236f45d66370a967bdec74e699020064ef Mon Sep 17 00:00:00 2001 From: xzt <1113240624@qq.com> Date: Wed, 26 Jun 2024 15:55:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jwtech-admin-page/.env.development | 2 +- jwtech-admin-page/.env.production | 2 +- .../src/api/projectStatistics/worker.js | 11 + .../src/layout/components/Navbar.vue | 3 +- jwtech-admin-page/src/router/index.js | 1 + jwtech-admin-page/src/utils/request.js | 8 +- .../options/clockingIn.vue | 2 +- .../peasantWorkerSystem/options/index.vue | 7 +- .../options/realNameSystem.vue | 25 +- .../options/sgProjectmanager.vue | 63 ++- .../baseMsg/options/sectionProject.vue | 62 ++- .../warning/options/projectAcceptance.vue | 5 +- .../bid/options/TenderAnnouncementPage.vue | 2 +- .../projectProcess/projectAcceptance.vue | 5 +- .../projectStatisticsWorker/index.vue | 401 ++++++++++++++++++ jwtech-admin-page/vue.config.js | 2 +- 16 files changed, 568 insertions(+), 33 deletions(-) create mode 100644 jwtech-admin-page/src/api/projectStatistics/worker.js create mode 100644 jwtech-admin-page/src/views/projectStatistics/projectStatisticsWorker/index.vue diff --git a/jwtech-admin-page/.env.development b/jwtech-admin-page/.env.development index d5af85ac..95f77e6d 100644 --- a/jwtech-admin-page/.env.development +++ b/jwtech-admin-page/.env.development @@ -5,7 +5,7 @@ ENV = 'development' # VUE_APP_BASE_API = 'http://192.168.1.113:8081/data-admin/' # VUE_APP_BASE_API = 'http://192.168.1.20:19084/data-admin/' -VUE_APP_BASE_API = '/thinking' +VUE_APP_BASE_API = '/jgThinking/thinking' VUE_APP_FAST_BASE_URL = 'http://192.168.1.20:9080/' diff --git a/jwtech-admin-page/.env.production b/jwtech-admin-page/.env.production index 4d6c8d9b..b4ffdc0d 100644 --- a/jwtech-admin-page/.env.production +++ b/jwtech-admin-page/.env.production @@ -2,5 +2,5 @@ ENV = 'admin' # 若依管理系统/生产环境 -VUE_APP_BASE_API = '/thinking' +VUE_APP_BASE_API = '/jgThinking/thinking' VUE_APP_FAST_BASE_URL = 'http://192.168.1.20:9080/' diff --git a/jwtech-admin-page/src/api/projectStatistics/worker.js b/jwtech-admin-page/src/api/projectStatistics/worker.js new file mode 100644 index 00000000..3e325e2c --- /dev/null +++ b/jwtech-admin-page/src/api/projectStatistics/worker.js @@ -0,0 +1,11 @@ + +import request from '@/utils/request' + +// 查询项目进度 +export function listProjectWorker(query) { + return request({ + url: '/statistics/nmg/getNum', + method: 'post', + data: query + }) +} diff --git a/jwtech-admin-page/src/layout/components/Navbar.vue b/jwtech-admin-page/src/layout/components/Navbar.vue index e0545185..f60ba211 100644 --- a/jwtech-admin-page/src/layout/components/Navbar.vue +++ b/jwtech-admin-page/src/layout/components/Navbar.vue @@ -222,7 +222,8 @@ export default { type: "warning", }).then(() => { this.$store.dispatch("LogOut").then(() => { - location.href = "/index"; + location.href = "/jgThinking/"; + // window.open("http://210.76.82.26/wr-portal/login", "_self"); }); }); }, diff --git a/jwtech-admin-page/src/router/index.js b/jwtech-admin-page/src/router/index.js index 736879db..6f2c1f5b 100644 --- a/jwtech-admin-page/src/router/index.js +++ b/jwtech-admin-page/src/router/index.js @@ -203,6 +203,7 @@ const router = new Router({ mode: 'hash', // mode: 'history', // 去掉url中的# // base:"/admin/", + base: "/jgThinking/", scrollBehavior: () => ({ y: 0 }), routes: constantRoutes }) diff --git a/jwtech-admin-page/src/utils/request.js b/jwtech-admin-page/src/utils/request.js index 600ea033..c75883ef 100644 --- a/jwtech-admin-page/src/utils/request.js +++ b/jwtech-admin-page/src/utils/request.js @@ -38,7 +38,7 @@ service.interceptors.response.use(res => { // console.log('res',res); // console.log('code', code); // 登录成功提示 - if (code == 200 && res.config.url=="/thinking/login") { + if (code == 200 && res.config.url=="/jgThinking/thinking/login") { Message({ message: "登录成功", type: 'success' @@ -54,7 +54,8 @@ service.interceptors.response.use(res => { } ).then(() => { store.dispatch('LogOut').then(() => { - location.href = '/index' + location.href = '/jgThinking/' + // window.open("http://210.76.82.26/wr-portal/login", "_self"); }) }) } @@ -66,7 +67,8 @@ service.interceptors.response.use(res => { } ).then(() => { store.dispatch('LogOut').then(() => { - location.href = '/index' + location.href = '/jgThinking/' + // window.open("http://210.76.82.26/wr-portal/login", "_self"); }) }) diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/clockingIn.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/clockingIn.vue index ce6f4b59..85f734e4 100644 --- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/clockingIn.vue +++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/clockingIn.vue @@ -553,7 +553,7 @@ export default { let arr = []; let successNo = 0; this.da.map((v) => { - console.log(7777, v); + // console.log(7777, v); let obj = {}; obj.attendanceDay = v["考勤天数"]; //ip是表的标题 diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/index.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/index.vue index 3a22f666..a0fedcc5 100644 --- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/index.vue +++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/index.vue @@ -36,6 +36,7 @@ @@ -132,7 +133,11 @@ name="sgProjectmanager" :lazy="true" > - + + + + + + + + @@ -381,10 +416,11 @@ import { updateConstructionAttendance, exportConstructionAttendance, } from "@/api/build/constructionAttendance"; +import { listInfo } from "@/api/build/enteInfo"; export default { name: "ProjectManagement", - props: ["proNo", "proCode"], + props: ["proNo", "proCode", "isApproval"], data() { return { // 遮罩层 @@ -415,6 +451,7 @@ export default { pageSize: 10, ids: null, data: { + belowUnit: null, name: null, phone: null, idNo: null, @@ -433,6 +470,9 @@ export default { form: {}, // 表单校验 rules: { + belowUnit: [ + { required: true, message: "请选择所属单位", trigger: "change" }, + ], name: [{ required: true, message: "请输入姓名", trigger: "blur" }], phone: [{ required: true, message: "请输入手机号", trigger: "blur" }], idNo: [{ required: true, message: "请输入身份证", trigger: "blur" }], @@ -455,6 +495,14 @@ export default { ], }, expands: [], + // 施工单位 + firmInfo: [], + firmInfoQuery: { + data: { + proNo: this.proNo, + proCode: this.proCode, + }, + }, }; }, created() { @@ -462,6 +510,12 @@ export default { this.getDicts("project_management_position").then((response) => { this.postOptions = response.data; }); + listInfo(this.firmInfoQuery).then((response) => { + this.firmInfo = response.data.enterpriseInfoList.filter( + (item) => item.enterpriseType == "1" + ); + console.log(" this.firmInfo", this.firmInfo); + }); }, methods: { handleAddRecord(row) { @@ -529,6 +583,9 @@ export default { this.$message.warning("请选择要删除的数据！！"); } }, + getSocialCreditCode(firmData) { + this.form.socialCreditCode = firmData.socialCreditCode; + }, /** 查询项目管理人员列表 */ getList() { this.loading = true; @@ -559,6 +616,7 @@ export default { post: null, proNo: null, prCodeo: null, + belowUnit: null, }; this.resetForm("form"); }, @@ -575,6 +633,7 @@ export default { post: null, proNo: null, prCodeo: null, + belowUnit: null, }, // 排序方式 params: { diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg/options/sectionProject.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg/options/sectionProject.vue index 0fe65c73..e2295ebc 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg/options/sectionProject.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg/options/sectionProject.vue @@ -1064,7 +1064,7 @@ + - + + + + + + + + + + + +
确 定 @@ -1719,27 +1737,41 @@ export default { let arr = []; let successNo = 0; this.da.map((v) => { - console.log(7777, v); + // console.log(7777, v); let obj = {}; obj.sectionName = v["标段名称(必填)"]; //ip是表的标题 - obj.projectName = v["相关项目名称(必填)"]; //ip是表的标题 + obj.projectLegalPerson = v["项目法人单位"]; //ip是表的标题 - // obj.nativePlace = v["法定代表人电话"]; //ip是表的标题 - obj.engineeringGrade = v["工程等别"]; //ip是表的标题 - obj.engineeringPurposes = v["工程用途"]; //ip是表的标题 + obj.projectSuperintendent = v["项目负责人"]; //ip是表的标题 + obj.projectSuperintendentPhone = v["项目负责人电话"]; //ip是表的标题 + obj.projectUnitLegal = v["单位法定代表人"]; //ip是表的标题 + obj.projectUnitLegalPhone = v["单位法定代表人电话"]; //ip是表的标题 + obj.constructionAddress = v["建设地址"]; //ip是表的标题 - obj.adcd = v["行政区划"]; //ip是表的标题 + obj.constructionNature = v["建设性质:除险加固,扩建,改建,新建"]; //ip是表的标题 + obj.adcd = v["行政区划,格式xx省/xx市/xx区"]; //ip是表的标题 + let commencementDate = v["开工日期"]; + commencementDate = new Date( + commencementDate.setSeconds(commencementDate.getSeconds() + 44) + ); obj.commencementDate = _this.parseTime( - v["开工日期"], + commencementDate, "{y}-{m}-{d}" ); //ip是表的标题 + let plannedCompletionDate = v["计划竣工日期"]; + plannedCompletionDate = new Date( + plannedCompletionDate.setSeconds( + plannedCompletionDate.getSeconds() + 44 + ) + ); obj.plannedCompletionDate = _this.parseTime( - v["计划竣工日期"], + plannedCompletionDate, "{y}-{m}-{d}" - ); //ip是表的标题 - obj.isKeyProject = v["是否为安全度汛重点工程"]; //ip是表的标题 - obj.isPierceProject = v["是否穿破堤坝施工"]; //ip是表的标题 - if (obj.sectionName && obj.projectName) { + ); + + obj.isKeyProject = v["是否为安全度汛重点工程,填:是或否"]; //ip是表的标题 + obj.isPierceProject = v["是否穿破堤坝施工,填:是或否"]; //ip是表的标题 + if (obj.sectionName) { successNo += 1; arr.push(obj); } @@ -2140,7 +2172,7 @@ export default { // console.log(111, this.projectName); this.form.projectName = this.projectName; this.open = true; - this.title = "添加目标段信息"; + this.title = "添加项目标段信息"; }, handleUpdate(row) { this.reset(); diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectAcceptance.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectAcceptance.vue index d49c3c42..1ee8c75b 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectAcceptance.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectAcceptance.vue @@ -387,7 +387,10 @@ - + - + +
+ + + {{ item.routeName }} + + + + + + + + + + + + + + + 重置 + + + + + + + + + + + + + + + + + + + + +
+ + diff --git a/jwtech-admin-page/vue.config.js b/jwtech-admin-page/vue.config.js index 5d617746..b9b33be3 100644 --- a/jwtech-admin-page/vue.config.js +++ b/jwtech-admin-page/vue.config.js @@ -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" ? "/jgThinking" : "/jgThinking", // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） outputDir: 'dist', // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）