更新最新bug

main
李劲龙 3 months ago
parent a22c1fc983
commit 7bdff21f0e

@ -40,7 +40,7 @@
"axios": "0.28.1",
"clipboard": "2.0.8",
"core-js": "3.37.1",
"echarts": "5.4.0",
"echarts": "^5.4.0",
"element-ui": "2.15.14",
"file-saver": "2.0.5",
"fuse.js": "6.4.3",

@ -180,3 +180,20 @@ export function assetTaskgzhjyTj(data) {
data,
})
}
//关闭任务
export function assetTaskclose(params) {
return request({
url: `/unit/assetTask/close`,
method: "get",
params,
})
}
//管理端-单位核查比例图
export function assetTaskdwHcBl(data) {
return request({
url: `/unit/assetTask/dwHcBl`,
method: "post",
data,
})
}

@ -155,13 +155,17 @@
height: 100%;
background-color: #fff;
border-radius: 5px;
overflow: hidden;
}
.info-left {
flex: 5;
}
.info-right {
flex: 1;
}
.info-right {
margin-left: 10px;
@ -196,12 +200,15 @@
display: flex;
align-items: center;
margin-bottom: 40px;
.left-box {
position: relative;
.main-img {
width: 45px;
margin-right: 20px;
}
.icon-jt {
position: absolute;
width: 15px;
@ -215,6 +222,7 @@
display: flex;
flex-direction: column;
justify-content: space-between;
.span-title {
font-family: Alibaba PuHuiTi;
font-weight: 500;
@ -222,6 +230,7 @@
color: #192734;
margin-bottom: 8px;
}
.span-time {
font-family: Alibaba PuHuiTiR;
font-weight: 400;
@ -310,13 +319,13 @@
div {
padding: 10px;
padding: 5px 15px;
border: 1px solid #F5F5F5;
border: 1px solid #e0dddd;
font-weight: 400;
font-family: Alibaba PuHuiTiR;
font-size: 14px;
color: #192733;
color: #000000;
border-bottom: none;
background-color: #F5F5F5;
background-color: #e0dddd;
cursor: pointer;
margin-right: 10px;
}

@ -63,8 +63,8 @@ export default {
}
::-webkit-scrollbar {
width: 4px;
height: 4px;
width: 6px;
height: 8px;
}
::-webkit-scrollbar-track {

@ -27,7 +27,7 @@
</div>
<div class="info-cut-off-rule" id="L-tab">
<div class="left-tab" :class="index == 1 ? 'active-tab':''" @click="activeTab(1)"></div>
<div :class="index == 2 ? 'active-tab':''" @click="activeTab(2)"></div>
<div :class="index == 2 ? 'active-tab':''" @click="activeTab(2)"></div>
</div>
<div class="info-bottom-box">
<el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" v-if="index == 1">

@ -14,6 +14,8 @@
<el-col :span="7">
<el-form-item label="任务状态:">
<el-select v-model="formInline.taskStatus" placeholder="请选择">
<el-option label="关闭" value="0">
</el-option>
<el-option label="进行中" value="1">
</el-option>
<el-option label="正常完成" value="2">
@ -79,6 +81,9 @@
<el-table-column label="任务状态" key="taskStatus" width="200px" prop="taskStatus" class-name="table-status"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.taskStatus == 0" style="color: #F56C6C;">
已关闭
</span>
<span v-if="scope.row.taskStatus == 1" style="color: #E6A23C;">
进行中
</span>
@ -101,14 +106,20 @@
<div style="display: flex;align-items: center;justify-content: center;">
<div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(scope.row)">
<img src="@/assets/images/icon-ck@2x.png" alt="" style="width: 20px;margin-right: 5px;">
<span class="look-info"
style="color: #1485EF;">查看</span>
<span class="look-info" style="color: #1485EF;">查看</span>
</div>
<!-- -->
<div style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="delInfo(scope.row)" v-if="scope.row.taskStatus == 1">
<div style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;"
@click="delInfo(scope.row)" v-if="scope.row.taskStatus == 1 && scope.row.taskStatus != 0">
<img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
<span class="del-info"
style="color: #1485EF;">审核</span>
<span class="del-info" style="color: #1485EF;">审核</span>
</div>
<div style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;"
@click="guanbijiekou(scope.row)" v-if="scope.row.taskStatus == 1 && scope.row.taskStatus != 0">
<!-- -->
<!-- <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;"> -->
<i class="el-icon-delete"></i>
<span class="del-info" style="color: #1485EF;">关闭</span>
</div>
</div>
</template>
@ -144,8 +155,8 @@
</el-col>
</el-form-item>
<el-form-item label="任务期限" prop="taskDeadline">
<el-date-picker type="date" placeholder="选择日期" v-model="ruleForm.taskDeadline" style="width: 100%;"
value-format="yyyy-MM-dd"></el-date-picker>
<el-date-picker type="datetime" placeholder="选择日期" v-model="ruleForm.taskDeadline" style="width: 100%;"
value-format="yyyy-MM-dd HH:mm:ss" default-time="23:59:59"></el-date-picker>
</el-form-item>
<el-form-item class="newTask-form-item">
<el-button @click="resetForm('ruleForm')"></el-button>
@ -169,7 +180,7 @@
import myPagination from "@/views/components/Pagination/index.vue"
import myDialog from "@/views/components/myDialog/index.vue"
import danweiList from "@/views/system/user/danweiList.vue"
import { addassetTaskadd, getassetTask, getassetTaskid } from "@/api/renwuApi/index.js"
import { addassetTaskadd, getassetTask, getassetTaskid, assetTaskclose } from "@/api/renwuApi/index.js"
export default {
// dicts: ['jjh_project_type', 'bms_approval_status', "project_middle_type", "project_small_type", "project_categories"],
@ -415,6 +426,34 @@ export default {
}
})
},
//
guanbijiekou(row) {
console.log(row);
this.$confirm('此操作将关闭改任务, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
assetTaskclose({ taskId: row.id }).then(res => {
if (res.code == 200) {
this.$message({
type: 'success',
message: '关闭成功!'
});
this.getInfo();
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消关闭'
});
});
},
//
edit() {
},
@ -445,7 +484,14 @@ export default {
.el-icon-s-unfold {
font-size: 16px;
}
// ::v-deep .el-dialog__body{
// padding-left: 80px;
// }
.el-icon-delete {
color: #409EFF;
font-size: 16px;
font-weight: 600;
margin-right: 5px;
}
</style>

@ -32,12 +32,12 @@
</div>
<div class="info-cut-off-rule" id="L-tab">
<div class="left-tab" :class="index == 1 ? 'active-tab' : ''" @click="activeTab(1)"></div>
<div :class="index == 2 ? 'active-tab' : ''" @click="activeTab(2)"></div>
<div :class="index == 2 ? 'active-tab' : ''" @click="activeTab(2)"></div>
</div>
<div class="info-bottom-box">
<el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" v-if="index == 1">
<el-row>
<el-col :span="8">
<el-col :span="7">
<el-form-item label="核查单位:">
<el-input v-model="formInline.dwmc" placeholder="请输入"></el-input>
</el-form-item>
@ -51,7 +51,7 @@
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="9">
<el-col :span="7">
<el-form-item label="审核状态:">
<el-select v-model="formInline.status" placeholder="请选择">
<el-option label="待核查" value="0">
@ -90,6 +90,19 @@
<!-- </el-select> -->
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="完成状态:">
<el-select v-model="formInlineTwo.taskStatus" placeholder="请选择">
<el-option label="进行中" value="1">
</el-option>
<el-option label="正常完成" value="2">
</el-option>
<el-option label="超期完成" value="3">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-button size="mini" type="primary" @click="handleQuery()"></el-button>
@ -120,7 +133,7 @@
<el-table-column label="审核状态" key="status" width="200px" prop="status" class-name="table-status"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.status == 0" style="color: #303133;">
<span v-if="scope.row.status == 0" style="color: #e6a230;">
待核查
</span>
<span v-if="scope.row.status == 1" style="color: #E6A23C;">
@ -162,24 +175,56 @@
</el-table-column>
</el-table>
</section>
<section v-if="index == 2">
<section v-if="index == 2" class="shuangchongbox">
<div class="shuangchongboxleftbox" :class="isshow ? '' : 'shuangchongboxleftboxShow'">
<div style="margin-bottom: 10px;">
<el-button size="mini" type="primary" @click="daochu()"></el-button>
</div>
<el-table v-loading="loading" :data="tableDataTwo" :height="tabHeader" :max-height="tabHeader"
:row-class-name="tableRowClassName">
:row-class-name="tableRowClassName" style="width: 100%">
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column label="单位名称" key="dwmc" width="200px" prop="dwmc" align="center" />
<el-table-column label="核查资产数量" key="total" prop="total" align="center" />
<el-table-column label="单位名称" key="dwmc" width="150px" prop="dwmc" align="center" />
<el-table-column label="完成状态" key="taskStatus" prop="taskStatus" class-name="table-status" align="center">
<template slot-scope="scope">
<span v-if="scope.row.taskStatus == 0" style="color: #F56C6C;">
已关闭
</span>
<span v-if="scope.row.taskStatus == 1" style="color: #E6A23C;">
进行中
</span>
<span v-if="scope.row.taskStatus == 2" style="color: #67C23A;">
正常完成
</span>
<span v-if="scope.row.taskStatus == 3" style="color:#67C23A;">
超期完成
</span>
<span v-if="scope.row.taskStatus == 4" style="color: #F56C6C;">
审核不通过
</span>
<span v-if="scope.row.taskStatus == 5" style="color: #F56C6C;">
审核驳回
</span>
</template>
</el-table-column>
<el-table-column label="核查资产数量" key="total" width="180px" prop="total" align="center" />
<el-table-column label="完成数量" key="checked" prop="checked" align="center">
<!-- <template slot-scope="scope">
<dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
</template> -->
</el-table-column>
<el-table-column label="未完成数量" key="wwcsl" prop="notChecked" align="center" />
<el-table-column label="未完成比例" key="checkedRatio" width="200px" prop="checkedRatio" align="center">
<!-- <el-table-column label="未完成数量" key="wwcsl" prop="notChecked" align="center" /> -->
<el-table-column label="审核退回次数" key="wwcsl" width="180px" prop="shthcs" align="center" />
<el-table-column label="完成比例" key="checkedRatio" prop="checkedRatio" align="center">
<template slot-scope="scope">
<span style="color: #192A92;">{{ scope.row.checkedRatio }}%</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="shouqiwenzi" @click="shouqiisis">{{ isshow ? "" : '' }}>></div>
<div v-show="isshow" class="myEcharts" id="myEcharts" ref="myEcharts" :style="{ height: tabHeader }">
<!-- 123 -->
</div>
</section>
<my-pagination id="L-pagination" :total="total" :page="pagination.current" :limit="pagination.size"
@pagination="getPagination" :current-page.sync="pagination.current"></my-pagination>
@ -197,7 +242,6 @@
<img class="icon-jt" v-if="(index + 1) != timeLineData.length" src="@/assets/images/icon-jt@2x.png" alt="">
</div>
<div class="right-box">
<span class="span-title">{{ item.assetName }}:</span>
<span class="span-time">{{ item.xfTime }}</span>
</div>
@ -216,9 +260,9 @@
</template>
<script>
import myPagination from "@/views/components/Pagination/index.vue"
import { getassetTaskid, geassetTaskcHc, assetTaskdwHc, assetLcpage, assetLcpageList } from "@/api/renwuApi/index.js"
import { getassetTaskid, geassetTaskcHc, assetTaskdwHc, assetLcpage, assetTaskdwHcBl } from "@/api/renwuApi/index.js"
import myDialog from "@/views/components/myDialog/index.vue"
import * as echarts from 'echarts';
export default {
dicts: ['zc_xtlx'],
@ -228,10 +272,10 @@ export default {
index: 1,
formInline: {
xtlx: "",
},
formInlineTwo: {
dwmc: "",
taskStatus: ""
},
total: 0,
pagination: {
@ -280,13 +324,25 @@ export default {
],
chanckListTow: [],
listTow: [],
option: null,
myChart: null,
isshow: true,
echartsdata: [
{ value: 0, name: '进行中', taskStatus: "1" },
{ value: 0, name: '正常完成', taskStatus: "2" },
{ value: 0, name: '超期完成', taskStatus: "3" },
]
}
},
mounted() {
this.cancalDebounce();
window.addEventListener('resize', this.cancalDebounce);
//
this.titleInfo()
//
this.assetLcpageList()
//
this.getEchartsdata()
},
destroyed() {
@ -294,6 +350,19 @@ export default {
},
methods: {
shouqiisis() {
console.log(123);
this.isshow = !this.isshow
// this.myEchartsis()
},
//
daochu() {
this.formInlineTwo.taskId = this.$route.query.id
this.download('/unit/assetTask/export', {
...this.formInlineTwo
}, `单位完成情况${new Date().getTime()}.xlsx`)
},
//tab
handleClick(tab, event) {
this.formInline = {
xtlx: "",
@ -371,7 +440,7 @@ export default {
taskId: row.taskId,
assetId: row.id,
type: this.activeName,
zcdwmc: row.zcdwmc
}
})
}
@ -453,6 +522,7 @@ export default {
} else if (this.index == 2) {
this.formInlineTwo = {
dwmc: "",
taskStatus: ""
}
this.getListTwo();
}
@ -491,7 +561,13 @@ export default {
console.log(id);
this.resetQuery()
if (id == 2) {
setTimeout(() => {
this.myEchartsis()
}, 100);
}
},
getList() {
this.loading = true
@ -512,6 +588,70 @@ export default {
this.loading = false
})
},
//Echarts
getEchartsdata() {
assetTaskdwHcBl({ taskId: this.$route.query.id }).then(res => {
if (res.code == 200) {
let datalsit = res.data
this.echartsdata.forEach(res => {
datalsit.forEach(datares=>{
if(res.taskStatus == datares.taskStatus){
res.value = datares.count
}
})
})
// this.echartsdata = this.echartsdata.filter(item => item.value != "");
}
})
},
myEchartsis() {
// var chartDom = document.querySelector('.myEcharts');
console.log(this.$refs.myEcharts);
this.myChart = echarts.init(this.$refs.myEcharts);
this.option = {
legend: {
top: 'bottom'
},
toolbox: {
show: true,
},
tooltip: {
trigger: 'item',
formatter: '{b}{c}条({d}%)'
},
series: [
{
name: 'Access From',
type: 'pie',
radius: '50%',
data: this.echartsdata,
emphasis: {
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
}
}
}
]
};
this.option && this.myChart.setOption(this.option);
this.myChart.on('click', (params) => {
// params
console.log(params.data.taskStatus);
this.formInlineTwo.taskStatus = params.data.taskStatus
this.handleQuery()
//
});
},
// table
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 !== 0) {
@ -562,4 +702,37 @@ export default {
::v-deep .el-dialog {
margin-top: 20vh !important;
}
.shuangchongbox {
width: 100%;
display: flex;
position: relative;
.shuangchongboxleftbox {
width: 70%;
}
.shuangchongboxleftboxShow {
width: 100%;
}
.myEcharts {
width: 30%;
// height: 100%;
}
}
.shouqiwenzi {
position: absolute;
top: 10px;
right: -30px;
width: 100px;
font-size: 14px;
font-weight: bold;
color: #409EFF;
cursor: pointer;
z-index: 999;
}
</style>

@ -66,6 +66,7 @@ export default {
assetId: this.$route.query.assetId,
xtmc:this.chuandemingcheng,
btgyy:this.dialogruleForm.btgyy,
dwmc:this.$route.query.zcdwmc,
status: 4,
type:this.$route.query.type
}

@ -3214,6 +3214,7 @@ export default {
taskId: this.$route.query.taskId,
assetId: this.$route.query.assetId,
xtmc:this.ruleForm.xtmc,
dwmc:this.$route.query.zcdwmc,
status: 3,
type:this.$route.query.type
}

@ -7,8 +7,8 @@
<span class="top-title-box">基本信息</span>
</el-row>
<div class="assets-info-box" v-loading="loading">
<el-form :model="ruleForm" v-if="!loading" :rules="rules" ref="ruleForm" label-width="170px" class="demo-ruleForm"
label-position="right" :disabled="disabled">
<el-form :model="ruleForm" v-if="!loading" :rules="rules" ref="ruleForm" label-width="170px"
class="demo-ruleForm" label-position="right" :disabled="disabled">
<el-row>
<el-col :span="12">
<el-form-item label="系统名称" required :rules="{
@ -639,8 +639,7 @@
</el-form-item>
</el-col>
<el-col :span="8" style="margin-left: 10px;">
<el-form-item prop="bmfzrlxfs"
:rules="[
<el-form-item prop="bmfzrlxfs" :rules="[
{
required: true, message: '请输入', trigger: 'blur'
},
@ -680,8 +679,7 @@
</el-form-item>
</el-col>
<el-col :span="8" style="margin-left: 10px;">
<el-form-item prop="dylxrlxfs"
:rules="[
<el-form-item prop="dylxrlxfs" :rules="[
{
required: true, message: '请输入', trigger: 'blur'
},
@ -690,8 +688,7 @@
message: '请输入正确的手机号码',
trigger: 'blur'
}
]"
>
]">
<el-input v-model="ruleForm.dylxrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
</el-form-item>
</el-col>
@ -722,8 +719,7 @@
</el-form-item>
</el-col>
<el-col :span="8" style="margin-left: 10px;">
<el-form-item :prop="'otherConcat.' + index + '.qtlxrlxfs'"
:rules="[
<el-form-item :prop="'otherConcat.' + index + '.qtlxrlxfs'" :rules="[
{
required: true, message: '请输入', trigger: 'blur'
},
@ -732,8 +728,7 @@
message: '请输入正确的手机号码',
trigger: 'blur'
}
]"
>
]">
<el-input v-model="domain.qtlxrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
</el-form-item>
</el-col>
@ -1487,16 +1482,14 @@
</el-form-item>
</el-col>
<el-col :span="12" style="margin-left: 10px;">
<el-form-item class="daoqitixingren" required :prop="`xtyyUnit[${index}].tyshxydm`"
:rules="[
<el-form-item class="daoqitixingren" required :prop="`xtyyUnit[${index}].tyshxydm`" :rules="[
{ required: true, message: '请输入', trigger: 'blur' },
{
pattern: /^[a-zA-Z0-9]{18}$/,
message: '请输入正确格式的18位统一社会信用代码',
trigger: 'blur'
}
]"
:label="'统一社会信用代码' + (index == 0 ? '' : index)">
]" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
<el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
</el-form-item>
</el-col>
@ -2660,10 +2653,18 @@
</el-row>
<!-- 业务系统拓扑图 -->
<el-row style="margin: 10px 0;">
<span class="top-title-box">业务系统拓扑图</span>
<span class="top-title-box">
<span style="color:#ff4949;font-size: 16px">*</span>
业务系统拓扑图
<span style="color:#ff4949;font-size: 13px;font-weight: 400;margin-left:10px">提示附件/图片请至少选择一项</span>
</span>
</el-row>
<span class="guanbixinghao">
<el-row style="margin: 20px 0;">
<el-form-item prop="ywxttpwj" label="附件上传">
<el-form-item :required="false" prop="ywxttpwj" label="附件上传">
<myUpload :fileSize="30" :limit="1" :fileType="accept" v-model="ruleForm.ywxttpwj">
<div class="upload-file">
<i class="el-icon-paperclip"></i>
@ -2673,7 +2674,7 @@
</el-form-item>
</el-row>
<el-row style="margin: 20px 0;">
<el-form-item prop="ywxttpt" label="图片上传">
<el-form-item :required="false" prop="ywxttpt" label="图片上传">
<myUpload :fileSize="30" :limit="1" :fileType="acceptTwo" v-model="ruleForm.ywxttpt">
<div class="upload-file">
<i class="el-icon-paperclip"></i>
@ -2682,6 +2683,7 @@
</myUpload>
</el-form-item>
</el-row>
</span>
<el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
<span class="top-title-box">关停原因</span>
</el-row>
@ -2690,7 +2692,8 @@
<div>{{ ruleForm.bfyy }}</div>
</el-form-item>
</el-row>
<el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;" v-if="$route.query.pageType == 'change'">
<el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;"
v-if="$route.query.pageType == 'change'">
<el-button type="danger" @click="newAssets(0)"></el-button>
<el-button @click="newAssets(1)"></el-button>
<el-button type="warning" @click="newAssets(2)"></el-button>
@ -3296,3 +3299,8 @@ var validateName = (rule, value, callback) => {
},
}
</script>
<style scoped lang="scss">
::v-deep .guanbixinghao .el-form-item.is-required .el-form-item__label:before {
content: '' !important;
}
</style>

@ -18,6 +18,8 @@
<el-col :span="7">
<el-form-item label="任务状态:">
<el-select v-model="formInline.taskStatus" placeholder="请选择">
<el-option label="关闭" value="0">
</el-option>
<el-option label="进行中" value="1">
</el-option>
<el-option label="正常完成" value="2">
@ -54,6 +56,9 @@
<el-table-column label="任务状态" key="taskStatus" width="200px" prop="taskStatus" class-name="table-status"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.taskStatus == 0" style="color: #F56C6C;">
已关闭
</span>
<span v-if="scope.row.taskStatus == 1" style="color: #E6A23C;">
进行中
</span>
@ -80,7 +85,7 @@
style="color: #1485EF;cursor: pointer;">查看</span>
</div>
<!-- v-if="scope.row.taskStatus == 1" -->
<div style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="delInfo(scope.row)" v-if="scope.row.taskStatus == 1">
<div style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="delInfo(scope.row)" v-if="scope.row.taskStatus == 1&& scope.row.taskStatus != 0">
<img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
<span class="del-info"
style="color: #1485EF;cursor: pointer;">开始核查</span>

@ -36,7 +36,7 @@
<div class="info-bottom-box">
<el-form :inline="true" :model="formInline" size="small" class="demo-form-inline" v-if="index == 1">
<el-row>
<el-col :span="8">
<el-col :span="7">
<el-form-item label="核查单位:">
<el-input v-model="formInline.dwmc" placeholder="请输入"></el-input>
</el-form-item>
@ -50,7 +50,7 @@
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="9">
<el-col :span="7">
<el-form-item label="审核状态:">
<el-select v-model="formInline.status" placeholder="请选择">
<el-option label="未核查" value="0">

Loading…
Cancel
Save