Browse Source

修改

dev_kxc
xzt 10 months ago
parent
commit
99edce236f
  1. 2
      jwtech-admin-page/.env.development
  2. 2
      jwtech-admin-page/.env.production
  3. 11
      jwtech-admin-page/src/api/projectStatistics/worker.js
  4. 3
      jwtech-admin-page/src/layout/components/Navbar.vue
  5. 1
      jwtech-admin-page/src/router/index.js
  6. 8
      jwtech-admin-page/src/utils/request.js
  7. 2
      jwtech-admin-page/src/views/building/peasantWorkerSystem/options/clockingIn.vue
  8. 7
      jwtech-admin-page/src/views/building/peasantWorkerSystem/options/index.vue
  9. 25
      jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue
  10. 63
      jwtech-admin-page/src/views/building/peasantWorkerSystem/options/sgProjectmanager.vue
  11. 62
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg/options/sectionProject.vue
  12. 5
      jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectAcceptance.vue
  13. 2
      jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue
  14. 5
      jwtech-admin-page/src/views/projectStatistics/projectProcess/projectAcceptance.vue
  15. 401
      jwtech-admin-page/src/views/projectStatistics/projectStatisticsWorker/index.vue
  16. 2
      jwtech-admin-page/vue.config.js

2
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.113:8081/data-admin/'
# VUE_APP_BASE_API = 'http://192.168.1.20:19084/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/' VUE_APP_FAST_BASE_URL = 'http://192.168.1.20:9080/'

2
jwtech-admin-page/.env.production

@ -2,5 +2,5 @@
ENV = 'admin' ENV = 'admin'
# 若依管理系统/生产环境 # 若依管理系统/生产环境
VUE_APP_BASE_API = '/thinking' VUE_APP_BASE_API = '/jgThinking/thinking'
VUE_APP_FAST_BASE_URL = 'http://192.168.1.20:9080/' VUE_APP_FAST_BASE_URL = 'http://192.168.1.20:9080/'

11
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
})
}

3
jwtech-admin-page/src/layout/components/Navbar.vue

@ -222,7 +222,8 @@ export default {
type: "warning", type: "warning",
}).then(() => { }).then(() => {
this.$store.dispatch("LogOut").then(() => { this.$store.dispatch("LogOut").then(() => {
location.href = "/index"; location.href = "/jgThinking/";
// window.open("http://210.76.82.26/wr-portal/login", "_self");
}); });
}); });
}, },

1
jwtech-admin-page/src/router/index.js

@ -203,6 +203,7 @@ const router = new Router({
mode: 'hash', mode: 'hash',
// mode: 'history', // 去掉url中的# // mode: 'history', // 去掉url中的#
// base:"/admin/", // base:"/admin/",
base: "/jgThinking/",
scrollBehavior: () => ({ y: 0 }), scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes routes: constantRoutes
}) })

8
jwtech-admin-page/src/utils/request.js

@ -38,7 +38,7 @@ service.interceptors.response.use(res => {
// console.log('res',res); // console.log('res',res);
// console.log('code', code); // console.log('code', code);
// 登录成功提示 // 登录成功提示
if (code == 200 && res.config.url=="/thinking/login") { if (code == 200 && res.config.url=="/jgThinking/thinking/login") {
Message({ Message({
message: "登录成功", message: "登录成功",
type: 'success' type: 'success'
@ -54,7 +54,8 @@ service.interceptors.response.use(res => {
} }
).then(() => { ).then(() => {
store.dispatch('LogOut').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(() => { ).then(() => {
store.dispatch('LogOut').then(() => { store.dispatch('LogOut').then(() => {
location.href = '/index' location.href = '/jgThinking/'
// window.open("http://210.76.82.26/wr-portal/login", "_self");
}) })
}) })

2
jwtech-admin-page/src/views/building/peasantWorkerSystem/options/clockingIn.vue

@ -553,7 +553,7 @@ export default {
let arr = []; let arr = [];
let successNo = 0; let successNo = 0;
this.da.map((v) => { this.da.map((v) => {
console.log(7777, v); // console.log(7777, v);
let obj = {}; let obj = {};
obj.attendanceDay = v["考勤天数"]; //ip obj.attendanceDay = v["考勤天数"]; //ip

7
jwtech-admin-page/src/views/building/peasantWorkerSystem/options/index.vue

@ -36,6 +36,7 @@
<realNameSystem <realNameSystem
:proNo="formData.proNo" :proNo="formData.proNo"
:proCode="formData.proCode" :proCode="formData.proCode"
:isApproval="formData.isApproval"
v-if="formData.proNo" v-if="formData.proNo"
/> />
</el-tab-pane> </el-tab-pane>
@ -132,7 +133,11 @@
name="sgProjectmanager" name="sgProjectmanager"
:lazy="true" :lazy="true"
> >
<sgProjectmanager :proNo="formData.proNo" :proCode="formData.proCode" /> <sgProjectmanager
:proNo="formData.proNo"
:proCode="formData.proCode"
:isApproval="formData.isApproval"
/>
</el-tab-pane> </el-tab-pane>
<el-tab-pane <el-tab-pane
v-if="checkPermi(['building:nmgsmzgl:jlglry'])" v-if="checkPermi(['building:nmgsmzgl:jlglry'])"

25
jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue

@ -407,6 +407,7 @@
clearable clearable
size="small" size="small"
style="width: 100%" style="width: 100%"
v-if="isApproval == 1"
> >
<el-option <el-option
v-for="dict in firmInfo" v-for="dict in firmInfo"
@ -416,6 +417,11 @@
@click.native="getSocialCreditCode(dict)" @click.native="getSocialCreditCode(dict)"
/> />
</el-select> </el-select>
<el-input
v-model="form.belowUnit"
placeholder="请输入所属施工单位"
v-else
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="24"> <!-- <el-col :span="24">
@ -686,7 +692,7 @@ import { getToken } from "@/utils/auth";
export default { export default {
name: "RealName", name: "RealName",
props: ["proNo", "proCode"], props: ["proNo", "proCode", "isApproval"],
data() { data() {
return { return {
// //
@ -944,7 +950,7 @@ export default {
let arr = []; let arr = [];
let successNo = 0; let successNo = 0;
this.da.map((v) => { this.da.map((v) => {
console.log(7777, v); // console.log(7777, v);
let obj = {}; let obj = {};
obj.idNo = v["身份证(必填)"]; //ip obj.idNo = v["身份证(必填)"]; //ip
obj.name = v["姓名(必填)"]; //ip obj.name = v["姓名(必填)"]; //ip
@ -953,8 +959,19 @@ export default {
obj.nativePlace = v["籍贯"]; //ip obj.nativePlace = v["籍贯"]; //ip
obj.politicalAffiliation = v["政治面貌"]; //ip obj.politicalAffiliation = v["政治面貌"]; //ip
obj.belowUnit = v["所属单位"]; //ip obj.belowUnit = v["所属单位"]; //ip
obj.admissionTime = _this.parseTime(v["进场日期"], "{y}-{m}-{d}"); //ip
obj.exitTime = _this.parseTime(v["退场日期"], "{y}-{m}-{d}"); //ip let admissionTime = v["进场日期"];
admissionTime = new Date(
admissionTime.setSeconds(admissionTime.getSeconds() + 44)
);
obj.admissionTime = _this.parseTime(admissionTime, "{y}-{m}-{d}"); //ip
let exitTime = v["退场日期"];
exitTime = new Date(
exitTime.setSeconds(exitTime.getSeconds() + 44)
);
obj.exitTime = _this.parseTime(exitTime, "{y}-{m}-{d}");
// obj.admissionTime = _this.parseTime(v[""], "{y}-{m}-{d}"); //ip
// obj.exitTime = _this.parseTime(v["退"], "{y}-{m}-{d}"); //ip
if (obj.idNo && obj.name && obj.phone) { if (obj.idNo && obj.name && obj.phone) {
successNo += 1; successNo += 1;
arr.push(obj); arr.push(obj);

63
jwtech-admin-page/src/views/building/peasantWorkerSystem/options/sgProjectmanager.vue

@ -197,6 +197,12 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" width="50" align="center" /> <el-table-column label="序号" type="index" width="50" align="center" />
<el-table-column
label="所属施工单位"
align="center"
prop="belowUnit"
min-width="120"
/>
<el-table-column <el-table-column
label="姓名" label="姓名"
align="center" align="center"
@ -274,7 +280,36 @@
append-to-body append-to-body
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="所属施工单位" prop="belowUnit">
<!-- <el-input
v-model="form.belowUnit"
placeholder="请输入所属施工单位"
/> -->
<el-select
v-model="form.belowUnit"
placeholder="请选择所属施工单位"
filterable
clearable
size="small"
style="width: 100%"
v-if="isApproval == 1"
>
<el-option
v-for="dict in firmInfo"
:key="dict.id"
:label="dict.enterpriseName"
:value="dict.enterpriseName"
@click.native="getSocialCreditCode(dict)"
/>
</el-select>
<el-input
v-model="form.belowUnit"
placeholder="请输入所属施工单位"
v-else
/>
</el-form-item>
<el-form-item label="姓名" prop="name"> <el-form-item label="姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入姓名" /> <el-input v-model="form.name" placeholder="请输入姓名" />
</el-form-item> </el-form-item>
@ -381,10 +416,11 @@ import {
updateConstructionAttendance, updateConstructionAttendance,
exportConstructionAttendance, exportConstructionAttendance,
} from "@/api/build/constructionAttendance"; } from "@/api/build/constructionAttendance";
import { listInfo } from "@/api/build/enteInfo";
export default { export default {
name: "ProjectManagement", name: "ProjectManagement",
props: ["proNo", "proCode"], props: ["proNo", "proCode", "isApproval"],
data() { data() {
return { return {
// //
@ -415,6 +451,7 @@ export default {
pageSize: 10, pageSize: 10,
ids: null, ids: null,
data: { data: {
belowUnit: null,
name: null, name: null,
phone: null, phone: null,
idNo: null, idNo: null,
@ -433,6 +470,9 @@ export default {
form: {}, form: {},
// //
rules: { rules: {
belowUnit: [
{ required: true, message: "请选择所属单位", trigger: "change" },
],
name: [{ required: true, message: "请输入姓名", trigger: "blur" }], name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
phone: [{ required: true, message: "请输入手机号", trigger: "blur" }], phone: [{ required: true, message: "请输入手机号", trigger: "blur" }],
idNo: [{ required: true, message: "请输入身份证", trigger: "blur" }], idNo: [{ required: true, message: "请输入身份证", trigger: "blur" }],
@ -455,6 +495,14 @@ export default {
], ],
}, },
expands: [], expands: [],
//
firmInfo: [],
firmInfoQuery: {
data: {
proNo: this.proNo,
proCode: this.proCode,
},
},
}; };
}, },
created() { created() {
@ -462,6 +510,12 @@ export default {
this.getDicts("project_management_position").then((response) => { this.getDicts("project_management_position").then((response) => {
this.postOptions = response.data; 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: { methods: {
handleAddRecord(row) { handleAddRecord(row) {
@ -529,6 +583,9 @@ export default {
this.$message.warning("请选择要删除的数据!!"); this.$message.warning("请选择要删除的数据!!");
} }
}, },
getSocialCreditCode(firmData) {
this.form.socialCreditCode = firmData.socialCreditCode;
},
/** 查询项目管理人员列表 */ /** 查询项目管理人员列表 */
getList() { getList() {
this.loading = true; this.loading = true;
@ -559,6 +616,7 @@ export default {
post: null, post: null,
proNo: null, proNo: null,
prCodeo: null, prCodeo: null,
belowUnit: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -575,6 +633,7 @@ export default {
post: null, post: null,
proNo: null, proNo: null,
prCodeo: null, prCodeo: null,
belowUnit: null,
}, },
// //
params: { params: {

62
jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg/options/sectionProject.vue

@ -1064,7 +1064,7 @@
<el-dialog <el-dialog
title="批量导入" title="批量导入"
:visible.sync="uploadParams.addAllOpen" :visible.sync="uploadParams.addAllOpen"
width="1200px" width="1600px"
append-to-body append-to-body
:close-on-click-modal="false" :close-on-click-modal="false"
@closed="closeTemplate" @closed="closeTemplate"
@ -1120,8 +1120,26 @@
style="width: 100%" style="width: 100%"
max-height="250" max-height="250"
> >
<el-table-column label="序号" type="index" width="50" align="center" />
<el-table-column prop="sectionName" label="标段名称" /> <el-table-column prop="sectionName" label="标段名称" />
<el-table-column prop="projectName" label="项目名称" /> <el-table-column prop="projectLegalPerson" label="项目法人单位" />
<el-table-column prop="projectSuperintendent" label="项目负责人" />
<el-table-column
prop="projectSuperintendentPhone"
label="项目负责人电话"
/>
<el-table-column prop="projectUnitLegal" label="单位法定代表人" />
<el-table-column
prop="projectUnitLegalPhone"
label="单位法定代表人电话"
/>
<el-table-column prop="constructionAddress" label="建设地址" />
<el-table-column prop="constructionNature" label="建设性质" />
<el-table-column prop="adcd" label="行政区划" />
<el-table-column prop="commencementDate" label="开工日期" />
<el-table-column prop="plannedCompletionDate" label="计划竣工日期" />
<el-table-column prop="isKeyProject" label="是否为安全度汛重点工程" />
<el-table-column prop="isPierceProject" label="是否穿破堤坝施工" />
</el-table> </el-table>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitTemplate"> </el-button> <el-button type="primary" @click="submitTemplate"> </el-button>
@ -1719,27 +1737,41 @@ export default {
let arr = []; let arr = [];
let successNo = 0; let successNo = 0;
this.da.map((v) => { this.da.map((v) => {
console.log(7777, v); // console.log(7777, v);
let obj = {}; let obj = {};
obj.sectionName = v["标段名称(必填)"]; //ip obj.sectionName = v["标段名称(必填)"]; //ip
obj.projectName = v["相关项目名称(必填)"]; //ip
obj.projectLegalPerson = v["项目法人单位"]; //ip obj.projectLegalPerson = v["项目法人单位"]; //ip
// obj.nativePlace = v[""]; //ip obj.projectSuperintendent = v["项目负责人"]; //ip
obj.engineeringGrade = v["工程等别"]; //ip obj.projectSuperintendentPhone = v["项目负责人电话"]; //ip
obj.engineeringPurposes = v["工程用途"]; //ip obj.projectUnitLegal = v["单位法定代表人"]; //ip
obj.projectUnitLegalPhone = v["单位法定代表人电话"]; //ip
obj.constructionAddress = 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( obj.commencementDate = _this.parseTime(
v["开工日期"], commencementDate,
"{y}-{m}-{d}" "{y}-{m}-{d}"
); //ip ); //ip
let plannedCompletionDate = v["计划竣工日期"];
plannedCompletionDate = new Date(
plannedCompletionDate.setSeconds(
plannedCompletionDate.getSeconds() + 44
)
);
obj.plannedCompletionDate = _this.parseTime( obj.plannedCompletionDate = _this.parseTime(
v["计划竣工日期"], plannedCompletionDate,
"{y}-{m}-{d}" "{y}-{m}-{d}"
); //ip );
obj.isKeyProject = v["是否为安全度汛重点工程"]; //ip
obj.isPierceProject = v["是否穿破堤坝施工"]; //ip obj.isKeyProject = v["是否为安全度汛重点工程,填:是或否"]; //ip
if (obj.sectionName && obj.projectName) { obj.isPierceProject = v["是否穿破堤坝施工,填:是或否"]; //ip
if (obj.sectionName) {
successNo += 1; successNo += 1;
arr.push(obj); arr.push(obj);
} }
@ -2140,7 +2172,7 @@ export default {
// console.log(111, this.projectName); // console.log(111, this.projectName);
this.form.projectName = this.projectName; this.form.projectName = this.projectName;
this.open = true; this.open = true;
this.title = "添加目标段信息"; this.title = "添加目标段信息";
}, },
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();

5
jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/projectAcceptance.vue

@ -387,7 +387,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="合同完工验收鉴定书" prop="acceptanceDecisionLetter"> <el-form-item
label="合同完工验收鉴定书"
prop="acceptanceDecisionLetter"
>
<!-- <el-input v-model="form.acceptanceDecisionLetter" placeholder="请输入合同完工验收鉴定书" /> --> <!-- <el-input v-model="form.acceptanceDecisionLetter" placeholder="请输入合同完工验收鉴定书" /> -->
<el-upload <el-upload
class="upload-demo" class="upload-demo"

2
jwtech-admin-page/src/views/project/bid/options/TenderAnnouncementPage.vue

@ -1077,7 +1077,7 @@ export default {
placeholder: "请输入招标内容", placeholder: "请输入招标内容",
// MENU_CONF: { // MENU_CONF: {
// uploadImage: { // uploadImage: {
// server: "thinking/common/upload", // server: "common/upload",
// headers: { jianwei: "jwtech " + getToken() }, // headers: { jianwei: "jwtech " + getToken() },
// }, // },
// }, // },

5
jwtech-admin-page/src/views/projectStatistics/projectProcess/projectAcceptance.vue

@ -387,7 +387,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="合同完工验收鉴定书" prop="acceptanceDecisionLetter"> <el-form-item
label="合同完工验收鉴定书"
prop="acceptanceDecisionLetter"
>
<!-- <el-input v-model="form.acceptanceDecisionLetter" placeholder="请输入合同完工验收鉴定书" /> --> <!-- <el-input v-model="form.acceptanceDecisionLetter" placeholder="请输入合同完工验收鉴定书" /> -->
<el-upload <el-upload
class="upload-demo" class="upload-demo"

401
jwtech-admin-page/src/views/projectStatistics/projectStatisticsWorker/index.vue

@ -0,0 +1,401 @@
<template>
<div class="app-container">
<!-- 面包屑 -->
<el-breadcrumb separator="/" style="margin-bottom: 20px">
<el-breadcrumb-item
v-for="(item, index) in routeList"
:key="item + index"
:to="{ path: item.path }"
>{{ item.routeName }}</el-breadcrumb-item
>
</el-breadcrumb>
<el-form
:model="queryParams"
ref="queryForm"
:inline="true"
v-show="showSearch"
>
<el-form-item label="项目类型" prop="projectType">
<el-cascader
v-model="queryParams.data.projectType"
:options="projectTypeoptions"
:props="projectTypeOptionProps"
@change="handleQuery"
placeholder="请选择项目类型"
clearable
size="small"
style="width: 100%"
></el-cascader>
<!-- <el-select
v-model="queryParams.data.projectType"
placeholder="请选择项目类型"
@change="handleQuery"
clearable
size="small"
:popper-append-to-body="false"
>
<el-option-group
v-for="(group, index) in projectTypeoptions"
:key="group.label"
:label="group.label"
>
<el-option
v-for="dict in group.options"
:key="dict.dictValue + dict.dictLabel"
:label="dict.dictLabel"
:value="index + dict.dictValue"
>
</el-option>
</el-option-group>
</el-select> -->
</el-form-item>
<el-form-item label="项目名称" prop="projectName">
<el-input
v-model="queryParams.data.projectName"
placeholder="请输入项目名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
>
<el-button
type="primary"
slot="append"
icon="el-icon-search"
size="small"
@click="handleQuery"
></el-button>
</el-input>
</el-form-item>
<el-form-item>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>重置</el-button
>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="infoList">
<el-table-column type="expand" prop="children">
<template slot-scope="props">
<el-table
v-loading="loading"
:data="props.row.children"
:row-key="(row) => row.currentTime"
:expand-row-keys="expands"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<!-- <el-table-column
label="序号"
type="index"
width="50"
align="center"
/> -->
<el-table-column
label="项目名称"
align="center"
prop="projectName"
min-width="180"
/>
<el-table-column
label="当前统计时间"
align="center"
prop="currentTime"
min-width="120"
/>
<el-table-column
label="农民工总数"
align="center"
prop="totalNum"
min-width="120"
/>
<el-table-column
label="农民工在场数"
align="center"
prop="presentNum"
min-width="120"
/>
<el-table-column
label="农民工退场数"
align="center"
prop="exitNum"
min-width="120"
/>
<el-table-column
label="发放工资总数"
align="center"
prop="totalSalary"
min-width="120"
/>
<el-table-column
label="是否有拖欠工资"
align="center"
prop="unpaidWages"
min-width="120"
/>
<el-table-column
label="总拖欠工资"
align="center"
prop="unpaidWagesAmount"
min-width="120"
/>
</el-table>
</template>
</el-table-column>
<el-table-column label="序号" type="index" width="50" align="center" />
<el-table-column
label="项目名称"
align="center"
prop="projectName"
min-width="120"
/>
<!-- <el-table-column
label="当前统计时间"
align="center"
prop="currentTime"
min-width="120"
/>
<el-table-column
label="农民工总数"
align="center"
prop="totalNum"
min-width="120"
/>
<el-table-column
label="农民工在场数"
align="center"
prop="presentNum"
min-width="120"
/>
<el-table-column
label="农民工退场数"
align="center"
prop="exitNum"
min-width="120"
/>
<el-table-column
label="发放工资总数"
align="center"
prop="totalSalary"
min-width="120"
/>
<el-table-column
label="是否有拖欠工资"
align="center"
prop="unpaidWages"
min-width="120"
/>
<el-table-column
label="总拖欠工资"
align="center"
prop="unpaidWagesAmount"
min-width="120"
/> -->
<!-- <el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
min-width="180"
fixed="right"
>
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
v-hasPermi="['projectStatisticsProgress:info:view']"
@click="viewInfo(scope.row)"
>查看</el-button
>
</template>
</el-table-column> -->
</el-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import { listProjectWorker } from "@/api/projectStatistics/worker";
export default {
data() {
return {
//
routeList: [
{
path: "/projectStatistics/projectStatisticsWorker",
routeName: "农民工统计",
},
],
infoList: [],
loading: true,
//
showSearch: true,
total: 0,
//
queryParams: {
pageNum: 1,
pageSize: 10,
ids: null,
data: {},
//
params: {
//
orderBy: "create_time",
// descasc
sortBy: "desc",
},
},
projectTypeOptionProps: {
emitPath: false,
checkStrictly: true, //
},
//
zd_projectTypeOptions: [],
//
ms_projectTypeOptions: [],
expands: [],
};
},
computed: {
projectTypeoptions() {
// let op = [
// {
// label: "",
// options: this.zd_projectTypeOptions,
// },
// {
// label: "",
// options: this.ms_projectTypeOptions,
// },
// ];
let op = [
{
label: "重大项目",
value: "zd, ",
children: this.zd_projectTypeOptions.map((item) => {
return {
label: item.dictLabel,
value: "zd," + item.dictValue,
};
}),
},
{
label: "面上项目",
value: "ms, ",
children: this.ms_projectTypeOptions.map((item) => {
return {
label: item.dictLabel,
value: "ms," + item.dictValue,
};
}),
},
];
// console.log(3333, op);
return op;
},
},
created() {
this.getList();
this.getDicts("major_project").then((response) => {
this.zd_projectTypeOptions = response.data;
});
this.getDicts("general_project").then((response) => {
this.ms_projectTypeOptions = response.data;
});
},
methods: {
getList() {
this.loading = true;
listProjectWorker(this.queryParams).then((res) => {
this.infoList = res.records;
console.log(77777, res);
// this.total = res.total;
this.loading = false;
});
},
//
viewInfo(row) {
// this.proMsg = row;
// console.log("proMsg", row);
// this.viewOpen = true;
this.routeList[0].routeName = row.projectName;
this.routeList.push({
path: "/projectStatistics/projectProcess",
routeName: row.proCode,
isEdit: true,
});
//
this.$store.commit("setRouteList", JSON.stringify(this.routeList));
//
// this.$store.commit("setBaseFormData", JSON.stringify(response.data));
//
this.$router.push({
// path: "/project/special/options",
path:
"/projectStatistics/projectProcess?activeName=scheduleManagement&baseDataId=" +
row.id,
});
},
//
projectTypeFormat(row, column) {
if (row.isMajor == "zd") {
return this.selectDictLabel(
this.zd_projectTypeOptions,
row.projectType
);
} else if (row.isMajor == "ms") {
return this.selectDictLabel(
this.ms_projectTypeOptions,
row.projectType
);
}
},
//
resetQueryForm() {
this.queryParams = {
pageNum: 1,
pageSize: 10,
data: {},
//
params: {
//
orderBy: "create_time",
// descasc
sortBy: "desc",
},
};
this.resetForm("queryForm");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetQueryForm();
this.handleQuery();
},
},
};
</script>

2
jwtech-admin-page/vue.config.js

@ -18,7 +18,7 @@ module.exports = {
// 部署生产环境和开发环境下的URL。 // 部署生产环境和开发环境下的URL。
// 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。 // 例如 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) // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist)
outputDir: 'dist', outputDir: 'dist',
// 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下) // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)

Loading…
Cancel
Save