FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
396572590@qq.com
2022-06-21 17:19:18 +08:00
parent bd109c9dcf 2f0a24f8cf
commit 3090f9a59e
13 changed files with 179 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/static/pdf/web/viewer.html
+13 -13
View File
@@ -233,19 +233,19 @@ See https://github.com/adobe-type-tools/cmap-resources
<div id="outerContainer"> <div id="outerContainer">
<div id="sidebarContainer"> <div id="sidebarContainer">
<div id="toolbarSidebar"> <!-- <div id="toolbarSidebar">-->
<div class="splitToolbarButton toggled"> <!-- <div class="splitToolbarButton toggled">-->
<button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs"> <!-- <button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs">-->
<span data-l10n-id="thumbs_label">Thumbnails</span> <!-- <span data-l10n-id="thumbs_label">Thumbnails</span>-->
</button> <!-- </button>-->
<button id="viewOutline" class="toolbarButton" title="Show Document Outline (double-click to expand/collapse all items)" tabindex="3" data-l10n-id="document_outline"> <!-- <button id="viewOutline" class="toolbarButton" title="Show Document Outline (double-click to expand/collapse all items)" tabindex="3" data-l10n-id="document_outline">-->
<span data-l10n-id="document_outline_label">Document Outline</span> <!-- <span data-l10n-id="document_outline_label">Document Outline</span>-->
</button> <!-- </button>-->
<button id="viewAttachments" class="toolbarButton" title="Show Attachments" tabindex="4" data-l10n-id="attachments"> <!-- <button id="viewAttachments" class="toolbarButton" title="Show Attachments" tabindex="4" data-l10n-id="attachments">-->
<span data-l10n-id="attachments_label">Attachments</span> <!-- <span data-l10n-id="attachments_label">Attachments</span>-->
</button> <!-- </button>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
<div id="sidebarContent"> <div id="sidebarContent">
<div id="thumbnailView"> <div id="thumbnailView">
</div> </div>
src/pages/config/pages/mechanismManage/pages/committee.vue
+7 -3
View File
@@ -63,8 +63,12 @@
prop="committeeDirectorName" prop="committeeDirectorName"
label="主任" label="主任"
align="center" align="center"
> />
</el-table-column> <el-table-column
prop="committeeDeputy"
label="副主任"
align="center"
/>
<el-table-column <el-table-column
prop="committeeSecretaryName" prop="committeeSecretaryName"
align="center" align="center"
@@ -73,7 +77,7 @@
<el-table-column <el-table-column
prop="committor" prop="committor"
align="center" align="center"
label="委员"> label="成员">
</el-table-column> </el-table-column>
</el-table> </el-table>
<loading :loading="Loading">加载中...</loading> <loading :loading="Loading">加载中...</loading>
src/pages/home2/components/searchGroup/index.vue
-1
View File
@@ -16,7 +16,6 @@
</el-select> </el-select>
<div class="search-condition"> <div class="search-condition">
<el-input <el-input
@keyup.native.enter="search"
v-model="checkContent"> v-model="checkContent">
type="text" type="text"
placeholder="请输入关键词" placeholder="请输入关键词"
src/pages/personal/pages/my-questions/components/answerItem.vue
+5 -1
View File
@@ -60,6 +60,8 @@
:action="actionPath" :action="actionPath"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
name="file" name="file"
:limit="5"
:on-exceed="handleExceed"
:file-list="fileList" :file-list="fileList"
ref="importFileAboutStand"> ref="importFileAboutStand">
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
@@ -100,6 +102,9 @@ export default {
} }
}, },
methods:{ methods:{
handleExceed(files, fileList) {
this.$message.warning(`当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
},
//提交 //提交
handleSubmit(){ handleSubmit(){
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {
@@ -192,7 +197,6 @@ export default {
}, res => { }, res => {
if(res.respCode === '200'){ if(res.respCode === '200'){
this.$emit('emitInsState',true) this.$emit('emitInsState',true)
this.$message.success('归档成功')
} }
}, e => { }, e => {
}) })
src/pages/personal/pages/my-questions/components/questionItemInfo.vue
+16 -2
View File
@@ -26,7 +26,7 @@
</div> </div>
</div> </div>
<div style="float: right; margin-top: 20px"> <div style="float: right; margin-top: 20px">
<el-checkbox v-if="answer.checkedShow && (answer.answerer !== answererNowUserName)" @change="answerChang" :disabled="answer.state && answer.state === 'yes'" v-model="answer.checked">归档</el-checkbox> <el-checkbox v-if="answer.checkedShow && archiveVerify()" @change="answerChang" :disabled="answer.state && answer.state === 'yes'" v-model="answer.checked">归档</el-checkbox>
</div> </div>
</div> </div>
<!-- <div class="footer-box">--> <!-- <div class="footer-box">-->
@@ -38,16 +38,30 @@
<script> <script>
export default { export default {
name: "questionItemInfo", name: "questionItemInfo",
props:['answer'], props: {
answer: {
type: Object,
required: false
},
questionerForm: {
type: Object,
required: false
},
},
data(){ data(){
return{ return{
checked: '', checked: '',
institutionId: this.$store.getters.userInfo.institutionId,
answererNowUserId: this.$store.getters.userInfo.userId, answererNowUserId: this.$store.getters.userInfo.userId,
answererNowUserName: this.$store.getters.userInfo.userName, answererNowUserName: this.$store.getters.userInfo.userName,
fileList:[], fileList:[],
} }
}, },
methods:{ methods:{
archiveVerify(){
return !!(this.questionerForm && this.questionerForm.questioner && this.questionerForm.questioner !== this.answererNowUserName
&& this.institutionId === '30001273');
},
assemble(ids,names){ assemble(ids,names){
let list= []; let list= [];
if(ids && ids !== '' && names && names !== ''){ if(ids && ids !== '' && names && names !== ''){
src/pages/personal/pages/my-questions/index.vue
+18 -3
View File
@@ -328,7 +328,9 @@
<template v-for="(item, index) in answerList"> <template v-for="(item, index) in answerList">
<div class="clearfix"> <div class="clearfix">
<div class="answer-box" > <div class="answer-box" >
<question-item-info :answer="item" :dataLoading="dataLoading"></question-item-info> <question-item-info :key="qiiKey"
:answer="item"
:questionerForm="question"></question-item-info>
</div> </div>
</div> </div>
</template> </template>
@@ -389,7 +391,9 @@
<template v-for="(item, index) in answerList"> <template v-for="(item, index) in answerList">
<div class="clearfix"> <div class="clearfix">
<div class="answer-box" > <div class="answer-box" >
<question-item-info :answer="item"></question-item-info> <question-item-info :key="qiiKey"
:answer="item"
:questionerForm="question"></question-item-info>
</div> </div>
</div> </div>
</template> </template>
@@ -450,7 +454,9 @@
<template v-for="(item, index) in answerList"> <template v-for="(item, index) in answerList">
<div class="clearfix"> <div class="clearfix">
<div class="answer-box" > <div class="answer-box" >
<question-item-info :answer="item"></question-item-info> <question-item-info :key="qiiKey"
:answer="item"
:questionerForm="question"></question-item-info>
</div> </div>
</div> </div>
</template> </template>
@@ -512,7 +518,9 @@
<div class="clearfix"> <div class="clearfix">
<div class="answer-box" > <div class="answer-box" >
<question-item-info <question-item-info
:key="qiiKey"
:answer="item" :answer="item"
:questionerForm="question"
></question-item-info> ></question-item-info>
</div> </div>
</div> </div>
@@ -1246,6 +1254,8 @@ export default {
data(){ data(){
return{ return{
aiKey:1, aiKey:1,
qiiKey:1,
institutionId: this.$store.getters.userInfo.institutionId,
dataLoading: true, dataLoading: true,
roleFlag: false, roleFlag: false,
nodeList: [], nodeList: [],
@@ -1314,6 +1324,7 @@ export default {
} }
}, },
mounted(){ mounted(){
console.log(this.$store.getters.userInfo)
this.standSearch() this.standSearch()
// 查询各下拉框数据 // 查询各下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", "", { this.$http.get("sys/dictype/getDicTypeListCode", "", {
@@ -1632,6 +1643,7 @@ export default {
}, res => { }, res => {
if(this.activeName === 'myAns'){ if(this.activeName === 'myAns'){
if(res.data.length){ if(res.data.length){
res.data.forEach(item => { res.data.forEach(item => {
item.checkedShow = true item.checkedShow = true
if(item.state && item.state === 'yes'){ if(item.state && item.state === 'yes'){
@@ -1645,6 +1657,7 @@ export default {
}else{ }else{
this.answerList = res.data this.answerList = res.data
} }
this.qiiKey++
this.dataLoading = false this.dataLoading = false
}, e => { }, e => {
}) })
@@ -1652,6 +1665,8 @@ export default {
//提问按钮 //提问按钮
queBtn(){ queBtn(){
this.fileList = [] this.fileList = []
// 清空提问
this.standType = "INLAND"
this.questionForm = { this.questionForm = {
pubQue : '',//公共问题 pubQue : '',//公共问题
classification: 'INLAND', //标准类型 classification: 'INLAND', //标准类型
src/pages/phone/domesticDetails.vue
+112 -223
View File
@@ -398,10 +398,10 @@
}}</a> }}</a>
</template> </template>
</p> </p>
</div> </div>
</div> </div>
</template> </template>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -433,8 +433,8 @@
> >
</el-popover> </el-popover>
</el-form-item> </el-form-item>
<el-form-item class="search-item"> <el-form-item class="search-item">
<el-input v-model="standItemSearch.itemsName" size="small" placeholder="根据条款名称查找" clearable <el-input v-model="standItemSearch.itemsName" size="small" placeholder="根据条款名称查找" clearable
maxlength="100"></el-input> maxlength="100"></el-input>
@@ -631,8 +631,8 @@
:total="total7" :total="total7"
@pageChange="pageChange7" @pageChange="pageChange7"
@pageSizeChange="pageSizeChange7"></pagination> @pageSizeChange="pageSizeChange7"></pagination>
<!-- <el-pagination--> <!-- <el-pagination-->
<!-- @size-change="pageSizeChange"--> <!-- @size-change="pageSizeChange"-->
<!-- @current-change="pageChange"--> <!-- @current-change="pageChange"-->
@@ -642,7 +642,7 @@
<!-- layout="sizes, prev, pager, next, jumper"--> <!-- layout="sizes, prev, pager, next, jumper"-->
<!-- :total="standitemTotal">--> <!-- :total="standitemTotal">-->
<!-- </el-pagination>--> <!-- </el-pagination>-->
<!-- <pagination :total="standitemTotal" @pageChange="pageChange"--> <!-- <pagination :total="standitemTotal" @pageChange="pageChange"-->
<!-- @pageSizeChange="pageSizeChange"></pagination>--> <!-- @pageSizeChange="pageSizeChange"></pagination>-->
@@ -754,7 +754,7 @@
v-model="resolveListForm.applyArctic" v-model="resolveListForm.applyArctic"
></custom-select-array> ></custom-select-array>
</template> </template>
<!-- 责任工程师--> <!-- 责任工程师-->
<template> <template>
<el-form-item <el-form-item
@@ -1018,7 +1018,7 @@
standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : '' standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
}}</span> }}</span>
</div> </div>
<div class="see-drawer-div"> <div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="新车型实施日期">新车型实施日期</label> <label class="see-drawer-name" style="font-size: 14px" title="新车型实施日期">新车型实施日期</label>
<span class="see-drawer-val" style="font-size: 12px" <span class="see-drawer-val" style="font-size: 12px"
@@ -1055,15 +1055,15 @@
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.comparedWithPrevious"> <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.comparedWithPrevious">
{{ standShowItemEO.comparedWithPrevious }}</span> {{ standShowItemEO.comparedWithPrevious }}</span>
</div> </div>
<div class="see-drawer-div"> <div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label> <label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire"> <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire">
{{ standShowItemEO.complianceRequire ? (standShowItemEO.complianceRequire === '1' ? '是' : '否') : '-' }} {{ standShowItemEO.complianceRequire ? (standShowItemEO.complianceRequire === '1' ? '是' : '否') : '-' }}
</span> </span>
</div> </div>
<div class="see-drawer-div"> <div class="see-drawer-div">
<label class="see-drawer-name" style="font-size: 14px" title="合规性分析">合规性分析</label> <label class="see-drawer-name" style="font-size: 14px" title="合规性分析">合规性分析</label>
<span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceState"> <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceState">
@@ -1083,7 +1083,7 @@
<!-- <label class="see-drawer-name" title="svpps">svpps</label>--> <!-- <label class="see-drawer-name" title="svpps">svpps</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>--> <!-- <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="see-drawer-div">--> <!-- <div class="see-drawer-div">-->
<!-- <label class="see-drawer-name" title="要求类型">要求类型</label>--> <!-- <label class="see-drawer-name" title="要求类型">要求类型</label>-->
<!-- <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>--> <!-- <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
@@ -1409,6 +1409,7 @@
import RelatedTermsSelect from "@/pages/details/otherStandardDetails/components/RelatedTermsSelect"; import RelatedTermsSelect from "@/pages/details/otherStandardDetails/components/RelatedTermsSelect";
import {getBusStandFileByAttId} from 'api/process' import {getBusStandFileByAttId} from 'api/process'
import {dicTypeData} from "api/unqualProcess"; import {dicTypeData} from "api/unqualProcess";
import { onlyOfficeUrl,kkFileViewUrl } from '@/sysConfig'
export default { export default {
@@ -2639,138 +2640,26 @@
if (fileSuffix !== undefined && fileSuffix !== null) { if (fileSuffix !== undefined && fileSuffix !== null) {
fileSuffix = fileSuffix.toUpperCase() fileSuffix = fileSuffix.toUpperCase()
} }
// 判断上传文件格式 if(fileSuffix !== 'pdg' && fileSuffix !== 'PDG'){
if (fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') { this.getBusStandFileByAttId(attId)
this.downloadFile(attId) .then(res => {
return true if (res) {
} const editFileInfo = res
// 缺少文件
if (this.$route.query.pageType === 'INLAND_STAND') {
if (this.$hasPermission('2d6ab9d465ab73d415194e1ca4313793')) {
if (fileSuffix === '.PDG' || fileSuffix === '.pdg') {
this.getBusStandFileByAttId(attId)
.then(res => {
if (res) {
const editFileInfo = res
if (editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG') {
window.open('book://ssreader/e0?url=' + editFileInfo.downLoadUrl)
} else {
const nowTime = new Date().getTime() const nowTime = new Date().getTime()
window.open(onlyOfficeUrl + '/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime + '&filePath=' + editFileInfo.filePath + '&fileName=' + editFileInfo.fileName) if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
} window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
} }else {
}).catch(e => { const nowTime = new Date().getTime()
console.log(e) // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
this.$message.warning('文件不存在,预览失败') window.open(kkFileViewUrl+'/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
})
} else {
this.$http.get('lawss/sarStandFile/queryConvertAtt', {
attId: attId
}, {
_this: this
}, res => {
if (res.data) {
let fileObj = {}
fileObj.fileId = res.data.attId
fileObj.fileName = oldFileName
let fileList = []
let repeatData = 0
if (sessionStorage.getItem('fileInfo')) {
fileList = JSON.parse(sessionStorage.getItem('fileInfo'))
if (fileList != null && fileList.length > 0) {
for (let i = 0; i < fileList.length; i++) {
if (fileList[i].fileId === res.data.attId) {
repeatData = 1
break
}
}
if (repeatData === 0) {
fileList.push(fileObj)
fileList = JSON.stringify(fileList)
sessionStorage.setItem('fileInfo', fileList)
}
}
} else {
fileList.push(fileObj)
fileList = JSON.stringify(fileList)
sessionStorage.setItem('fileInfo', fileList)
}
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId))
} else {
this.$message.error('文档未转换成功或本地读取不到该文档')
}
}, e => {
this.$message.error('文档未转换成功或本地读取不到该文档')
})
}
} else {
this.$message.error('没有在线预览文档权限！')
}
} else {
// 国外在线预览权限
if (this.$hasPermission('ee684b4a9975f5d8a6dfe898c0332f98')) {
// if (this.$hasPermission('02fd6eff0537c283dd071683de10689f')) {
this.$http.get('lawss/sarStandFile/queryConvertAtt', {
attId: attId
}, {
_this: this
}, res => {
if (res.data) {
let fileObj = {}
fileObj.fileId = res.data.attId
fileObj.fileName = oldFileName
let fileList = []
let repeatData = 0
if (sessionStorage.getItem('fileInfo')) {
fileList = JSON.parse(sessionStorage.getItem('fileInfo'))
if (fileList != null && fileList.length > 0) {
for (let i = 0; i < fileList.length; i++) {
if (fileList[i].fileId === res.data.attId) {
repeatData = 1
break
} }
} }
if (repeatData === 0) { }).catch(e => {
fileList.push(fileObj) this.$message.warning('文件不存在,预览失败')
fileList = JSON.stringify(fileList)
sessionStorage.setItem('fileInfo', fileList)
}
}
} else {
fileList.push(fileObj)
fileList = JSON.stringify(fileList)
sessionStorage.setItem('fileInfo', fileList)
}
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId))
} else {
this.$message.error('文档未转换成功或本地读取不到该文档')
}
}, e => {
this.$message.error('文档未转换成功或本地读取不到该文档')
})
} else {
this.$message.error('没有在线预览文档权限！')
}
}
if(this.$route.query.pageType === 'INLAND_STAND'){
let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
this.$http.get('sarStandardsInfo/sar-standards-info/logInvalid',{
standNumber: standNumber,
standName: this.sarStandardsInfoEO.standName
}, {
_this: this
}, res => {
})
}else{
let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
this.$http.get('sarStandardsInfo/sar-standards-info/logForeign',{
standNumber: standNumber,
standName: this.sarStandardsInfoEO.standEnName
}, {
_this: this
}, res => {
}) })
}else {
this.$message.warning('PDG文件,不支持手机端预览')
} }
}, },
showItemsModel(attField) { showItemsModel(attField) {
@@ -3584,28 +3473,28 @@
/deep/ .el-icon-circle-close:before { /deep/ .el-icon-circle-close:before {
margin-left: 250px; margin-left: 250px;
} }
/deep/ .el-tag.el-tag--info { /deep/ .el-tag.el-tag--info {
margin-left: 30px; margin-left: 30px;
} }
/deep/ .el-radio { /deep/ .el-radio {
margin-left: 30px; margin-left: 30px;
} }
/deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner { /deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner {
width: 600px; width: 600px;
margin-left: 20px; margin-left: 20px;
} }
/deep/ .label-input-form .add-form-item .el-form-item__label { /deep/ .label-input-form .add-form-item .el-form-item__label {
width: 150px; width: 150px;
} }
/deep/ .el-collapse-item__header { /deep/ .el-collapse-item__header {
border-bottom: none !important; border-bottom: none !important;
} }
/deep/ .decomposition-btn { /deep/ .decomposition-btn {
position: absolute; position: absolute;
top: 6px; top: 6px;
@@ -3617,7 +3506,7 @@
color: #07C160; color: #07C160;
border: 1px solid #07C160; border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1); background: rgba(1, 193, 96, 0.1);
/deep/ .icon-separate { /deep/ .icon-separate {
display: inline-block; display: inline-block;
margin-right: 3px; margin-right: 3px;
@@ -3630,22 +3519,22 @@
background-image: url("~assets/images/shangqi/standardDetails/separate.png"); background-image: url("~assets/images/shangqi/standardDetails/separate.png");
} }
} }
/deep/ .el-collapse { /deep/ .el-collapse {
border: none; border: none;
} }
/deep/ .el-collapse-item__wrap { /deep/ .el-collapse-item__wrap {
border: none; border: none;
} }
/deep/ .el-collapse-item__content { /deep/ .el-collapse-item__content {
padding-bottom: 0px; padding-bottom: 0px;
font-size: 16px; font-size: 16px;
color: #303133; color: #303133;
line-height: 1.769230769230769; line-height: 1.769230769230769;
} }
/deep/ .btn1 #question { /deep/ .btn1 #question {
padding: 0 10px; padding: 0 10px;
margin-left: 10px; margin-left: 10px;
@@ -3655,7 +3544,7 @@
color: #409EFF;; color: #409EFF;;
border: 1px solid #409EFF; border: 1px solid #409EFF;
background: rgba(64, 158, 255, 0.1); background: rgba(64, 158, 255, 0.1);
.icon-separate { .icon-separate {
display: inline-block; display: inline-block;
margin-right: 3px; margin-right: 3px;
@@ -3668,7 +3557,7 @@
background-image: url("~assets/images/shangqi/standardDetails/separate.png"); background-image: url("~assets/images/shangqi/standardDetails/separate.png");
} }
} }
.other-standard-details { .other-standard-details {
padding: 15px 30px 0; padding: 15px 30px 0;
width: 100%; width: 100%;
@@ -3677,24 +3566,24 @@
height: 100%; height: 100%;
background: #FFFFFF; background: #FFFFFF;
overflow: auto; overflow: auto;
.itemsTextBox { .itemsTextBox {
min-height: 300px; min-height: 300px;
max-height: 500px; max-height: 500px;
overflow: auto; overflow: auto;
line-height: 20px; line-height: 20px;
/deep/ td { /deep/ td {
border: 1px solid #606266; border: 1px solid #606266;
text-align: center; text-align: center;
} }
} }
/deep/ .el-radio-group { /deep/ .el-radio-group {
display: block; display: block;
margin-bottom: 10px; margin-bottom: 10px;
} }
/deep/ .icon-download { /deep/ .icon-download {
display: inline-block; display: inline-block;
margin-left: 3px; margin-left: 3px;
@@ -3707,7 +3596,7 @@
cursor: pointer; cursor: pointer;
background-image: url("~assets/images/shangqi/img/download.png"); background-image: url("~assets/images/shangqi/img/download.png");
} }
/deep/ .icon-download2 { /deep/ .icon-download2 {
display: inline-block; display: inline-block;
margin-left: 3px; margin-left: 3px;
@@ -3720,54 +3609,54 @@
cursor: pointer; cursor: pointer;
background-image: url("~assets/images/shangqi/img/download2.png"); background-image: url("~assets/images/shangqi/img/download2.png");
} }
.action-bar { .action-bar {
border-top: 0px; border-top: 0px;
} }
.fileCss { .fileCss {
margin-right: 10px; margin-right: 10px;
cursor: pointer; cursor: pointer;
} }
.fileCss:hover { .fileCss:hover {
color: #0c91e5; color: #0c91e5;
} }
.myDialog1 { .myDialog1 {
/deep/ .el-dialog__body { /deep/ .el-dialog__body {
padding: 0px 20px 10px; padding: 0px 20px 10px;
} }
.myRadio { .myRadio {
min-height: 200px; min-height: 200px;
max-height: 400px; max-height: 400px;
overflow: auto; overflow: auto;
} }
} }
.myDialog { .myDialog {
min-width: 700px; min-width: 700px;
.el-dialog { .el-dialog {
min-width: 700px; min-width: 700px;
width: 70%; width: 70%;
} }
/deep/ .el-dialog__body { /deep/ .el-dialog__body {
padding: 0px 20px 56px; padding: 0px 20px 56px;
.basic-information-content { .basic-information-content {
color: #333333; color: #333333;
font-size: 16px; font-size: 16px;
/*font-weight: 400;*/ /*font-weight: 400;*/
.standard-text { .standard-text {
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
} }
& > p { & > p {
min-height: 55px; min-height: 55px;
line-height: 55px; line-height: 55px;
@@ -3775,27 +3664,27 @@
} }
} }
} }
.knowContent { .knowContent {
height: 500px; height: 500px;
} }
} }
.details-header { .details-header {
padding: 34px 0; padding: 34px 0;
font-size: 0.3rem; font-size: 0.3rem;
font-weight: bold; font-weight: bold;
color: #555555; color: #555555;
text-align: center; text-align: center;
& > span { & > span {
width: 100%; width: 100%;
} }
} }
/deep/ .details-content { /deep/ .details-content {
/*padding: 0 67px;*/ /*padding: 0 67px;*/
.details-content-modular { .details-content-modular {
.modular-header { .modular-header {
display: flex; display: flex;
@@ -3804,12 +3693,12 @@
width: 100%; width: 100%;
height: 50px; height: 50px;
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
.modular-header-title { .modular-header-title {
font-size: 0.25rem; font-size: 0.25rem;
font-weight: bold; font-weight: bold;
color: #3B424C; color: #3B424C;
& > .icon-modular-title { & > .icon-modular-title {
display: inline-block; display: inline-block;
margin-left: -28px; margin-left: -28px;
@@ -3821,12 +3710,12 @@
position: relative; position: relative;
top: 2px;; top: 2px;;
} }
& > span { & > span {
padding-left: 10px; padding-left: 10px;
} }
} }
.modular-header-btn { .modular-header-btn {
& > button { & > button {
height: 30px; height: 30px;
@@ -3834,7 +3723,7 @@
font-size: 14px; font-size: 14px;
padding: 0 10px; padding: 0 10px;
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
& > i { & > i {
display: inline-block; display: inline-block;
margin-right: 3px; margin-right: 3px;
@@ -3846,53 +3735,53 @@
vertical-align: text-bottom; vertical-align: text-bottom;
} }
} }
.collection-btn { .collection-btn {
padding: 0; padding: 0;
border: none; border: none;
i { i {
color: #F2CB51; color: #F2CB51;
font-size: 18px; font-size: 18px;
width: 18px; width: 18px;
height: 18px; height: 18px;
} }
/*background: rgba(244, 162, 39, 0.1);*/ /*background: rgba(244, 162, 39, 0.1);*/
.icon-collection { .icon-collection {
background-image: url("~assets/images/shangqi/standardDetails/collection.png"); background-image: url("~assets/images/shangqi/standardDetails/collection.png");
} }
&:hover { &:hover {
background: transparent; background: transparent;
} }
} }
.relation-btn { .relation-btn {
color: #409EFF; color: #409EFF;
border: 1px solid #409EFF; border: 1px solid #409EFF;
background: rgba(64, 158, 255, 0.1); background: rgba(64, 158, 255, 0.1);
.icon-relation { .icon-relation {
background-image: url("~assets/images/shangqi/standardDetails/relation.png"); background-image: url("~assets/images/shangqi/standardDetails/relation.png");
} }
} }
} }
} }
.basic-information-content { .basic-information-content {
color: #333333; color: #333333;
font-size: 0.2rem; font-size: 0.2rem;
/*font-weight: 400;*/ /*font-weight: 400;*/
.standard-text { .standard-text {
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
} }
} }
.modular-content { .modular-content {
.modular-item-more { .modular-item-more {
padding: 5px 0; padding: 5px 0;
@@ -3903,33 +3792,33 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.wrap { .wrap {
cursor: pointer; cursor: pointer;
span { span {
color: #409EFF; color: #409EFF;
} }
img { img {
height: 10px; height: 10px;
margin-left: 5px; margin-left: 5px;
transition: all .2s linear; transition: all .2s linear;
&.is-show-all { &.is-show-all {
transform: rotate(180deg); transform: rotate(180deg);
} }
} }
} }
} }
& > div:not(.modular-item-more) { & > div:not(.modular-item-more) {
position: relative; position: relative;
//英文名称变粗 //英文名称变粗
border-bottom: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
min-height: 43px; min-height: 43px;
line-height: 43px; line-height: 43px;
.modular-content-p-name { .modular-content-p-name {
display: inline-block; display: inline-block;
width: 213px; width: 213px;
@@ -3942,7 +3831,7 @@
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.modular-content-p-val { .modular-content-p-val {
line-height: 32px; line-height: 32px;
display: inline-block; display: inline-block;
@@ -3957,14 +3846,14 @@
//white-space: nowrap; //white-space: nowrap;
//text-overflow: ellipsis; //text-overflow: ellipsis;
} }
.modular-content-p-flies { .modular-content-p-flies {
font-size: 0.2rem; font-size: 0.2rem;
line-height: 32px; line-height: 32px;
//position: relative; //position: relative;
display: inline-block; display: inline-block;
width: calc(~'100% - 225px'); width: calc(~'100% - 225px');
& > .files-title { & > .files-title {
width: calc(~'100% - 120px'); width: calc(~'100% - 120px');
//报批稿撑开 //报批稿撑开
@@ -3972,11 +3861,11 @@
//line-height: 50px; //line-height: 50px;
//font-size: 16px; //font-size: 16px;
color: #409EFF; color: #409EFF;
& > a { & > a {
cursor: pointer; cursor: pointer;
} }
& > i { & > i {
display: inline-block; display: inline-block;
margin-left: 3px; margin-left: 3px;
@@ -3988,16 +3877,16 @@
vertical-align: sub; vertical-align: sub;
cursor: pointer; cursor: pointer;
} }
.icon-download { .icon-download {
background-image: url("~assets/images/shangqi/img/download.png"); background-image: url("~assets/images/shangqi/img/download.png");
} }
.icon-download2 { .icon-download2 {
background-image: url("~assets/images/shangqi/img/download2.png"); background-image: url("~assets/images/shangqi/img/download2.png");
} }
} }
.decomposition-btn { .decomposition-btn {
position: absolute; position: absolute;
//报批稿撑开 //报批稿撑开
@@ -4011,7 +3900,7 @@
color: #07C160; color: #07C160;
border: 1px solid #07C160; border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1); background: rgba(1, 193, 96, 0.1);
.icon-separate { .icon-separate {
display: inline-block; display: inline-block;
margin-right: 3px; margin-right: 3px;
@@ -4028,15 +3917,15 @@
} }
} }
} }
.basic-information { .basic-information {
border-top: 2px dashed #D1D1D1; border-top: 2px dashed #D1D1D1;
.modular-header { .modular-header {
height: 60px; height: 60px;
border-bottom: none; border-bottom: none;
} }
.basic-information-content { .basic-information-content {
& > p { & > p {
min-height: 43px; min-height: 43px;
@@ -4046,7 +3935,7 @@
} }
} }
} }
.more, .put-away { .more, .put-away {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
@@ -4061,74 +3950,74 @@
background-image: linear-gradient(-180deg, rgba(255, 255, 255, 0) 0%, #fff 70%); background-image: linear-gradient(-180deg, rgba(255, 255, 255, 0) 0%, #fff 70%);
padding-bottom: 34px; padding-bottom: 34px;
padding-top: 34px; padding-top: 34px;
& > img { & > img {
margin-left: 5px; margin-left: 5px;
width: 14px; width: 14px;
height: 14px; height: 14px;
} }
} }
.put-away { .put-away {
& > img { & > img {
transform: rotate(180deg); transform: rotate(180deg);
} }
} }
.not-footer-drawer { .not-footer-drawer {
.search-area { .search-area {
margin-bottom: 0; margin-bottom: 0;
border-bottom: 5px solid #f6f6f6; border-bottom: 5px solid #f6f6f6;
} }
.content { .content {
padding: 0 10px; padding: 0 10px;
flex: auto; flex: auto;
//height: calc(~'100% - 105px - 56px'); //height: calc(~'100% - 105px - 56px');
} }
.pagination { .pagination {
position: static; position: static;
} }
} }
} }
.half { .half {
width: 100%; width: 100%;
float: left; float: left;
} }
.hidden { .hidden {
overflow: hidden; overflow: hidden;
} }
.clearfix { .clearfix {
&:after { &:after {
clear: both; clear: both;
} }
&:after, &:before { &:after, &:before {
display: table; display: table;
content: ""; content: "";
} }
} }
.details-container .el-divider { .details-container .el-divider {
height: 1px; height: 1px;
background-color: #d5d8da; background-color: #d5d8da;
} }
.span-line:hover { .span-line:hover {
text-decoration: underline; text-decoration: underline;
} }
.relateClass { .relateClass {
.el-dialog__body { .el-dialog__body {
max-height: 460px; max-height: 460px;
overflow-y: auto; overflow-y: auto;
} }
} }
.over { .over {
word-break: break-all; word-break: break-all;
overflow: hidden; overflow: hidden;
@@ -4137,13 +4026,13 @@
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
::v-deep .el-drawer__header { ::v-deep .el-drawer__header {
& > span:first-child { & > span:first-child {
outline: none !important; outline: none !important;
} }
} }
::v-deep .el-drawer { ::v-deep .el-drawer {
outline: none !important; outline: none !important;
} }
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+1 -1
View File
@@ -146,7 +146,7 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled"> <el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.signFlag"> <el-radio-group v-model="form.signFlag" disabled>
<el-radio label="1">是</el-radio> <el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio> <el-radio label="2">否</el-radio>
</el-radio-group> </el-radio-group>
src/pages/processCenter/pages/phone/bzzqyj/step6.vue
+1 -1
View File
@@ -207,7 +207,7 @@
import axios from "axios"; import axios from "axios";
export default { export default {
name: "phoneBzdyStep6", name: "phoneBzzqyjStep6",
data() { data() {
return { return {
data2: [], data2: [],
src/pages/processCenter/pages/phone/bzzqyj/step7.vue
+1 -1
View File
@@ -189,7 +189,7 @@
import axios from "axios"; import axios from "axios";
export default { export default {
name: "phoneBzdyStep7", name: "phoneBzzqyjStep7",
data() { data() {
return { return {
itermsConditionsFlag: false, itermsConditionsFlag: false,
src/pages/processCenter/pages/phone/bzzqyj/step8.vue
+1 -1
View File
@@ -190,7 +190,7 @@
import axios from "axios"; import axios from "axios";
export default { export default {
name: "phoneBzdyStep8", name: "phoneBzzqyjStep8",
data() { data() {
return { return {
itermsConditionsFlag: false, itermsConditionsFlag: false,
src/pages/processCenter/pages/phone/bzzqyj/step9.vue
+1 -1
View File
@@ -190,7 +190,7 @@
import axios from "axios"; import axios from "axios";
export default { export default {
name: "phoneBzdyStep9", name: "phoneBzzqyjStep9",
data() { data() {
return { return {
itermsConditionsFlag: false, itermsConditionsFlag: false,
src/pages/regulatoryRepository/standQA/index.vue
+3 -2
View File
@@ -1040,6 +1040,7 @@ export default {
//提问按钮 //提问按钮
queBtn(){ queBtn(){
this.fileList = [] this.fileList = []
this.standType = "INLAND"
this.questionForm = { this.questionForm = {
pubQue : '',//公共问题 pubQue : '',//公共问题
classification: 'INLAND', //标准类型 classification: 'INLAND', //标准类型
@@ -1278,12 +1279,12 @@ export default {
.question-box{ .question-box{
} }
.question-tabs { .question-box {
height: 100%; height: 100%;
border-top: none; border-top: none;
border-bottom: none; border-bottom: none;
/deep/.el-tabs__nav { /deep/.el-tabs__nav {
height: calc(~'100% - 50px'); height: 100%;
overflow: auto; overflow: auto;
} }
/deep/ &.el-tabs--border-card .el-tabs__item{ /deep/ &.el-tabs--border-card .el-tabs__item{