Skip to content

Administrator / project_progress

Go to a project
Commit 9fe9a7e7 by liangzhen
Options

暂存

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