Skip to content

Administrator / project_progress

Go to a project
Commit 6940c0c3 by liangzhen
Options

饱和

1 parent 654021fe
Inline Side-by-side
Showing with 89 additions and 34 deletions
src/views/assessChecks/checkCompliance.vue
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
:key="iframeUrl" :key="iframeUrl"
:src="iframeUrl" :src="iframeUrl"
frameborder="0" frameborder="0"
style="width: 80%; height: 60vh; margin: auto; display: block" :class="dialogFullScreen?'iframeDivBig':'iframeDiv'"
></iframe> ></iframe>
<div v-else-if="blobType=='png'||blobType=='jpg'" class="blobImg"> <div v-else-if="blobType=='png'||blobType=='jpg'" class="blobImg">
<img :src="iframeUrl" alt=""> <img :src="iframeUrl" alt="">
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</div> </div>
<div class="right"> <div class="right">
<p class="tableTitle">检查项</p> <p class="tableTitle">检查项</p>
<div class="rightscoll"> <div :class="dialogFullScreen?'rightscollBig':'rightscoll'">
<div <div
class="rightContent" class="rightContent"
v-for="item in questionList" v-for="item in questionList"
...@@ -195,11 +195,13 @@ ...@@ -195,11 +195,13 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<p class="Btn"> <p class="Btn">
<span @click="cancel()">取消</span><span @click="save()">保存</span> <span @click="submitNexts()">提交</span> <span @click="cancel()">取消</span><span @click="save()">保存</span> <span @click="submitNexts()">提交</span>
</p> </p>
</div>
</div>
<el-dialog <el-dialog
:visible.sync="dialogzhanshi" :visible.sync="dialogzhanshi"
title="匹配展示" title="匹配展示"
...@@ -212,7 +214,7 @@ ...@@ -212,7 +214,7 @@
<div v-html="wtmx" class="dialogscroll"></div> <div v-html="wtmx" class="dialogscroll"></div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -228,7 +230,6 @@ import { ...@@ -228,7 +230,6 @@ import {
presignedUrl, presignedUrl,
selFileList selFileList
} from "@/api/index"; } from "@/api/index";
import { MaterialsListKY } from "@/utils/cache";
export default { export default {
data() { data() {
return { return {
...@@ -294,9 +295,6 @@ docxOptions: { ...@@ -294,9 +295,6 @@ docxOptions: {
this.init(this.clqparams); this.init(this.clqparams);
}, },
methods: { methods: {
fullScreen(){
},
zhanshi(){ zhanshi(){
this.dialogzhanshi=true this.dialogzhanshi=true
...@@ -501,7 +499,6 @@ docxOptions: { ...@@ -501,7 +499,6 @@ docxOptions: {
if( this.blobType==''){ if( this.blobType==''){
this.blobType=row.suffix this.blobType=row.suffix
} }
console.log(this.blobType,'文件类型')
const binaryData = [] const binaryData = []
binaryData.push(resUrl) binaryData.push(resUrl)
let URL = window.URL.createObjectURL(new Blob(binaryData, { type: "application/pdf" })) let URL = window.URL.createObjectURL(new Blob(binaryData, { type: "application/pdf" }))
...@@ -537,11 +534,18 @@ docxOptions: { ...@@ -537,11 +534,18 @@ docxOptions: {
}, },
change(id) { change(id) {
console.log(
JSON.stringify(this.questionList) ==
JSON.stringify(this.oldQuestionList),
"完全相同么"
);
if ( if (
JSON.stringify(this.questionList) == JSON.stringify(this.questionList) ==
JSON.stringify(this.oldQuestionList) JSON.stringify(this.oldQuestionList)
) { ) {
this.active = id * 1; this.active = id * 1;
// this.tabListKY = MaterialsListKY(id * 1 + 1);
this.init(this.clqparams); this.init(this.clqparams);
return; return;
} }
...@@ -553,7 +557,8 @@ docxOptions: { ...@@ -553,7 +557,8 @@ docxOptions: {
}) })
.then(() => { .then(() => {
this.save('3',id); this.save('3',id);
// this.active = id * 1;
// this.init(this.clqparams);
}) })
.catch((action) => { .catch((action) => {
console.log(action, "actionaction"); console.log(action, "actionaction");
...@@ -622,7 +627,7 @@ docxOptions: { ...@@ -622,7 +627,7 @@ docxOptions: {
path: "/mainLayout/auxiliaryInspection", path: "/mainLayout/auxiliaryInspection",
}); });
}, },
async save(type,id) { async save(type) {
this.questionList.forEach((item) => { this.questionList.forEach((item) => {
let evals = ""; let evals = "";
item.evalList.forEach((childItem) => { item.evalList.forEach((childItem) => {
...@@ -646,6 +651,8 @@ docxOptions: { ...@@ -646,6 +651,8 @@ docxOptions: {
} }
}); });
console.log(this.questionList, "questionList");
let params = { let params = {
list: this.questionList, list: this.questionList,
...@@ -717,6 +724,7 @@ docxOptions: { ...@@ -717,6 +724,7 @@ docxOptions: {
height: 100%; height: 100%;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
overflow-y: auto;
} }
.close { .close {
position: absolute; position: absolute;
...@@ -754,11 +762,13 @@ docxOptions: { ...@@ -754,11 +762,13 @@ docxOptions: {
width: 100%; width: 100%;
margin-top: 10px; margin-top: 10px;
display: flex; display: flex;
position: relative;
} }
.left { .left {
width: 49%; width: 49%;
min-height: 100px; min-height: 100px;
background: #fff; background: #fff;
margin-bottom: 50px;
// color: #fff; // color: #fff;
} }
...@@ -772,6 +782,11 @@ docxOptions: { ...@@ -772,6 +782,11 @@ docxOptions: {
overflow-y: auto; overflow-y: auto;
padding: 10px; padding: 10px;
} }
.rightscollBig {
height: 680px;
overflow-y: auto;
padding: 10px;
}
} }
/deep/.el-step__icon { /deep/.el-step__icon {
color: #0d867f; color: #0d867f;
...@@ -879,15 +894,17 @@ docxOptions: { ...@@ -879,15 +894,17 @@ docxOptions: {
justify-content: space-between; justify-content: space-between;
} }
.Btn { .Btn {
width: calc(100% - 276px) !important; // width: calc(100% - 276px) !important;
position: fixed; width: 100%;
height: 80px; position:absolute;
bottom: -15px; height: 50px;
bottom: 0px;
right: 0; right: 0;
z-index: 100; z-index: 100;
background-color: #f5f5f6; background-color: #f5f5f6;
line-height: 80px; line-height: 70px;
box-sizing: border-box; box-sizing: border-box;
margin: 0;
span { span {
display: inline-block; display: inline-block;
width: 89px; width: 89px;
...@@ -943,6 +960,20 @@ docxOptions: { ...@@ -943,6 +960,20 @@ docxOptions: {
height:600px; height:600px;
overflow: auto; overflow: auto;
} }
.iframeDiv{
width: 80%;
height: 50vh;
margin: auto;
display: block
}
.iframeDivBig{
width: 80%;
height: 66vh;
margin: auto;
display: block
}
.opt{ .opt{
height: 40px; height: 40px;
width: 100%; width: 100%;
...@@ -955,7 +986,6 @@ docxOptions: { ...@@ -955,7 +986,6 @@ docxOptions: {
/deep/ .docx-wrapper { /deep/ .docx-wrapper {
padding: 0 !important; padding: 0 !important;
} }
/deep/ .docx { /deep/ .docx {
// width: 100% !important; // width: 100% !important;
display: table !important; display: table !important;
......
src/views/assessZC/checkCompliance.vue
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
:key="iframeUrl" :key="iframeUrl"
:src="iframeUrl" :src="iframeUrl"
frameborder="0" frameborder="0"
style="width: 80%; height: 60vh; margin: auto; display: block" :class="dialogFullScreen?'iframeDivBig':'iframeDiv'"
></iframe> ></iframe>
<div v-else-if="blobType=='png'||blobType=='jpg'" class="blobImg"> <div v-else-if="blobType=='png'||blobType=='jpg'" class="blobImg">
<img :src="iframeUrl" alt=""> <img :src="iframeUrl" alt="">
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</div> </div>
<div class="right"> <div class="right">
<p class="tableTitle">检查项</p> <p class="tableTitle">检查项</p>
<div class="rightscoll"> <div :class="dialogFullScreen?'rightscollBig':'rightscoll'">
<div <div
class="rightContent" class="rightContent"
v-for="item in questionList" v-for="item in questionList"
...@@ -195,12 +195,13 @@ ...@@ -195,12 +195,13 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<p class="Btn"> <p class="Btn">
<span @click="cancel()">取消</span><span @click="save()">保存</span> <span @click="submitNexts()">提交</span> <span @click="cancel()">取消</span><span @click="save()">保存</span> <span @click="submitNexts()">提交</span>
<!-- <span @click="zhanshi()">展示</span> -->
</p> </p>
</div>
</div>
<el-dialog <el-dialog
:visible.sync="dialogzhanshi" :visible.sync="dialogzhanshi"
title="匹配展示" title="匹配展示"
...@@ -724,6 +725,7 @@ docxOptions: { ...@@ -724,6 +725,7 @@ docxOptions: {
height: 100%; height: 100%;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
overflow-y: auto;
} }
.close { .close {
position: absolute; position: absolute;
...@@ -761,11 +763,13 @@ docxOptions: { ...@@ -761,11 +763,13 @@ docxOptions: {
width: 100%; width: 100%;
margin-top: 10px; margin-top: 10px;
display: flex; display: flex;
position: relative;
} }
.left { .left {
width: 49%; width: 49%;
min-height: 100px; min-height: 100px;
background: #fff; background: #fff;
margin-bottom: 50px;
// color: #fff; // color: #fff;
} }
...@@ -779,6 +783,11 @@ docxOptions: { ...@@ -779,6 +783,11 @@ docxOptions: {
overflow-y: auto; overflow-y: auto;
padding: 10px; padding: 10px;
} }
.rightscollBig {
height: 680px;
overflow-y: auto;
padding: 10px;
}
} }
/deep/.el-step__icon { /deep/.el-step__icon {
color: #0d867f; color: #0d867f;
...@@ -886,15 +895,17 @@ docxOptions: { ...@@ -886,15 +895,17 @@ docxOptions: {
justify-content: space-between; justify-content: space-between;
} }
.Btn { .Btn {
width: calc(100% - 276px) !important; // width: calc(100% - 276px) !important;
position: fixed; width: 100%;
height: 80px; position:absolute;
bottom: -15px; height: 50px;
bottom: 0px;
right: 0; right: 0;
z-index: 100; z-index: 100;
background-color: #f5f5f6; background-color: #f5f5f6;
line-height: 80px; line-height: 70px;
box-sizing: border-box; box-sizing: border-box;
margin: 0;
span { span {
display: inline-block; display: inline-block;
width: 89px; width: 89px;
...@@ -950,6 +961,20 @@ docxOptions: { ...@@ -950,6 +961,20 @@ docxOptions: {
height:600px; height:600px;
overflow: auto; overflow: auto;
} }
.iframeDiv{
width: 80%;
height: 50vh;
margin: auto;
display: block
}
.iframeDivBig{
width: 80%;
height: 66vh;
margin: auto;
display: block
}
.opt{ .opt{
height: 40px; height: 40px;
width: 100%; width: 100%;
......
src/views/assessZC/projectView.vue
...@@ -111,8 +111,8 @@ ...@@ -111,8 +111,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="projectType" label="项目类型" width="120"> <el-table-column prop="projectType" label="项目类型" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-show="scope.row.projectType"> <span v-show="scope.row.type">
{{ scope.row.projectType | proType }}</span {{ scope.row.type | proType }}</span
> >
</template> </template>
</el-table-column> </el-table-column>
...@@ -486,12 +486,12 @@ export default { ...@@ -486,12 +486,12 @@ export default {
}, },
upload(row) { upload(row) {
this.ruleFormdialog = row; this.ruleFormdialog = row;
if (!row.projectType) { if (!row.type) {
this.form = {}; this.form = {};
this.showType = true; this.showType = true;
} else { } else {
this.upprojectType = row.projectType; this.upprojectType = row.type;
this.MaterialWarehous(row.projectType); this.MaterialWarehous(row.type);
} }
}, },
changeLX() { changeLX() {
...@@ -664,7 +664,7 @@ export default { ...@@ -664,7 +664,7 @@ export default {
this.$refs.multipleTable.toggleRowSelection(selection[1], true); this.$refs.multipleTable.toggleRowSelection(selection[1], true);
} }
this.ruleFormdialog = this.$refs.multipleTable.selection[0]; this.ruleFormdialog = this.$refs.multipleTable.selection[0];
if (!this.ruleFormdialog.projectType) { if (!this.ruleFormdialog.type) {
this.inspectdisabled = true; this.inspectdisabled = true;
} }
}else{ }else{
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!