Commit 70454be9 by liangzhen

优化

1 parent bf380876
...@@ -130,9 +130,9 @@ ...@@ -130,9 +130,9 @@
> >
<el-table-column prop="batchName" label="后评估批次名称"> <el-table-column prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
<el-table-column prop="expertName" label="评审专家"> </el-table-column> <el-table-column prop="expertName" label="评审专家" width="90"> </el-table-column>
<el-table-column prop="projectCode" label="项目编码" width="120"> <el-table-column prop="projectCode" label="项目编码" width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="projectName" prop="projectName"
......
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="setscrolldialog"> <div class="setscrolldialogx">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:data="XQtableData" :data="XQtableData"
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
<p class="zjBtn"> <p class="zjBtn">
后评估专家 <span @click="xzExperts()">选择专家</span> 后评估专家 <span @click="xzExperts()">选择专家</span>
</p> </p>
<div class="setscrolldialog"> <div class="setscrolldialogx">
<el-table <el-table
:data=" :data="
addtableData.slice( addtableData.slice(
...@@ -654,7 +654,7 @@ ...@@ -654,7 +654,7 @@
<p class="zjBtn"> <p class="zjBtn">
后评估专家 <span @click="xzExperts()">选择专家</span> 后评估专家 <span @click="xzExperts()">选择专家</span>
</p> </p>
<div class="setscrolldialog"> <div class="setscrolldialogx">
<el-table <el-table
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:data="addtableData" :data="addtableData"
...@@ -999,9 +999,11 @@ export default { ...@@ -999,9 +999,11 @@ export default {
}, },
handleSizeChangeZJ(val) { handleSizeChangeZJ(val) {
this.pageSizeZJ = val; this.pageSizeZJ = val;
this.xzExperts()
}, },
handleCurrentChangeZJ(val) { handleCurrentChangeZJ(val) {
this.currentZJ = val; this.currentZJ = val;
this.xzExperts()
}, },
handleSizeChangetjcl(val) { handleSizeChangetjcl(val) {
this.pageSizetjcl = val; this.pageSizetjcl = val;
...@@ -1529,6 +1531,17 @@ export default { ...@@ -1529,6 +1531,17 @@ export default {
} }
.setscrolldialog { .setscrolldialog {
width: 100%; width: 100%;
height: 450px;
overflow: auto;
box-sizing: border-box;
/deep/ .el-table {
width: 96% !important;
height: 400px;
overflow: auto;
}
}
.setscrolldialogx {
width: 100%;
height: 300px; height: 300px;
overflow: auto; overflow: auto;
box-sizing: border-box; box-sizing: border-box;
......
<template> <template>
<div class="main"> <div class="main">
<div class="close"><i class="el-icon-circle-close"></i></div> <div class="close"><i class="el-icon-circle-close" @click="cancel()"></i></div>
<p class="title">{{projectName}}</p> <p class="title">{{projectName}}</p>
<div class="continer"> <div class="continer">
<div class="top"> <div class="top">
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> </div>
<iframe <iframe
v-if="blobType=='pdf'&&options.length>0" v-if="blobType=='pdf'||blobType=='doc'&&options.length>0"
:key="iframeUrl" :key="iframeUrl"
:src="iframeUrl" :src="iframeUrl"
frameborder="0" frameborder="0"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<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="">
</div> </div>
<div class="docDiv" v-else-if="blobType=='docx'||blobType=='doc'&&options.length>0"> <div class="docDiv" v-else-if="blobType=='docx'&&options.length>0">
<div :ref="`word`" :id="`word${item.typeCode}`" > <div :ref="`word`" :id="`word${item.typeCode}`" >
</div> </div>
</div> </div>
...@@ -481,10 +481,10 @@ docxOptions: { ...@@ -481,10 +481,10 @@ docxOptions: {
console.log(this.blobType,'文件类型') console.log(this.blobType,'文件类型')
const binaryData = [] const binaryData = []
binaryData.push(resUrl) binaryData.push(resUrl)
let URL = window.URL.createObjectURL(new Blob(binaryData, { type:row.contentType})) let URL = window.URL.createObjectURL(new Blob(binaryData, { type: "application/pdf" }))
if(this.iframeUrl ==''){ if(this.iframeUrl ==''){
this.iframeUrl = URL+'#view=FitH,top' } this.iframeUrl = URL+'#view=FitH,top' }
if(this.blobType=='docx'||this.blobType=='doc'){ if(this.blobType=='docx'){
let docx = require("docx-preview"); let docx = require("docx-preview");
this.$nextTick(()=>{ this.$nextTick(()=>{
docx.renderAsync(resUrl,document.getElementById(`word${code}`) ,null, this.docxOptions) // 渲染到页面预览 docx.renderAsync(resUrl,document.getElementById(`word${code}`) ,null, this.docxOptions) // 渲染到页面预览
...@@ -932,11 +932,13 @@ docxOptions: { ...@@ -932,11 +932,13 @@ docxOptions: {
} }
/deep/ .docx { /deep/ .docx {
width: 100% !important; // width: 100% !important;
display: table !important; display: table !important;
padding: 2em 1em 0 !important; padding: 2em 1em 0 !important;
margin: 0 auto !important;
} }
.kaimo-docx-666{ /deep/.kaimo-docx-666{
margin: 0 auto !important;
text-align: center; text-align: center;
} }
</style> </style>
\ No newline at end of file
...@@ -130,9 +130,9 @@ ...@@ -130,9 +130,9 @@
> >
<el-table-column prop="batchName" label="后评估批次名称"> <el-table-column prop="batchName" label="后评估批次名称">
</el-table-column> </el-table-column>
<el-table-column prop="expertName" label="评审专家"> </el-table-column> <el-table-column prop="expertName" label="评审专家" width="90"> </el-table-column>
<el-table-column prop="projectCode" label="项目编码" width="120"> <el-table-column prop="projectCode" label="项目编码" width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="projectName" prop="projectName"
......
...@@ -999,9 +999,11 @@ export default { ...@@ -999,9 +999,11 @@ export default {
}, },
handleSizeChangeZJ(val) { handleSizeChangeZJ(val) {
this.pageSizeZJ = val; this.pageSizeZJ = val;
this.xzExperts()
}, },
handleCurrentChangeZJ(val) { handleCurrentChangeZJ(val) {
this.currentZJ = val; this.currentZJ = val;
this.xzExperts()
}, },
handleSizeChangetjcl(val) { handleSizeChangetjcl(val) {
this.pageSizetjcl = val; this.pageSizetjcl = val;
......
<template> <template>
<div class="main"> <div class="main">
<div class="close"><i class="el-icon-circle-close"></i></div> <div class="close"><i class="el-icon-circle-close" @click="cancel()"></i></div>
<p class="title">{{projectName}}</p> <p class="title">{{projectName}}</p>
<div class="continer"> <div class="continer">
<div class="top"> <div class="top">
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> </div>
<iframe <iframe
v-if="blobType=='pdf'&&options.length>0" v-if="blobType=='pdf'||blobType=='doc'&&options.length>0"
:key="iframeUrl" :key="iframeUrl"
:src="iframeUrl" :src="iframeUrl"
frameborder="0" frameborder="0"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<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="">
</div> </div>
<div class="docDiv" v-else-if="blobType=='docx'||blobType=='doc'&&options.length>0"> <div class="docDiv" v-else-if="blobType=='docx'&&options.length>0">
<div :ref="`word`" :id="`word${item.typeCode}`" > <div :ref="`word`" :id="`word${item.typeCode}`" >
</div> </div>
</div> </div>
...@@ -478,13 +478,12 @@ docxOptions: { ...@@ -478,13 +478,12 @@ 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:row.contentType})) let URL = window.URL.createObjectURL(new Blob(binaryData, { type: "application/pdf" }))
if(this.iframeUrl ==''){ if(this.iframeUrl ==''){
this.iframeUrl = URL+'#view=FitH,top' } this.iframeUrl = URL+'#view=FitH,top' }
if(this.blobType=='docx'||this.blobType=='doc'){ if(this.blobType=='docx'){
let docx = require("docx-preview"); let docx = require("docx-preview");
this.$nextTick(()=>{ this.$nextTick(()=>{
docx.renderAsync(resUrl,document.getElementById(`word${code}`) ,null, this.docxOptions) // 渲染到页面预览 docx.renderAsync(resUrl,document.getElementById(`word${code}`) ,null, this.docxOptions) // 渲染到页面预览
...@@ -940,13 +939,14 @@ docxOptions: { ...@@ -940,13 +939,14 @@ 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;
padding: 2em 1em 0 !important; padding: 2em 1em 0 !important;
margin: 0 auto !important;
} }
.kaimo-docx-666{ /deep/.kaimo-docx-666{
margin: 0 auto !important;
text-align: center; text-align: center;
} }
</style> </style>
\ No newline at end of file
...@@ -808,7 +808,7 @@ export default { ...@@ -808,7 +808,7 @@ export default {
console.log(this.tabListYL, "this.tabListYL"); console.log(this.tabListYL, "this.tabListYL");
let resUrl = await downloadObject({ fileId: this.tabListYL[index].id }); let resUrl = await downloadObject({ fileId: this.tabListYL[index].id });
loadingInstance.close(); loadingInstance.close();
if (this.tabListYL[index].url.slice(-3) == "pdf") { if (this.tabListYL[index].url.slice(-3) == "pdf"||this.tabListYL[index].url.slice(-3) == "doc") {
this.blobType = "pdf"; this.blobType = "pdf";
const binaryData = []; const binaryData = [];
binaryData.push(resUrl); binaryData.push(resUrl);
...@@ -818,7 +818,7 @@ export default { ...@@ -818,7 +818,7 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.$set(this.tabListYL[index], "iframeUrl", URL + "#view=FitH,top"); this.$set(this.tabListYL[index], "iframeUrl", URL + "#view=FitH,top");
}); });
} else if (this.tabListYL[index].url.slice(-4) == "docx"||this.tabListYL[index].url.slice(-3) == "doc") { } else if (this.tabListYL[index].url.slice(-4) == "docx") {
this.blobType = "docx"; this.blobType = "docx";
let docx = require("docx-preview"); let docx = require("docx-preview");
this.$nextTick(() => { this.$nextTick(() => {
......
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="isAppealText" label="申诉是否通过" width="120"> <el-table-column prop="isAppealText" label="申诉是否通过" width="120">
</el-table-column> </el-table-column>
<el-table-column prop="reviewStatus" label="申诉复核情况" width="140" show-overflow-tooltip> <el-table-column prop="reviewStatus" label="申诉复核情况" width="auto" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column prop="rectificationText" label="是否完成整改" width="120"> <el-table-column prop="rectificationText" label="是否完成整改" width="120">
</el-table-column> </el-table-column>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!