admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flx：修改分部分项进度

Browse Source
This commit is contained in:
X_Rian 2024-07-08 19:01:27 +08:00
parent f01215434d
commit a731e1f452
2 changed files with 179 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/projectFront/progressManagementAg/divisionSubManage.vue
View File

@ -33,7 +33,7 @@
>
<el-option style="height: auto" :value="[]">
<el-tree
:data="areaList"
:data="areaListWZ"
node-key="id"
ref="groupTree"
:default-expanded-keys="defaultExpandArr"
@ -186,7 +186,7 @@
size="medium"
type="primary"
:disabled="!treeData.id"
@click="uploadShow = true"
@click="onUploadShow(1)"
>导入</el-button
>
</el-form-item>
@ -676,6 +676,7 @@
<el-button size="mini" type="primary" plain>选择</el-button>
</el-upload>
<span v-else style="color: #5181f6">{{ fileName }}</span> -->
<!-- accept=".mpp" -->
<el-upload
accept=".mpp"
class="upload-demo expintBtn"
@ -685,6 +686,7 @@
:file-list="fileList"
:action="$store.state.UPLOADURL"
:headers="headers"
:limit="1"
>
<el-button size="mini" type="primary" plain>选择</el-button>
</el-upload>
@ -693,7 +695,7 @@
<div class="dialog-footer">
<el-button
class="cancleBtn"
@click="uploadShow = false"
@click="onUploadShow(2)"
icon="el-icon-circle-close"
size="medium"
>取消
@ -872,6 +874,7 @@ export default {
},
fileName: "",
treeData: {},
areaListWZ:[],
};
},
computed: {
@ -1034,19 +1037,37 @@ export default {
getPositionList() {
let data = {
projectSn: this.$store.state.projectSn,
enterpriseId: this.treeData.enterpriseId,
};
getQualityRegionListApi(data).then((res) => {
getQualityRegionListApi({
...data,
enterpriseId: this.treeData.enterpriseId,
}).then((res) => {
console.log("res=================", res);
if (res.code == 200) {
this.areaList = res.result;
}
});
getQualityRegionListApi(data).then((res) => {
console.log("res=================", res);
if (res.code == 200) {
this.areaListWZ = res.result;
console.log(this.areaListWZ, 135456);
}
});
},
// 区域更改时
areaChange() {
this.getProgressListData();
},
onUploadShow(flag){
this.fileList = [];
this.rawFileList = [];
if(flag == 1) {
this.uploadShow = true;
}else {
this.uploadShow = false;
}
},
//导入确定提交
handleUploadConfirm() {
if (this.fileName == "") {
@ -1067,6 +1088,7 @@ export default {
data.append("projectSn", this.projectSn);
data.append("type", this.radio);
data.append("mppFile", this.rawFileList[0].raw);
data.append("enterpriseId", this.treeData.id);
importDataApi(data).then((res) => {
if (res.code == 200) {
this.uploadShow = false;

167
src/views/userCenter/userCenter/componentsModule/dataListData.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="fullHeight">
<div class="searchBox whiteBlock">
<div class="searchBox whiteBlock" v-if="dialogFormVisible">
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
<!-- 人员名称 -->
<el-form-item label="操作员名称" prop="userName">
@ -42,7 +42,7 @@
</el-form-item>
</el-form>
</div>
<div class="table_wrap whiteBlock">
<div class="table_wrap whiteBlock" v-if="dialogFormVisible">
<el-table class="tables" v-loading="loading" :data="tableData">
<el-table-column label="序号" align="center" width="80" type="index" />
<el-table-column label="操作时间" align="center" prop="operCreateTime" />
@ -51,6 +51,19 @@
<el-table-column label="操作IP" align="center" prop="operIp" />
<el-table-column label="请求URL" align="center" prop="operUri" />
<el-table-column label="操作员姓名" align="center" prop="realName" />
<!-- <el-table-column label="操作" align="center">
<template slot-scope="scope">
<div class="tableBtns">
<div class="operationText last" @click="deilBtn(scope.row)">
<i
class="el-icon-tickets"
style="color: #8dacfa; font-size: 16px; margin-right: 2px"
></i>
<span>查看详情</span>
</div>
</div>
</template>
</el-table-column> -->
</el-table>
<el-pagination
class="pagerBox"
@ -64,6 +77,39 @@
background
></el-pagination>
</div>
<div style="height: 100%" v-else>
<el-page-header
@back="goBack"
:content="dialogTitle"
class="backText"
></el-page-header>
<el-form class="form-box">
<el-form-item label="操作时间：" :label-width="formLabelWidthDetail">
{{ detailRow.operCreateTime }}
</el-form-item>
<el-form-item label="操作描述：" :label-width="formLabelWidthDetail">
{{ detailRow.operDesc }}
</el-form-item>
<el-form-item label="功能模块：" :label-width="formLabelWidthDetail">
{{ detailRow.operModul }}
</el-form-item>
<el-form-item label="操作IP：" :label-width="formLabelWidthDetail">
{{ detailRow.operIp }}
</el-form-item>
<el-form-item label="请求URL：" :label-width="formLabelWidthDetail">
{{ detailRow.operUri }}
</el-form-item>
<el-form-item label="操作员姓名：" :label-width="formLabelWidthDetail">
{{ detailRow.realName }}
</el-form-item>
<el-form-item label="数据变更前：" :label-width="formLabelWidthDetail">
{{ detailRow.operModul }}
</el-form-item>
<el-form-item label="数据变更后：" :label-width="formLabelWidthDetail">
{{ detailRow.operModul }}
</el-form-item>
</el-form>
</div>
</div>
</template>
<script>
@ -90,35 +136,50 @@ export default {
timeRange: [],
},
tableData: [],
dialogFormVisible: true,
dialogTitle: "",
detailRow: {},
formLabelWidthDetail: "110px",
};
},
methods: {
// 获取当前时间 返回YYYY-MM-DD HH:mm:ss
selectNowDate() {
goBack() {
this.dialogFormVisible = true;
},
deilBtn(val) {
console.log("!!!!!!!!!!!!!!!!!!", val);
this.dialogFormVisible = false;
// 详细
this.dialogTitle = "详细";
this.detailRow = val;
},
// 获取当前时间 返回YYYY-MM-DD HH:mm:ss
selectNowDate() {
var date = new Date(),
year = date.getFullYear(),
month = date.getMonth() + 1,
day = date.getDate(),
hours = date.getHours(), //获取当前小时数(0-23)
minutes = date.getMinutes(), //获取当前分钟数(0-59)
seconds = date.getSeconds()
month >= 1 && month <= 9 ? (month = '0' + month) : ''
day >= 0 && day <= 9 ? (day = '0' + day) : ''
hours >= 0 && hours <= 9 ? (hours = '0' + hours) : ''
minutes >= 0 && minutes <= 9 ? (minutes = '0' + minutes) : ''
seconds >= 0 && seconds <= 9 ? (seconds = '0' + seconds) : ''
seconds = date.getSeconds();
month >= 1 && month <= 9 ? (month = "0" + month) : "";
day >= 0 && day <= 9 ? (day = "0" + day) : "";
hours >= 0 && hours <= 9 ? (hours = "0" + hours) : "";
minutes >= 0 && minutes <= 9 ? (minutes = "0" + minutes) : "";
seconds >= 0 && seconds <= 9 ? (seconds = "0" + seconds) : "";
// var timer = year + '-' + month + '-' + day + ' ' + hours + ':' + minutes+ ':' + seconds;
var timer = year + '-' + month + '-' + day
this.searchForm.timeRange = [timer, timer]
console.log(timer)
var timer = year + "-" + month + "-" + day;
this.searchForm.timeRange = [timer, timer];
console.log(timer);
// return timer;
},
exportFn() {
let requestData = {
sn: this.$store.state.userInfo.sn || this.$store.state.userInfo.headquartersSn,
sn: this.$store.state.projectSn,
// sn: this.$store.state.userInfo.sn || this.$store.state.userInfo.headquartersSn,
pageNo: this.pageInfo.pageNo,
pageSize: this.pageInfo.pageSize,
projectSn: this.$store.state.projectSn,
// projectSn: this.$store.state.projectSn,
userName: this.searchForm.userName,
operModul: this.searchForm.operModul,
};
@ -219,6 +280,63 @@ export default {
};
</script>
<style lang="less" scoped>
.form-box {
width: 100%;
display: flex;
flex-wrap: wrap;
max-height: calc(100% - 50px);
overflow-y:scroll;
/deep/.el-form-item {
width: 50%;
padding-right: 10px;
box-sizing: border-box;
}
// /deep/.el-col-12{
// padding-left: 20px;
// }
/deep/.el-input__inner {
width: 100%;
}
/deep/.el-select {
width: 100%;
}
/deep/.el-cascader {
width: 100%;
}
}
// 美化滚动条
.form-box::-webkit-scrollbar {
width: 5px;
height: 5px;
}
.form-box::-webkit-scrollbar-track {
width: 6px;
background: rgba(#101F1C, 0.1);
-webkit-border-radius: 2em;
-moz-border-radius: 2em;
border-radius: 2em;
}
.form-box::-webkit-scrollbar-thumb {
background-color: rgba(144,147,153,.5);
background-clip: padding-box;
min-height: 28px;
-webkit-border-radius: 2em;
-moz-border-radius: 2em;
border-radius: 2em;
transition: background-color .3s;
cursor: pointer;
}
.form-box::-webkit-scrollbar-thumb:hover {
background-color: rgba(144,147,153,.3);
}
.tables {
min-height: 0;
max-height: calc(100% - 56px);
@ -233,4 +351,23 @@ export default {
left: 50%;
transform: translateX(-50%);
}
.backText {
padding: 8px 0;
padding-left: 10px;
/deep/.el-page-header__content {
font-size: 14px;
}
}
.dark {
/deep/.el-page-header__content {
color: #fff;
}
/deep/ .print-btn {
background: none;
color: #262d47;
font-size: 14px;
}
}
</style>