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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-06-15 17:33:31 +08:00
parent 27cba83fb8 cb20a18194
commit dd7922431c
9 changed files with 199 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+1
View File
@@ -369,6 +369,7 @@
<el-table-column
prop="issueTime"
label="发布日期"
sortable
width="120"
>
<template slot-scope="scope">
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1
View File
@@ -251,6 +251,7 @@
<el-table-column
prop="issueTime"
width="120"
sortable
label="发布日期">
<template slot-scope="scope">
<div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
src/pages/regulatoryRepository/standQA/components/questions-item.vue
+22 -5
View File
@@ -5,17 +5,17 @@
<div>
<el-button class="dybtn" size="mini" type="primary" @click.stop="subscribe">订阅</el-button>
</div>
<div>
<div class="divWhiteSpace">
<div class="row">
<div class="item">
<div class="item1">
<div>提问：
<span>{{question.problemDescription}}</span>
</div>
</div>
</div>
<div class="row">
<div class="row" >
<div class="item">
<div>{{question.answerer}}
<div>{{question.questioner}}
<span>{{question.questionTime}}</span>
</div>
</div>
@@ -67,16 +67,33 @@ export default {
.dybtn{
float: right;
}
.divWhiteSpace{
width: 80%;
}
.row {
line-height: 1.8;
}
.item {
display: inline-block;
width: 200px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.item1 {
display: inline-block;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
word-break: break-word;
word-wrap: break-word;
white-space: -moz-pre-wrap;
white-space: -hp-pre-wrap;
white-space: -o-pre-wrap;
white-space: -pre-wrap;
white-space: pre;
white-space: pre-wrap;
white-space: pre-line;
}
}
/deep/ .el-button--mini {
padding: 5px;
src/pages/regulatoryRepository/standQA/components/stand-item.vue
+1 -1
View File
@@ -7,7 +7,7 @@
<span>{{stand.standardEncdoing}}</span>
</div>
</div>
<div class="row">
<div class="row" v-if="stand.classification !== 'OTHER'">
<div class="item">
<span :title="stand.standardEncdoing + stand.standardName">{{stand.standardName}}</span>
</div>
src/pages/regulatoryRepository/standQA/index.vue
+41 -7
View File
@@ -71,7 +71,7 @@
<template slot="label">
<questions-item :question="question"></questions-item>
</template>
<div>
<div class="contentClass">
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
@@ -128,7 +128,7 @@
<template slot="label">
<questions-item :question="question"></questions-item>
</template>
<div>
<div class="contentClass">
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
@@ -185,7 +185,7 @@
<template slot="label">
<questions-item :question="question"></questions-item>
</template>
<div>
<div class="contentClass">
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
@@ -242,8 +242,8 @@
<template slot="label">
<questions-item :question="question"></questions-item>
</template>
<div>
<template v-for="(item, index) in answerList">
<div class="contentClass">
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
<question-item-info :answer="item"></question-item-info>
@@ -791,7 +791,7 @@ export default {
this.activeName = this.$route.query.standType
this.standSearch()
}else{
switch (this.$route.query.standType){
switch (this.standType){
case 'INLAND':
this.standSearch2()
break
@@ -1048,6 +1048,7 @@ export default {
pubQue : '',//公共问题
classification: 'INLAND', //标准类型
problemDescription: '', //问题
questioner: this.$store.getters.userInfo.userId, //提问人
standardEncdoing: '', //标准编号
standardName: '', //标准名称
standardId:'', //标准id
@@ -1213,8 +1214,27 @@ export default {
{
_this: this
}, res => {
console.log(res);
this.dialogVisible = false
switch (this.standType){
case 'INLAND':
this.standSearch2()
break
case 'FOREIGN':
this.activeName = 'FOREIGN'
this.questionSerach.classification = 'FOREIGN'
this.standSearch2()
break
case 'BUSINESS_STAND':
this.activeName = 'BUSINESS_STAND'
this.questionSerach.classification = 'BUSINESS_STAND'
this.standSearch2()
break
case 'OTHER':
this.activeName = 'OTHER'
this.questionSerach.classification = 'OTHER'
this.standSearch2()
break
}
}, e => {
})
@@ -1231,6 +1251,10 @@ export default {
</script>
<style lang="less" scoped>
/deep/ .contentClass{
height: calc(~ '100% - 20px');
overflow: auto;
}
#my-questions{
height: 100%;
display: flex;
@@ -1245,6 +1269,7 @@ export default {
margin-right: 0;
}
/deep/.el-tabs__content {
overflow-y: auto;
padding: 0;
.el-tab-pane {
height: 100%;
@@ -1295,6 +1320,15 @@ export default {
background: #F5F7FA;
float: right;
margin: 20px 10px 0 80px;
word-break: break-word; /* 文本行的任意字内断开 */
word-wrap: break-word; /* IE */
white-space: -moz-pre-wrap; /* Mozilla */
white-space: -hp-pre-wrap; /* HP printers */
white-space: -o-pre-wrap; /* Opera 7 */
white-space: -pre-wrap; /* Opera 4-6 */
white-space: pre; /* CSS2 */
white-space: pre-wrap; /* CSS 2.1 */
white-space: pre-line; /* CSS 3 (and 2.1 as well, actually) */
}
.info-answer{
height: 200px;