Commit 2ff6d97b by liangzhen

暂存一下

1 parent 3c9ba028
...@@ -254,7 +254,23 @@ export default { ...@@ -254,7 +254,23 @@ export default {
oldQuestionList: [], //对比列表 oldQuestionList: [], //对比列表
blobType:'pdf',//bolb类型 blobType:'pdf',//bolb类型
projectName:"", projectName:"",
valuesel:"" valuesel:"",
docxOptions: {
className: "kaimo-docx-666", // string:默认和文档样式类的类名/前缀
inWrapper: true, // boolean:启用围绕文档内容的包装器渲染
ignoreWidth: true, // boolean:禁用页面的渲染宽度
ignoreHeight: false, // boolean:禁止渲染页面高度
ignoreFonts: true, // boolean:禁用字体渲染
breakPages: false, // boolean:在分页符上启用分页
ignoreLastRenderedPageBreak: true, // boolean:在 lastRenderedPageBreak 元素上禁用分页
experimental: false, // boolean:启用实验功能(制表符停止计算)
trimXmlDeclaration: true, // boolean:如果为true,解析前会从 xml 文档中移除 xml 声明
useBase64URL: false, // boolean:如果为true,图片、字体等会转为base 64 URL,否则使用URL.createObjectURL
useMathMLPolyfill: false, // boolean:包括用于 chrome、edge 等的 MathML polyfill。
showChanges: false, // boolean:启用文档更改的实验性渲染(插入/删除)
debug: false, // boolean:启用额外的日志记录
}
}; };
}, },
mounted() { mounted() {
...@@ -904,4 +920,16 @@ export default { ...@@ -904,4 +920,16 @@ export default {
width:600px; width:600px;
} }
} }
/deep/ .docx-wrapper {
padding: 0 !important;
}
/deep/ .docx {
width: 100% !important;
display: table !important;
padding: 2em 1em 0 !important;
}
.kaimo-docx-666{
text-align: center;
}
</style> </style>
\ No newline at end of file
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
placeholder="请选择" placeholder="请选择"
clearable clearable
> >
<el-option label="独立建设" value="1"></el-option> <el-option label="独立建设" value="1"></el-option>
<el-option label="统推" value="2"></el-option> <el-option label="统推" value="2"></el-option>
<el-option label="自建" value="3"></el-option> <el-option label="自建" value="3"></el-option>
</el-select> </el-select>
...@@ -115,7 +115,11 @@ ...@@ -115,7 +115,11 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="constructionFormText" label="建设形式" width="90"> <el-table-column
prop="constructionFormText"
label="建设形式"
width="90"
>
</el-table-column> </el-table-column>
<el-table-column prop="startupStatus" label="启动日期" width="90"> <el-table-column prop="startupStatus" label="启动日期" width="90">
</el-table-column> </el-table-column>
...@@ -173,31 +177,24 @@ ...@@ -173,31 +177,24 @@
class="elpagination" class="elpagination"
> >
</el-pagination> </el-pagination>
<!-- <el-dialog
title="项目文档"
:visible.sync="dialog"
width="90%"
:modal-append-to-body="false"
:append-to-body="false"
custom-class="fullscreen-dialog"
> -->
<el-dialog <el-dialog
:visible.sync="dialog" :visible.sync="dialog"
:modal-append-to-body="false" :modal-append-to-body="false"
:append-to-body="false" :append-to-body="false"
:class="[dialogFullScreen ? 'fullscreen' : 'no_fullscreen']" :class="[dialogFullScreen ? 'fullscreen' : 'no_fullscreen']"
> >
<template slot="title"> <template slot="title">
<div class="custom_dialog_header"> <div class="custom_dialog_header">
<span class="el_dialog_title">项目文档</span> <span class="el_dialog_title">项目文档</span>
<div <div
class="custom_dialog_menu" class="custom_dialog_menu"
@click="dialogFullScreen = !dialogFullScreen" @click="dialogFullScreen = !dialogFullScreen"
> >
<i class="el-icon-full-screen"></i> <i class="el-icon-full-screen"></i>
</div>
</div> </div>
</template> </div>
</template>
<div class="dialogFrom"> <div class="dialogFrom">
<p class="xqtitle"><span></span>{{ ruleFormdialog.projectName }}</p> <p class="xqtitle"><span></span>{{ ruleFormdialog.projectName }}</p>
<div class="setscrolldialog"> <div class="setscrolldialog">
...@@ -210,8 +207,8 @@ ...@@ -210,8 +207,8 @@
:row-class-name="tableRowClassName" :row-class-name="tableRowClassName"
:span-method="arraySpanMethod" :span-method="arraySpanMethod"
border border
> >
<el-table-column <el-table-column
label="材料类别" label="材料类别"
prop="projectStagetext" prop="projectStagetext"
width="100" width="100"
...@@ -219,7 +216,7 @@ ...@@ -219,7 +216,7 @@
</el-table-column> </el-table-column>
<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 label="资料类型" prop="materialName" width="300"> <el-table-column label="资料类型" prop="materialName" width="300">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -246,11 +243,14 @@ ...@@ -246,11 +243,14 @@
action="" action=""
:on-success="handleSuccess" :on-success="handleSuccess"
> >
</el-upload> </el-upload>
<el-button size="small" type="primary" class="btn-search" <el-button
@click="uploadFiles(scope.row)">上传</el-button size="small"
> type="primary"
class="btn-search"
@click="uploadFiles(scope.row)"
>上传</el-button
>
<el-button <el-button
size="small" size="small"
type="primary" type="primary"
...@@ -277,11 +277,7 @@ ...@@ -277,11 +277,7 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="lishi" label="历史版本" width="100">
prop="lishi"
label="历史版本"
width="100"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="small" size="small"
...@@ -300,13 +296,14 @@ ...@@ -300,13 +296,14 @@
</div> </div>
<el-dialog <el-dialog
class="innerVisible" class="innerVisible"
width="60%" width="80%"
title="历史版本" title="历史版本"
:modal-append-to-body="false" :modal-append-to-body="false"
append-to-body append-to-body
:visible.sync="innerVisible" :visible.sync="innerVisible"
> >
<el-table <el-table
class="histable"
:data="tableHistory" :data="tableHistory"
tooltip-effect="dark myTooltips" tooltip-effect="dark myTooltips"
style="width: 100%" style="width: 100%"
...@@ -539,7 +536,7 @@ export default { ...@@ -539,7 +536,7 @@ export default {
URL.revokeObjectURL(url); // 释放内存 URL.revokeObjectURL(url); // 释放内存
}, },
async delAll(row) { async delAll(row) {
console.log(row,'6666666666666') console.log(row, "6666666666666");
this.$confirm("此操作将删除该文件, 是否继续?", "提示", { this.$confirm("此操作将删除该文件, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
...@@ -575,7 +572,7 @@ export default { ...@@ -575,7 +572,7 @@ export default {
async MaterialWarehous(projectType) { async MaterialWarehous(projectType) {
this.mergingPos = 0; this.mergingPos = 0;
this.mergingRows = []; this.mergingRows = [];
this.tableDataQR=[]; this.tableDataQR = [];
console.log("不调接口了"); console.log("不调接口了");
this.dialog = true; this.dialog = true;
let params = { let params = {
...@@ -755,7 +752,7 @@ export default { ...@@ -755,7 +752,7 @@ export default {
if (response.code == "200") { if (response.code == "200") {
this.fileList = []; this.fileList = [];
this.MaterialWarehous(this.upprojectType); this.MaterialWarehous(this.upprojectType);
this.$refs['upload'+arguments[2].mid].clearFiles(); this.$refs["upload" + arguments[2].mid].clearFiles();
this.$message("上传成功"); this.$message("上传成功");
} else { } else {
this.$message("上传失败"); this.$message("上传失败");
...@@ -842,21 +839,21 @@ export default { ...@@ -842,21 +839,21 @@ export default {
}; };
} }
}, },
uploadFiles(row){ uploadFiles(row) {
if(row.fullId){ if (row.fullId) {
this.$confirm("已有文件,本次上传将覆盖历史上传文件,是否继续?", "提示", { this.$confirm("已有文件,本次上传将覆盖历史上传文件,是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
})
.then((res) => {
this.$refs['upload'+row.mid].$refs['upload-inner'].handleClick()
}) })
.catch(); .then((res) => {
}else{ this.$refs["upload" + row.mid].$refs["upload-inner"].handleClick();
this.$refs['upload'+row.mid].$refs['upload-inner'].handleClick() })
.catch();
} else {
this.$refs["upload" + row.mid].$refs["upload-inner"].handleClick();
} }
} },
}, },
}; };
</script> </script>
...@@ -1097,12 +1094,7 @@ export default { ...@@ -1097,12 +1094,7 @@ export default {
.bigdialog /deep/.el-dialog__body { .bigdialog /deep/.el-dialog__body {
min-height: 70vh; min-height: 70vh;
} }
// .dialogFrom {
// .eltable {
// height: 500px;
// overflow-y: auto;
// }
// }
// .setscrolldialog { // .setscrolldialog {
// width: 100%; // width: 100%;
// height: 290px; // height: 290px;
...@@ -1146,8 +1138,14 @@ export default { ...@@ -1146,8 +1138,14 @@ export default {
} }
} }
.no_fullscreen { .no_fullscreen {
.dialogFrom {
.eltable {
height: 610px;
overflow-y: auto;
}
}
/deep/ .el-dialog { /deep/ .el-dialog {
width: 70%; width: 90%;
margin-top: 3vh !important; margin-top: 3vh !important;
margin-left: 3vw !important; margin-left: 3vw !important;
} }
...@@ -1168,14 +1166,18 @@ export default { ...@@ -1168,14 +1166,18 @@ export default {
color: #fff !important; color: #fff !important;
margin-right: 10px; margin-right: 10px;
} }
.el_dialog_title{ .el_dialog_title {
color: #f0ffff; color: #f0ffff;
font-size: 18px; font-size: 18px;
} }
/deep/ .custom_dialog_menu{ /deep/ .custom_dialog_menu {
padding: 2px 20px 0 30px; padding: 2px 20px 0 30px;
} }
/deep/ .el-icon-close:before{ /deep/ .el-icon-close:before {
font-size:20px !important; font-size: 20px !important;
}
.histable{
height: 630px;
overflow-y: auto;
} }
</style> </style>
\ No newline at end of file
<template> <template>
<div class="mian"> <div class="mian">
<!-- <div class="head-container"> <div class="head-container">
<div class="logo" style="z-index: 10"> <div class="logo" style="z-index: 10">
<div class="logo-inner"> <div class="logo-inner">
<img src="../../assets/logo.png" alt="" /> <img src="../../assets/logo.png" alt="" />
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> --> </div>
<router-view></router-view> <router-view></router-view>
<!-- <MainLayout class="continer"> <!-- <MainLayout class="continer">
<router-view></router-view> <router-view></router-view>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!