Browse Source

update

master
KeXuCong 2 weeks ago
parent
commit
dd5440bcf2
  1. 7
      jwtech-admin-page/src/api/build/progressInfo.js
  2. 9
      jwtech-admin-page/src/api/site/personnelAttendanceStatistics.js
  3. 51
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/scheduleManagement/options/progressFilling.vue
  4. 50
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/deviceInformation/index.vue
  5. 11
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/index.vue
  6. 4
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/loInformation/index.vue
  7. 4
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/monitoring/index.vue
  8. 4
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/noiseMonitoring/index.vue
  9. 4
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/output/index.vue
  10. 98
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/personnelAttendanceStatistics/index.vue
  11. 4
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/qualityMonitoring/index.vue
  12. 4
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/record/index.vue
  13. 4
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/track/index.vue
  14. 4
      jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/vehicleInformation/index.vue
  15. 8
      jwtech-admin-page/src/views/project/special/options/documentPage.vue
  16. 11
      jwtech-admin-page/src/views/project/special/options/resultsManagement.vue
  17. 4
      jwtech-admin-page/vue.config.js

7
jwtech-admin-page/src/api/build/progressInfo.js

@ -51,3 +51,10 @@ export function exportInfo(query) {
params: query params: query
}) })
} }
// 表格统计数据
export function workEfficiencyStatistics(id) {
return request({
url: `/progress/info/workEfficiencyStatistics/${id}`,
method: 'get',
})
}

9
jwtech-admin-page/src/api/site/personnelAttendanceStatistics.js

@ -0,0 +1,9 @@
import request from "@/utils/request";
// 查询项目人员名单信息列表
export function personnelAttendanceStatistics(proNo) {
return request({
url: `/site/personDetails/personnelAttendanceStatistics/${proNo}`,
method: "get",
});
}

51
jwtech-admin-page/src/views/building/projectInfo/projectProcess/scheduleManagement/options/progressFilling.vue

@ -489,6 +489,20 @@
</el-popconfirm> </el-popconfirm>
</div> </div>
</div> </div>
<div class="table" style="margin-top: 20px;">
<el-table
:data="workEfficiencyStatisticsList"
border
show-summary
style="width: 100%"
>
<el-table-column prop="year" label="年度" width="100">
</el-table-column>
<el-table-column prop="completeWorkload" label="年度累计完成工作量(万元)"> </el-table-column>
<el-table-column prop="investmentBenefits" label="年度累计投资效益(万元)">
</el-table-column>
</el-table>
</div>
</div> </div>
<div class="con_middle" v-if="detailMsgList.length !== 0"> <div class="con_middle" v-if="detailMsgList.length !== 0">
<div <div
@ -621,6 +635,22 @@
type="textarea" type="textarea"
/> />
</el-form-item> </el-form-item>
<el-form-item label="完成工作量" prop="completeWorkload">
<el-input
v-model="form.completeWorkload"
placeholder="请输入完成工作量"
>
<template slot="append">万元</template>
</el-input>
</el-form-item>
<el-form-item label="投资效益" prop="investmentBenefits">
<el-input
v-model="form.investmentBenefits"
placeholder="请输入投资效益"
>
<template slot="append">万元</template>
</el-input>
</el-form-item>
<el-form-item label="现场图片" prop="sceneImages"> <el-form-item label="现场图片" prop="sceneImages">
<!-- <el-input v-model="form.sceneImages" placeholder="请输入现场图片" /> --> <!-- <el-input v-model="form.sceneImages" placeholder="请输入现场图片" /> -->
<!-- <myUpload :fileList="fileList" /> --> <!-- <myUpload :fileList="fileList" /> -->
@ -709,6 +739,7 @@ import {
addInfo, addInfo,
updateInfo, updateInfo,
exportInfo, exportInfo,
workEfficiencyStatistics
} from "@/api/build/progressInfo"; } from "@/api/build/progressInfo";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload"; import { getFileStream } from "@/api/system/upload";
@ -823,6 +854,12 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
completeWorkload:[
{pattern: /^[0-9]*$/, message: '工作量需为数字', trigger: 'blur'}
],
investmentBenefits:[
{pattern: /^[0-9]*$/, message: '投资效益需为数字', trigger: 'blur'}
]
}, },
// //
zd_projectTypeOptions: [], zd_projectTypeOptions: [],
@ -841,6 +878,7 @@ export default {
detailMsg: {}, detailMsg: {},
detailMsgList: [], detailMsgList: [],
stageTime: "", stageTime: "",
workEfficiencyStatisticsList: [],
}; };
}, },
computed: { computed: {
@ -884,8 +922,15 @@ export default {
this.getDicts("Construction_status").then((response) => { this.getDicts("Construction_status").then((response) => {
this.constructionStatusOptions = response.data; this.constructionStatusOptions = response.data;
}); });
this.getWorkEfficiencyStatistics()
}, },
methods: { methods: {
getWorkEfficiencyStatistics(){
workEfficiencyStatistics(this.proNo).then(res=>{
console.log('表格数据---------------',res);
this.workEfficiencyStatisticsList = res.data
})
},
submitUpload(response, file, fileList) { submitUpload(response, file, fileList) {
console.log(55555, file); console.log(55555, file);
this.fileList.push({ this.fileList.push({
@ -991,6 +1036,7 @@ export default {
// console.log(7777, new Date().getFullYear(), this.stageTime); // console.log(7777, new Date().getFullYear(), this.stageTime);
this.isDetail = true; this.isDetail = true;
this.getDetailMsg(); this.getDetailMsg();
this.getWorkEfficiencyStatistics()
}, },
getDetailMsg() { getDetailMsg() {
listInfo({ listInfo({
@ -1163,6 +1209,8 @@ export default {
descriptionProgress: null, descriptionProgress: null,
sceneImages: null, sceneImages: null,
progressPlanId: null, progressPlanId: null,
completeWorkload: null,
investmentBenefits: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -1173,6 +1221,7 @@ export default {
this.msgSuccess("上报成功"); this.msgSuccess("上报成功");
this.getDetail(this.progressPlanId); this.getDetail(this.progressPlanId);
this.getDetailMsg(); this.getDetailMsg();
this.getWorkEfficiencyStatistics()
} }
}); });
}, },
@ -1188,6 +1237,7 @@ export default {
this.progressForm_open = false; this.progressForm_open = false;
this.getDetail(this.progressPlanId); this.getDetail(this.progressPlanId);
this.getDetailMsg(); this.getDetailMsg();
this.getWorkEfficiencyStatistics()
} }
}); });
} else { } else {
@ -1201,6 +1251,7 @@ export default {
this.progressForm_open = false; this.progressForm_open = false;
this.getDetail(this.progressPlanId); this.getDetail(this.progressPlanId);
this.getDetailMsg(); this.getDetailMsg();
this.getWorkEfficiencyStatistics()
} }
}); });
} }

50
jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/deviceInformation/index.vue

@ -87,9 +87,11 @@
<el-table-column type="selection" width="55" align="center" fixed/> <el-table-column type="selection" width="55" align="center" fixed/>
<el-table-column label="序号" type="index" width="50" align="center" fixed/> <el-table-column label="序号" type="index" width="50" align="center" fixed/>
<el-table-column label="设备名称" align="center" prop="name" min-width="120"/> <!-- <el-table-column label="设备名称" align="center" prop="name" min-width="120"/> -->
<el-table-column label="设备名称" align="center" prop="documentType" :formatter="nameTypeFormat" />
<el-table-column label="设备编号" align="center" prop="deviceNo" min-width="120"/> <el-table-column label="设备编号" align="center" prop="deviceNo" min-width="120"/>
<el-table-column label="设备状态" align="center" prop="status" min-width="120"/> <!-- <el-table-column label="设备状态" align="center" prop="status" min-width="120"/> -->
<el-table-column label="设备状态" align="center" prop="status" :formatter="statusTypeFormat" />
<el-table-column label="设备型号/参数" align="center" prop="model" min-width="120"/> <el-table-column label="设备型号/参数" align="center" prop="model" min-width="120"/>
<el-table-column label="所属机构" align="center" prop="unit" min-width="120"/> <el-table-column label="所属机构" align="center" prop="unit" min-width="120"/>
<el-table-column label="设备厂家" align="center" prop="manufacturer" min-width="120"/> <el-table-column label="设备厂家" align="center" prop="manufacturer" min-width="120"/>
@ -129,14 +131,34 @@
<!-- 添加或修改设备基本信息对话框 --> <!-- 添加或修改设备基本信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :close-on-click-modal="false"> <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body :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="80px">
<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 label="设备名称" prop="name">
<el-select v-model="form.name" placeholder="请选择设备名称">
<el-option
v-for="dict in nameTypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备编号" prop="deviceNo"> <el-form-item label="设备编号" prop="deviceNo">
<el-input v-model="form.deviceNo" placeholder="请输入设备编号" /> <el-input v-model="form.deviceNo" placeholder="请输入设备编号" />
</el-form-item> </el-form-item>
<el-form-item label="设备状态" prop="status"> <!-- <el-form-item label="设备状态" prop="status">
<el-input v-model="form.status" placeholder="请输入设备状态" /> <el-input v-model="form.status" placeholder="请输入设备状态" />
</el-form-item> -->
<el-form-item label="设备状态" prop="name">
<el-select v-model="form.status" placeholder="请选择设备状态">
<el-option
v-for="dict in statusTypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="设备型号/参数" prop="model"> <el-form-item label="设备型号/参数" prop="model">
<el-input v-model="form.model" placeholder="请输入设备型号/参数" /> <el-input v-model="form.model" placeholder="请输入设备型号/参数" />
@ -155,9 +177,9 @@
placeholder="选择检查合格日期"> placeholder="选择检查合格日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="检查合格日期" prop="proNo"> <!-- <el-form-item label="检查合格日期" prop="proNo">
<el-input v-model="form.proNo" placeholder="请输入检查合格日期" /> <el-input v-model="form.proNo" placeholder="请输入检查合格日期" />
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>
@ -213,13 +235,27 @@ export default {
form: {}, form: {},
// //
rules: { rules: {
} },
nameTypeOptions: [],
statusTypeOptions: [],
}; };
}, },
created() { created() {
this.getDicts("device_name").then((response) => {
this.nameTypeOptions = response.data;
});
this.getDicts("device_status").then((response) => {
this.statusTypeOptions = response.data;
});
this.getList(); this.getList();
}, },
methods: { methods: {
nameTypeFormat(row, column) {
return this.selectDictLabel(this.nameTypeOptions, row.name);
},
statusTypeFormat(row, column) {
return this.selectDictLabel(this.statusTypeOptions, row.status);
},
/** 查询设备基本信息列表 */ /** 查询设备基本信息列表 */
getList() { getList() {
this.loading = true; this.loading = true;

11
jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/index.vue

@ -95,7 +95,13 @@
:proCode="proCode" :proCode="proCode"
/> />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="人员出勤统计信息" name="personnelAttendanceStatistics">
<personnelAttendanceStatistics
v-if="activeName === 'personnelAttendanceStatistics'"
:proNo="proNo"
:proCode="proCode"
/>
</el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</template> </template>
@ -114,11 +120,12 @@ import trackL from "./track/index.vue";
import record from "./record/index.vue"; import record from "./record/index.vue";
import statistics from "./statistics/index.vue"; import statistics from "./statistics/index.vue";
import qualityMonitoring from "./qualityMonitoring/index.vue"; import qualityMonitoring from "./qualityMonitoring/index.vue";
import personnelAttendanceStatistics from "./personnelAttendanceStatistics/index.vue";
export default { export default {
props: ["projectName", "proNo", "proCode"], props: ["projectName", "proNo", "proCode"],
components: { personnel, personDetails, loInformation, deviceInformation, information,monitoring, components: { personnel, personDetails, loInformation, deviceInformation, information,monitoring,
noiseMonitoring,vehicleInformation,outputL,trackL,record,statistics,qualityMonitoring}, noiseMonitoring,vehicleInformation,outputL,trackL,record,statistics,qualityMonitoring,personnelAttendanceStatistics},
data() { data() {
return { return {
activeName: "personnel", activeName: "personnel",

4
jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/loInformation/index.vue

@ -124,9 +124,9 @@
<el-form-item label="历史轨迹信息" prop="trajectory"> <el-form-item label="历史轨迹信息" prop="trajectory">
<el-input v-model="form.trajectory" placeholder="请输入历史轨迹信息" /> <el-input v-model="form.trajectory" placeholder="请输入历史轨迹信息" />
</el-form-item> </el-form-item>
<el-form-item label="历史轨迹信息" prop="proNo"> <!-- <el-form-item label="历史轨迹信息" prop="proNo">
<el-input v-model="form.proNo" placeholder="请输入历史轨迹信息" /> <el-input v-model="form.proNo" placeholder="请输入历史轨迹信息" />
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>

4
jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/monitoring/index.vue

@ -123,9 +123,9 @@
<el-form-item label="用料偏差报警" prop="deviationWarning"> <el-form-item label="用料偏差报警" prop="deviationWarning">
<el-input v-model="form.deviationWarning" placeholder="请输入用料偏差报警" /> <el-input v-model="form.deviationWarning" placeholder="请输入用料偏差报警" />
</el-form-item> </el-form-item>
<el-form-item label="用料偏差报警" prop="proNo"> <!-- <el-form-item label="用料偏差报警" prop="proNo">
<el-input v-model="form.proNo" placeholder="请输入用料偏差报警" /> <el-input v-model="form.proNo" placeholder="请输入用料偏差报警" />
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>

4
jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/noiseMonitoring/index.vue

@ -131,12 +131,12 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否超标" prop="proNo"> <!-- <el-form-item label="是否超标" prop="proNo">
<el-input v-model="form.proNo" placeholder="请输入是否超标" /> <el-input v-model="form.proNo" placeholder="请输入是否超标" />
</el-form-item> </el-form-item>
<el-form-item label="是否超标" prop="sectionNo"> <el-form-item label="是否超标" prop="sectionNo">
<el-input v-model="form.sectionNo" placeholder="请输入是否超标" /> <el-input v-model="form.sectionNo" placeholder="请输入是否超标" />
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>

4
jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/output/index.vue

@ -135,9 +135,9 @@
<el-form-item label="生产量" prop="productionCapacity"> <el-form-item label="生产量" prop="productionCapacity">
<el-input v-model="form.productionCapacity" placeholder="请输入生产量" /> <el-input v-model="form.productionCapacity" placeholder="请输入生产量" />
</el-form-item> </el-form-item>
<el-form-item label="生产量" prop="proNo"> <!-- <el-form-item label="生产量" prop="proNo">
<el-input v-model="form.proNo" placeholder="请输入生产量" /> <el-input v-model="form.proNo" placeholder="请输入生产量" />
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>

98
jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/personnelAttendanceStatistics/index.vue

@ -0,0 +1,98 @@
<template>
<div class="app-container">
<div
ref="personnelAttendanceStatistics"
style="width: 100%; height: 500px"
></div>
</div>
</template>
<script>
import * as echarts from "echarts";
import { personnelAttendanceStatistics } from "@/api/site/personnelAttendanceStatistics";
export default {
name: "personnelAttendanceStatistics",
props: ["proNo", "proCode"],
data() {
return {
labelOptions: {
noWorkCount: "缺勤人员数",
totle: "总参建人员数",
workCount: "实时在场人员数",
},
};
},
created() {},
mounted() {
this.getPersonnelAttendanceStatistics();
},
methods: {
getPersonnelAttendanceStatistics() {
personnelAttendanceStatistics(this.proNo).then((res) => {
console.log("personnelAttendanceStatistics", res);
this.chartInit(res.data);
});
},
chartInit(dataList) {
let xAxisData = [];
let seriesData = [
{
name: "实时在场人员数",
type: "bar",
data: [],
},
{
name: "总参建人员数",
type: "bar",
data: [],
},
{
name: "缺勤人员数",
type: "bar",
data: [],
},
];
dataList.forEach((item) => {
xAxisData.push(item.dte);
seriesData[0].data.push(item.workCount);
seriesData[1].data.push(item.totle);
seriesData[2].data.push(item.noWorkCount);
});
let myChart = echarts.init(this.$refs.personnelAttendanceStatistics);
let option = {
tooltip: {
trigger: "axis",
axisPointer: {
type: "shadow",
},
},
legend: {},
grid: {
left: "3%",
right: "4%",
bottom: "3%",
containLabel: true,
},
xAxis: {
type: "category",
data: xAxisData,
},
yAxis: {
type: "value",
boundaryGap: [0, 1],
minInterval: 1,
},
series: seriesData,
};
option && myChart.setOption(option);
window.addEventListener("resize", function () {
myChart.resize();
});
},
},
};
</script>
<style lang="scss" scoped></style>

4
jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/qualityMonitoring/index.vue

@ -139,12 +139,12 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否超标" prop="proNo"> <!-- <el-form-item label="是否超标" prop="proNo">
<el-input v-model="form.proNo" placeholder="请输入是否超标" /> <el-input v-model="form.proNo" placeholder="请输入是否超标" />
</el-form-item> </el-form-item>
<el-form-item label="是否超标" prop="sectionNo"> <el-form-item label="是否超标" prop="sectionNo">
<el-input v-model="form.sectionNo" placeholder="请输入是否超标" /> <el-input v-model="form.sectionNo" placeholder="请输入是否超标" />
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>

4
jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/record/index.vue

@ -135,9 +135,9 @@
<el-form-item label="停留时间" prop="stayTime"> <el-form-item label="停留时间" prop="stayTime">
<el-input v-model="form.stayTime" placeholder="请输入停留时间" /> <el-input v-model="form.stayTime" placeholder="请输入停留时间" />
</el-form-item> </el-form-item>
<el-form-item label="停留时间" prop="proNo"> <!-- <el-form-item label="停留时间" prop="proNo">
<el-input v-model="form.proNo" placeholder="请输入停留时间" /> <el-input v-model="form.proNo" placeholder="请输入停留时间" />
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>

4
jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/track/index.vue

@ -136,9 +136,9 @@
<el-form-item label="历史轨迹信息" prop="trajectory"> <el-form-item label="历史轨迹信息" prop="trajectory">
<el-input v-model="form.trajectory" placeholder="请输入历史轨迹信息" /> <el-input v-model="form.trajectory" placeholder="请输入历史轨迹信息" />
</el-form-item> </el-form-item>
<el-form-item label="历史轨迹信息" prop="proNo"> <!-- <el-form-item label="历史轨迹信息" prop="proNo">
<el-input v-model="form.proNo" placeholder="请输入历史轨迹信息" /> <el-input v-model="form.proNo" placeholder="请输入历史轨迹信息" />
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>

4
jwtech-admin-page/src/views/building/projectInfo/projectProcess/site/vehicleInformation/index.vue

@ -148,9 +148,9 @@
<el-form-item label="型号" prop="model"> <el-form-item label="型号" prop="model">
<el-input v-model="form.model" placeholder="请输入型号" /> <el-input v-model="form.model" placeholder="请输入型号" />
</el-form-item> </el-form-item>
<el-form-item label="型号" prop="proNo"> <!-- <el-form-item label="型号" prop="proNo">
<el-input v-model="form.proNo" placeholder="请输入型号" /> <el-input v-model="form.proNo" placeholder="请输入型号" />
</el-form-item> </el-form-item> -->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>

8
jwtech-admin-page/src/views/project/special/options/documentPage.vue

@ -144,7 +144,7 @@
prop="documentName" prop="documentName"
min-width="180" min-width="180"
/> />
<el-table-column label="文档类型" align="center" prop="documentType" :formatter="documentTypeFormat" /> <!-- <el-table-column label="文档类型" align="center" prop="documentType" :formatter="documentTypeFormat" /> -->
<el-table-column <el-table-column
label="项目编号" label="项目编号"
align="left" align="left"
@ -180,7 +180,7 @@
label="操作" label="操作"
align="right" align="right"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
width="180" width="200"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -232,7 +232,7 @@
<el-form-item label="文档名称" prop="documentName"> <el-form-item label="文档名称" prop="documentName">
<el-input v-model="form.documentName" placeholder="请输入文档名称" /> <el-input v-model="form.documentName" placeholder="请输入文档名称" />
</el-form-item> </el-form-item>
<el-form-item label="文档类型" prop="documentType"> <!-- <el-form-item label="文档类型" prop="documentType">
<el-select v-model="form.documentType" placeholder="请选择文档类型"> <el-select v-model="form.documentType" placeholder="请选择文档类型">
<el-option <el-option
v-for="dict in documentTypeOptions" v-for="dict in documentTypeOptions"
@ -241,7 +241,7 @@
:value="dict.dictValue" :value="dict.dictValue"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item <el-form-item
label="文档附件" label="文档附件"
prop="acceptDocumentAttachment" prop="acceptDocumentAttachment"

11
jwtech-admin-page/src/views/project/special/options/resultsManagement.vue

@ -145,6 +145,7 @@
prop="documentName" prop="documentName"
min-width="180" min-width="180"
/> />
<el-table-column label="文档类型" align="center" prop="documentType" :formatter="documentTypeFormat" />
<el-table-column <el-table-column
label="项目编号" label="项目编号"
align="left" align="left"
@ -231,6 +232,16 @@
<el-form ref="form" :model="form" :rules="rules" label-width="160px"> <el-form ref="form" :model="form" :rules="rules" label-width="160px">
<el-form-item label="文档名称" prop="documentName"> <el-form-item label="文档名称" prop="documentName">
<el-input v-model="form.documentName" placeholder="请输入文档名称" /> <el-input v-model="form.documentName" placeholder="请输入文档名称" />
</el-form-item>
<el-form-item label="文档类型" prop="documentType">
<el-select v-model="form.documentType" placeholder="请选择文档类型">
<el-option
v-for="dict in documentTypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="文档附件" label="文档附件"

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

@ -33,14 +33,14 @@ module.exports = {
devServer: { devServer: {
// host: '0.0.0.0', // host: '0.0.0.0',
// host: '192.168.1.104', // host: '192.168.1.104',
host: 'localhost', host: '192.168.2.105',
// host: '192.168.2.107', // host: '192.168.2.107',
port: 80, port: 80,
open: true, open: true,
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: "http://127.0.0.1:18081", target: "http://192.168.3.14:18082",
// target: "http://192.168.2.108:18080", // target: "http://192.168.2.108:18080",
// target: "http://192.168.2.103:18082", // target: "http://192.168.2.103:18082",
// target: "http://192.168.31.26:18082", // target: "http://192.168.31.26:18082",

Loading…
Cancel
Save