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-08 11:45:59 +08:00
parent 9e1390352a 28dd02f406
commit b21367ea57
10 changed files with 184 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/release/index.vue
+1 -1
View File
@@ -150,7 +150,7 @@ export default {
position: absolute;
right: 0;
bottom: 2px;
font-size: 12px;
font-size: 15px;
float: right;
color: #4788c0;
&:hover {
src/pages/home2/components/releaseBuss/index.vue
+1 -1
View File
@@ -150,7 +150,7 @@ export default {
position: absolute;
right: 0;
bottom: 2px;
font-size: 12px;
font-size: 15px;
float: right;
color: #4788c0;
&:hover {
src/pages/home2/components/releaseQA/index.vue
+1 -1
View File
@@ -155,7 +155,7 @@ export default {
position: absolute;
right: 0;
bottom: 2px;
font-size: 12px;
font-size: 15px;
float: right;
color: #4788c0;
&:hover {
src/pages/home2/components/releaseUs/index.vue
+1 -1
View File
@@ -166,7 +166,7 @@ export default {
position: absolute;
right: 0;
bottom: 2px;
font-size: 12px;
font-size: 15px;
float: right;
color: #4788c0;
&:hover {
src/pages/home2/components/solicitopinions/index.vue
+13 -13
View File
@@ -26,7 +26,7 @@
<el-table-column
prop="cid"
show-overflow-tooltip
label="标准名称/政策名称">
label="标准名称">
<template slot-scope="scope">
<span @click="standForComments(scope.row)">{{ scope.row.cid }}</span>
</template>
@@ -37,7 +37,7 @@
label="结束时间">
</el-table-column>
</el-table>
<div class="more" @click="$router.push('standardForComments')">更多 ⋙</div>
<div class="more" @click="$router.push('standardForComments')">更多 ⋙</div>
</div>
</template>
@@ -93,18 +93,18 @@ export default {
<style lang="less" scoped>
.solicitopinions {
/deep/.more {
position: absolute;
right: 0;
bottom: 0;
font-size: 12px;
float: right;
color: #4788c0;
&:hover {
color: #3a8ee6;
cursor: pointer;
}
/deep/.more {
position: absolute;
right: 0;
bottom: 2px;
font-size: 15px;
float: right;
color: #4788c0;
&:hover {
color: #3a8ee6;
cursor: pointer;
}
}
/deep/.el-table__body-wrapper {
max-height: calc(65vh - 101px);
overflow-y: auto;
src/pages/personal/pages/my-questions/components/questionItemInfo.vue
+1 -1
View File
@@ -24,7 +24,7 @@
</div>
</div>
<div>
<el-checkbox @change="answerChang" v-model="answer.checked">归档</el-checkbox>
<el-checkbox v-if="answer.checkedShow" @change="answerChang" v-model="answer.checked">归档</el-checkbox>
</div>
</div>
<!-- <div class="footer-box">-->
src/pages/personal/pages/my-questions/index.vue
+94 -6
View File
@@ -13,7 +13,7 @@
<el-input v-model="questionSerach.problemDescription" placeholder="根据关键词查询"></el-input>
</el-form-item>
<el-form-item>
<el-button size="mini" @click="standSearch">查询</el-button>
<el-button size="mini" @click="searchBtn">查询</el-button>
</el-form-item>
<el-form-item>
<el-button size="mini" @click="delSearch">清空</el-button>
@@ -794,7 +794,7 @@
<el-button v-else size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
</el-form-item>
<el-form-item label="问题" prop="problemDescription" class="serch-form-item">
<el-input v-model="questionForm.problemDescription"></el-input>
<el-input v-model="questionForm.problemDescription" @input="changeInput"></el-input>
</el-form-item>
<el-form-item label="附件">
<el-upload
@@ -816,8 +816,11 @@
</el-form>
</div>
<span>相似历史问题：</span>
<div style="height: 200px; width: 80%; margin-left: 80px;">
<div style="height: 200px; width: 80%; margin-left: 80px;">
<div v-for="item in historyList" :key="item.id" @click="historyJump(item.id)">
<span class="history-item">{{item.problemDescription}}</span>
<span class="history-item">{{item.questionTime}}</span>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button class="common-button-default" size="mini" @click="dialogVisible = false">取 消</el-button>
@@ -1202,6 +1205,16 @@ import answerItem from "@/pages/personal/pages/my-questions/components/answerIte
import questionItemInfo from "@/pages/personal/pages/my-questions/components/questionItemInfo";
import standItem from './components/stand-item'
function debounce(func, wait = 500){
let timeout;
return function(event){
clearTimeout(timeout)
timeout = setTimeout(() => {
func.call(this, event)
},wait)
}
}
export default {
name: "index",
components:{
@@ -1213,6 +1226,7 @@ export default {
data(){
return{
mergeList: [],
historyList: [], //相似历史问题
handleSelectForm: {
standName: '', //标准名称
numberName: '', //政策名称
@@ -1301,9 +1315,28 @@ export default {
})
sessionStorage.setItem('mergeList', JSON.stringify(this.mergeList))
}
},
'questionForm.problemDescription':{
handler(val){
}
}
},
methods:{
changeInput:debounce(function(val){
if(val.length){
this.$http.get('lawss/AskQuestions/resemblance',{
problemDescription: val,
},{
_this: this
}, res => {
this.historyList = res.data
})
}
}),
//点击跳转问题详情
historyJump(id){
this.$router.push('/standQA')
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
@@ -1489,16 +1522,19 @@ export default {
},
sourceClick(){
this.standList = []
this.questionSerach.classification = this.activeType
this.questionSerach.standardEncdoing = ''
this.standSearch()
},
sourceClick2(){
this.standList = []
this.questionSerach.classification = this.activeType
this.ansSearch()
},
//我的订阅
sourceClick3(){
this.standList = []
this.questionSerach.classification = this.activeType
this.subSearch()
},
@@ -1536,7 +1572,16 @@ export default {
},{
_this: this
}, res => {
this.answerList = res.data
if(this.activeName === 'myAns'){
if(res.data.length){
res.data.forEach(item => {
item.checkedShow = true
})
}
this.answerList = res.data
}else{
this.answerList = res.data
}
}, e => {
})
},
@@ -1559,7 +1604,43 @@ export default {
},
//清空
delSearch(){
this.questionSerach = {
classification: 'INLAND',
type: '',
standardName: '', //标准名称
standardEncdoing: '', //标准编号
questioner: this.$store.getters.userInfo.userId, //提问人
subscription: this.$store.getters.userInfo.userId, //订阅人
answerer: this.$store.getters.userInfo.userId, //回答人
problemDescription: '', //关键词/问题描述
}
},
searchBtn(){
this.questionSerach.classification = this.activeType
switch (this.activeName) {
case 'myQue':
this.questionSerach.type = 'myQue'
this.questionSerach.subscription = ''
this.questionSerach.answerer = ''
break
case 'myAns':
this.questionSerach.type = 'myAns'
this.questionSerach.subscription = ''
this.questionSerach.questioner = ''
break
case 'mySub':
this.questionSerach.type = 'mySub'
this.questionSerach.questioner = ''
this.questionSerach.answerer = ''
break
}
this.$http.get('lawss/AskQuestions/retrieve',{
...this.questionSerach
},{
_this: this
}, res => {
this.standList = res.data
})
},
//问题查询
queSearch(){
@@ -1788,4 +1869,11 @@ export default {
/deep/.el-upload-dragger {
height: 90px;
}
.history-item{
padding: 15px;
line-height: 1.5;
font-size: 14px;
color: #409EFF;
cursor: pointer;
}
</style>
src/pages/regulatoryRepository/standQA/components/questions-item.vue
+13 -1
View File
@@ -2,7 +2,7 @@
<template>
<div id="questions-item">
<div>
<el-button class="dybtn" size="mini" type="primary">订阅</el-button>
<el-button class="dybtn" size="mini" type="primary" @click.stop="subscribe">订阅</el-button>
</div>
<div>
<div class="row">
@@ -34,6 +34,18 @@ export default {
userName: this.$store.getters.userInfo.userName,
}
},
methods:{
subscribe(){
this.$http.postData('lawss/Subscription/insertSubscription',{
askId: this.question.id,
usId: this.$store.getters.userInfo.userId,
},{
_this: this
}, res => {
console.log(res);
})
},
},
watch:{
question: {
immediate: true,
src/pages/regulatoryRepository/standQA/index.vue
+57 -5
View File
@@ -13,7 +13,7 @@
<el-input v-model="questionSerach.problemDescription" placeholder="根据关键词查询"></el-input>
</el-form-item>
<el-form-item>
<el-button size="mini" @click="standSearch">查询</el-button>
<el-button size="mini" @click="searchBtn">查询</el-button>
</el-form-item>
<el-form-item>
<el-button size="mini" @click="delSearch">清空</el-button>
@@ -290,7 +290,7 @@
<el-button v-else size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
</el-form-item>
<el-form-item label="问题" prop="problemDescription" class="serch-form-item">
<el-input v-model="questionForm.problemDescription"></el-input>
<el-input v-model="questionForm.problemDescription" @input="changeInput"></el-input>
</el-form-item>
<el-form-item label="附件">
<el-upload
@@ -312,8 +312,11 @@
</el-form>
</div>
<span>相似历史问题：</span>
<div style="height: 200px; width: 80%; margin-left: 80px;">
<div style="height: 200px; width: 80%; margin-left: 80px;">
<div v-for="item in historyList" :key="item.id" @click="historyJump(item.id)">
<span class="history-item">{{item.problemDescription}}</span>
<span class="history-item">{{item.questionTime}}</span>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button class="common-button-default" size="mini" @click="dialogVisible = false">取 消</el-button>
@@ -698,6 +701,15 @@ import answerItem from "./components/answerItem";
import questionItemInfo from "./components/questionItemInfo";
import standItem from './components/stand-item'
function debounce(func, wait = 500){
let timeout;
return function(event){
clearTimeout(timeout)
timeout = setTimeout(() => {
func.call(this, event)
},wait)
}
}
export default {
name: "standQA",
components:{
@@ -708,6 +720,7 @@ export default {
},
data(){
return{
historyList: [],
pubOptions: [], //公共问题
handleSelectForm: {
standName: '', //标准名称
@@ -783,6 +796,21 @@ export default {
});
},
methods:{
changeInput:debounce(function(val){
if(val.length){
this.$http.get('lawss/AskQuestions/resemblance',{
problemDescription: val,
},{
_this: this
}, res => {
this.historyList = res.data
})
}
}),
//点击跳转问题详情
historyJump(id){
this.$router.push('/standQA')
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
@@ -992,7 +1020,24 @@ export default {
},
//清空
delSearch(){
this.questionSerach = {
classification: 'INLAND',
standardName: '', //标准名称
standardEncdoing: '', //标准编号
questioner: this.$store.getters.userInfo.userId, //提问人
problemDescription: '', //关键词/问题描述
}
},
searchBtn(){
this.questionSerach.classification = this.activeType
this.questionSerach.questioner = ''
this.$http.get('lawss/AskQuestions/retrieve',{
...this.questionSerach
},{
_this: this
}, res => {
this.standList = res.data
})
},
//问题查询
queSearch(){
@@ -1208,4 +1253,11 @@ export default {
/deep/.el-upload-dragger {
height: 90px;
}
.history-item{
padding: 15px;
line-height: 1.5;
font-size: 14px;
color: #409EFF;
cursor: pointer;
}
</style>
src/pages/searchCenter/pages/standardSearch.vue
+2 -2
View File
@@ -2758,10 +2758,10 @@
display: inline;
}
/deep/.highlight-Es-class {
background-color: #3391ce !important;
background-color: #3fb3ff !important;
}
/deep/.highlight-class {
color: #3391ce !important;
color: #3fb3ff !important;
}
/deep/.pagination{
position: static !important;