Skip to content

Administrator / project_progress

Go to a project
Commit 9fe9a7e7 by liangzhen
Options

暂存

1 parent 193b142a
Inline Side-by-side
Showing with 94 additions and 52 deletions
src/views/assessChecks/checkCompliance.vue
......@@ -248,6 +248,7 @@ import {
selFileList,
} from '@/api/index'
import { MaterialsListKY } from '@/utils/cache'
import { Loading } from 'element-ui';
export default {
data() {
return {
......@@ -474,18 +475,33 @@ export default {
})
},
working(type){
let options={
fullscreen: true,
spinner: 'el-icon-loading',
customClass: 'iam-loading',
text:"智能分析中,请耐心等候...", //显示在加载图标下方的加载文案
background:'rgba(0,0,0,.7)', //遮罩背景色
}
let loadingInstance ='';
let params = {
projectStage: this.active * 1 + 1,
// hgx: 'hgx',
...this.clqparams,
}
if(type=='work'){
this.hgx='hgx'
loadingInstance = Loading.service(options);
}
if( this.hgx='hgx'){
params.hgx='hgx'
}
Promise.all([selFile(params), selWtqdFZ(params)]).then(async (res) => {
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
if(type=='work'){
console.log('走了关闭')
loadingInstance.close();
}
});
this.tabListKY = []
this.urlList = res[0].data
if (this.urlList.length > 0) {
......
src/views/assessZC/checkCompliance.vue
......@@ -235,6 +235,7 @@
</template>
<script>
import { Loading } from 'element-ui';
// import{kkk}from "@/static/web/viewer.mjs"
import {
selWtqdFZ,
......@@ -474,18 +475,35 @@ export default {
})
},
working(type){
let options={
fullscreen: true,
spinner: 'el-icon-loading',
customClass: 'iam-loading',
text:"智能分析中,请耐心等候...", //显示在加载图标下方的加载文案
background:'rgba(0,0,0,.7)', //遮罩背景色
}
let params = {
projectStage: this.active * 1 + 1,
// hgx: 'hgx',
...this.clqparams,
}
let loadingInstance ='';
if(type=='work'){
this.hgx='hgx'
loadingInstance = Loading.service(options);
}
if( this.hgx='hgx'){
params.hgx='hgx'
}
Promise.all([selFile(params), selWtqdFZ(params)]).then(async (res) => {
this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
if(type=='work'){
console.log('走了关闭')
loadingInstance.close();
}
});
this.tabListKY = []
this.urlList = res[0].data
if (this.urlList.length > 0) {
......
src/views/checkCompliance/automaticCheck.vue
......@@ -14,11 +14,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item
label="稽核时间:"
prop="auditTime"
class="fromItem"
>
<el-form-item label="稽核时间:" prop="auditTime" class="fromItem">
<el-date-picker
@change="timeChange"
v-model="ruleForm.dates"
......@@ -66,16 +62,19 @@
<el-button @click="resetForm()">
<img class="buttonIcon" src="../../assets/cz.png" />重置</el-button
>
<el-button @click="detailsForm()">
<!-- <el-button @click="detailsForm()">
<img class="buttonIcon" src="../../assets/ck.png" />详情</el-button
>
> -->
</el-form-item>
</el-form>
<div class="setscrollOne">
<el-table
@selection-change="handleSelectionChange"
ref="multipleTable"
@row-click="(row, column, event) => handleRowClick(row, column, event, 'multipleTable')"
@row-click="
(row, column, event) =>
handleRowClick(row, column, event, 'multipleTable')
"
:data="tableData"
tooltip-effect="dark myTooltips"
style="width: 100%"
......@@ -87,7 +86,8 @@
<el-table-column label="序号" width="55" type="index">
</el-table-column>
<el-table-column type="selection"> </el-table-column>
<el-table-column label="稽核名称" prop="auditName" width="320"> </el-table-column>
<el-table-column label="稽核名称" prop="auditName" width="320">
</el-table-column>
<el-table-column prop="auditTime" label="稽核时间" width="250">
</el-table-column>
<el-table-column
......@@ -98,13 +98,15 @@
</el-table-column>
<el-table-column prop="abnormalResults" label="检查异常结果">
<template v-slot="scope">
<el-button type="text" size="small" @click="detailsForm(scope.row)">{{scope.row.abnormalResults}}</el-button>
<el-button
type="text"
size="small"
@click="detailsForm(scope.row)"
>{{ scope.row.abnormalResults }}</el-button
>
</template>
</el-table-column>
<el-table-column
prop="rectificationStatusText"
label="问题状态"
>
<el-table-column prop="rectificationStatusText" label="问题状态">
</el-table-column>
<!-- <el-table-column label="操作" width="130">
<template slot-scope="scope">
......@@ -112,9 +114,15 @@
@click="handleClick(scope.row, scope.$index)"
type="text"
size="small"
:disabled="scope.row.rectificationStatusText=='已下发'"
:disabled="scope.row.rectificationStatusText!='未下发'"
>下发</el-button
>
<el-button
@click="detailsForm(scope.row, scope.$index)"
type="text"
size="small"
>详情</el-button
>
</template>
</el-table-column> -->
</el-table>
......@@ -123,7 +131,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-sizes="[10, 15, 20, 50,100]"
:page-sizes="[10, 15, 20, 50, 100]"
:page-size="1000"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
......@@ -154,7 +162,11 @@
<el-input v-model="ruleFormdialogXQ.projectId" disabled></el-input>
</el-form-item> -->
<el-form-item label="项目名称:" class="fromItem" prop="projectName">
<el-input v-model="ruleFormdialogXQ.projectName" type="textarea" disabled></el-input>
<el-input
v-model="ruleFormdialogXQ.projectName"
type="textarea"
disabled
></el-input>
</el-form-item>
</el-form>
<p class="zjBtn">稽核异常项目清单</p>
......@@ -187,7 +199,6 @@
</el-table-column>
<!-- <el-table-column prop="quesCheckItem" label="问题检查项" width="auto">
</el-table-column> -->
</el-table>
</div>
<!-- <el-pagination
......@@ -211,9 +222,13 @@
</template>
<script>
import { auditTasksResults, xqauditTasksResults,wtxfResults } from "@/api/index";
import {
auditTasksResults,
xqauditTasksResults,
wtxfResults,
} from "@/api/index";
import { generateYearOptions, projectCategoryText } from "@/utils/cache";
import tableMixin from '@/mixins/table.mixin.js'
import tableMixin from "@/mixins/table.mixin.js";
export default {
mixins: [tableMixin],
data() {
......@@ -222,13 +237,13 @@ export default {
listData: {},
showButton: true,
ruleForm: {
auditName:'',
dates:[],
projectName:''
auditName: "",
dates: [],
projectName: "",
},
ruleFormdialogXQ: {},
currentPageXQ:1,
pageSizeXQ:5,
currentPageXQ: 1,
pageSizeXQ: 5,
tableData: [],
checkedList: [],
......@@ -240,12 +255,11 @@ export default {
};
},
mounted() {
this.ruleForm.auditName = this.$route.query.auditName
this.ruleForm.auditName = this.$route.query.auditName;
this.submitForm();
},
methods: {
async handleClick(row){
async handleClick(row) {
this.$confirm("是否确认下发?", "提示", {
confirmButtonText: "是",
cancelButtonText: "否",
......@@ -264,8 +278,8 @@ export default {
let res = await wtxfResults(row);
if (res.code == 200) {
this.$message({
message: '下发成功',
type: 'success'
message: "下发成功",
type: "success",
});
this.dialogXF = false;
this.resetForm();
......@@ -278,14 +292,14 @@ export default {
//给后端的参数
this.ruleForm.auditStartTime = time[0];
this.ruleForm.auditEndTime = time[1];
}else{
} else {
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
}
},
async submitForm(info) {
if(info==999){
this.currentPage=1
if (info == 999) {
this.currentPage = 1;
}
let params = {
current: this.currentPage,
......@@ -298,9 +312,9 @@ export default {
if (res.code == "200") {
this.tableData = res.data.records;
this.tableData.forEach((item) => {
if(item.confirmStatus ==1||!item.confirmStatus){
if (item.confirmStatus == 1 || !item.confirmStatus) {
this.$set(item, "rectificationStatusText", "未下发");
}else if (item.confirmStatus == 2 ) {
} else if (item.confirmStatus == 2) {
this.$set(item, "rectificationStatusText", "已下发");
} else if (item.confirmStatus == 3) {
this.$set(item, "rectificationStatusText", "已整改");
......@@ -320,39 +334,32 @@ export default {
this.pageSize = 10;
this.ruleForm.auditStartTime = "";
this.ruleForm.auditEndTime = "";
this.ruleForm.dates=[]
this.ruleForm.dates = [];
this.submitForm();
},
//详情
async detailsForm(info) {
if(info){
this.checkedList[0]=info
}else{
if (this.checkedList.length != 1) {
this.$message.error("请选择");
return;
if (info) {
this.checkedList[0] = info;
}
}
// console.log(this.checkedList[0],'22222334')
this.ruleFormdialogXQ = this.checkedList[0];
let params = {
current: this.currentPageXQ,
pageSize: this.pageSizeXQ,
auditId: this.checkedList[0].auditId,
contractNumber: this.checkedList[0].contractNumber,
projectId:this.checkedList[0].projectId
projectId: this.checkedList[0].projectId,
};
let res = await xqauditTasksResults(params);
// this.ruleFormdialogXQ = this.checkedList[0];
if (res.code == 200) {
// this.ruleFormdialogXQ.dates = [
// this.checkedList[0].auditStartTime,
// this.checkedList[0].auditEndTime,
// ];
this.XQtableData = res.data.records;
console.log(this.XQtableData,'XQtableDataXQtableData')
console.log(this.XQtableData, "XQtableDataXQtableData");
this.dialog = true;
}
},
......@@ -708,7 +715,7 @@ h3 {
color: #fff;
}
}
/deep/.el-button--small{
/deep/.el-button--small {
font-size: 14px;
}
</style>
\ No newline at end of file
src/views/compliance/checkRules.vue
......@@ -842,6 +842,7 @@ export default {
async detailsForm(row) {
this.checkedList[0] = row;
this.dialog = true;
this.bjId=row.id
this.ruleFormdialog = this.checkedList[0];
let params = {
id: this.bjId,
......
src/views/projectCheck/checkResault.vue
......@@ -75,7 +75,6 @@
<el-table
@selection-change="handleSelectionChange"
ref="multipleTable"
@row-click="(row, column, event) => handleRowClick(row, column, event, 'multipleTable')"
:data="tableData"
tooltip-effect="dark myTooltips"
style="width: 100%"
......
vue.config.js
......@@ -4,7 +4,7 @@ const { defineConfig } = require('@vue/cli-service')
// const ip = '172.20.10.9'; // 何鹏
// const ip = '192.168.0.120';
// const ip = '192.168.50.1';
const ip = '192.168.8.120';
const ip = '192.168.145.116';
module.exports = defineConfig({
transpileDependencies: true,
//如果是hash模式， publicPath:""；如果是history， publicPath:"/"
......@@ -18,7 +18,7 @@ module.exports = defineConfig({
proxy: {
'/arch-evaluation':{
// target: `http://192.168.69.1:18102`, // pin
target: `http://192.168.145.1:18000/tools`, // pin
target: `http://192.168.145.116:18000/tools`, // pin
changeOrigin: true,
pathRewrite:{
"^/arch-evaluation":"/"
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!