Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
super_liu
@@ -277,10 +277,11 @@
|
||||
<el-tabs
|
||||
class="question-tabs"
|
||||
type="border-card"
|
||||
@tab-click="sourceClick"
|
||||
v-model="activeType"
|
||||
@tab-click="sourceClick2"
|
||||
style="height: 100%"
|
||||
tab-position="left">
|
||||
<el-tab-pane label="国内标准">
|
||||
<el-tab-pane name="INLAND" label="国内标准">
|
||||
<div v-if="!standList || standList.length === 0">
|
||||
<div style="padding: 20px;">
|
||||
暂无数据
|
||||
@@ -291,7 +292,7 @@
|
||||
class="question-box"
|
||||
type="border-card"
|
||||
v-model="activestand"
|
||||
@tab-click="standClick"
|
||||
@tab-click="standClick2"
|
||||
style="height: 100%"
|
||||
tab-position="left"
|
||||
>
|
||||
@@ -340,17 +341,427 @@
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="海外标准">
|
||||
<el-tab-pane name="FOREIGN" label="海外标准">
|
||||
<div v-if="!standList || standList.length === 0">
|
||||
<div style="padding: 20px;">
|
||||
暂无数据
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 100%" v-else>
|
||||
<el-tabs
|
||||
class="question-box"
|
||||
type="border-card"
|
||||
v-model="activestand"
|
||||
@tab-click="standClick2"
|
||||
style="height: 100%"
|
||||
tab-position="left"
|
||||
>
|
||||
<template v-for="stand in standList">
|
||||
<el-tab-pane class="com-box" :name="stand.standardId">
|
||||
<template slot="label">
|
||||
<stand-item :stand="stand"></stand-item>
|
||||
</template>
|
||||
<div v-if="!questionsList || questionsList.length === 0">
|
||||
<div style="padding: 20px;">
|
||||
暂无数据
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 100%" v-else>
|
||||
<el-tabs
|
||||
class="question-box"
|
||||
type="border-card"
|
||||
v-model="activeQue"
|
||||
style="height: 100%"
|
||||
@tab-click="questionClick"
|
||||
tab-position="left"
|
||||
>
|
||||
<template v-for="question in questionsList">
|
||||
<el-tab-pane class="com-box" :name="question.id">
|
||||
<template slot="label">
|
||||
<questions-item :question="question"></questions-item>
|
||||
</template>
|
||||
<div>
|
||||
<template v-for="(item, index) in answerList">
|
||||
<div class="clearfix">
|
||||
<div class="answer-box" >
|
||||
<question-item-info :answer="item"></question-item-info>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<div class="info-answer" >
|
||||
<answer-item></answer-item>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</template>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</template>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="企业标准">
|
||||
<el-tab-pane name="BUSINESS_STAND" label="企业标准">
|
||||
<div v-if="!standList || standList.length === 0">
|
||||
<div style="padding: 20px;">
|
||||
暂无数据
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 100%" v-else>
|
||||
<el-tabs
|
||||
class="question-box"
|
||||
type="border-card"
|
||||
v-model="activestand"
|
||||
@tab-click="standClick2"
|
||||
style="height: 100%"
|
||||
tab-position="left"
|
||||
>
|
||||
<template v-for="stand in standList">
|
||||
<el-tab-pane class="com-box" :name="stand.standardId">
|
||||
<template slot="label">
|
||||
<stand-item :stand="stand"></stand-item>
|
||||
</template>
|
||||
<div v-if="!questionsList || questionsList.length === 0">
|
||||
<div style="padding: 20px;">
|
||||
暂无数据
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 100%" v-else>
|
||||
<el-tabs
|
||||
class="question-box"
|
||||
type="border-card"
|
||||
v-model="activeQue"
|
||||
style="height: 100%"
|
||||
@tab-click="questionClick"
|
||||
tab-position="left"
|
||||
>
|
||||
<template v-for="question in questionsList">
|
||||
<el-tab-pane class="com-box" :name="question.id">
|
||||
<template slot="label">
|
||||
<questions-item :question="question"></questions-item>
|
||||
</template>
|
||||
<div>
|
||||
<template v-for="(item, index) in answerList">
|
||||
<div class="clearfix">
|
||||
<div class="answer-box" >
|
||||
<question-item-info :answer="item"></question-item-info>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<div class="info-answer" >
|
||||
<answer-item></answer-item>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</template>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</template>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="公共问题">
|
||||
<el-tab-pane name="OTHER" label="公共问题">
|
||||
<div v-if="!standList || standList.length === 0">
|
||||
<div style="padding: 20px;">
|
||||
暂无数据
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 100%" v-else>
|
||||
<el-tabs
|
||||
class="question-box"
|
||||
type="border-card"
|
||||
v-model="activestand"
|
||||
@tab-click="standClick2"
|
||||
style="height: 100%"
|
||||
tab-position="left"
|
||||
>
|
||||
<template v-for="stand in standList">
|
||||
<el-tab-pane class="com-box" :name="stand.standardId">
|
||||
<template slot="label">
|
||||
<stand-item :stand="stand"></stand-item>
|
||||
</template>
|
||||
<div v-if="!questionsList || questionsList.length === 0">
|
||||
<div style="padding: 20px;">
|
||||
暂无数据
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 100%" v-else>
|
||||
<el-tabs
|
||||
class="question-box"
|
||||
type="border-card"
|
||||
v-model="activeQue"
|
||||
style="height: 100%"
|
||||
@tab-click="questionClick"
|
||||
tab-position="left"
|
||||
>
|
||||
<template v-for="question in questionsList">
|
||||
<el-tab-pane class="com-box" :name="question.id">
|
||||
<template slot="label">
|
||||
<questions-item :question="question"></questions-item>
|
||||
</template>
|
||||
<div>
|
||||
<template v-for="(item, index) in answerList">
|
||||
<div class="clearfix">
|
||||
<div class="answer-box" >
|
||||
<question-item-info :answer="item"></question-item-info>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<div class="info-answer" >
|
||||
<answer-item></answer-item>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</template>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</template>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane name="mySub" label="我的订阅">
|
||||
<div>
|
||||
<div style="height: 100%">
|
||||
<el-tabs
|
||||
class="question-tabs"
|
||||
type="border-card"
|
||||
v-model="activeType"
|
||||
@tab-click="sourceClick3"
|
||||
style="height: 100%"
|
||||
tab-position="left">
|
||||
<el-tab-pane name="INLAND" label="国内标准">
|
||||
<div v-if="!standList || standList.length === 0">
|
||||
<div style="padding: 20px;">
|
||||
暂无数据
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 100%" v-else>
|
||||
<el-tabs
|
||||
class="question-box"
|
||||
type="border-card"
|
||||
v-model="activestand"
|
||||
@tab-click="standClick3"
|
||||
style="height: 100%"
|
||||
tab-position="left"
|
||||
>
|
||||
<template v-for="stand in standList">
|
||||
<el-tab-pane class="com-box" :name="stand.standardId">
|
||||
<template slot="label">
|
||||
<stand-item :stand="stand"></stand-item>
|
||||
</template>
|
||||
<div v-if="!questionsList || questionsList.length === 0">
|
||||
<div style="padding: 20px;">
|
||||
暂无数据
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 100%" v-else>
|
||||
<el-tabs
|
||||
class="question-box"
|
||||
type="border-card"
|
||||
style="height: 100%"
|
||||
v-model="activeQue"
|
||||
@tab-click="questionClick"
|
||||
tab-position="left"
|
||||
>
|
||||
<template v-for="question in questionsList">
|
||||
<el-tab-pane class="com-box" :name="question.id">
|
||||
<template slot="label">
|
||||
<questions-item :question="question"></questions-item>
|
||||
</template>
|
||||
<div>
|
||||
<template v-for="(item, index) in answerList">
|
||||
<div class="clearfix">
|
||||
<div class="answer-box" >
|
||||
<question-item-info :answer="item"></question-item-info>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</template>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</template>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane name="FOREIGN" label="海外标准">
|
||||
<div v-if="!standList || standList.length === 0">
|
||||
<div style="padding: 20px;">
|
||||
暂无数据
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 100%" v-else>
|
||||
<el-tabs
|
||||
class="question-box"
|
||||
type="border-card"
|
||||
v-model="activestand"
|
||||
@tab-click="standClick3"
|
||||
style="height: 100%"
|
||||
tab-position="left"
|
||||
>
|
||||
<template v-for="stand in standList">
|
||||
<el-tab-pane class="com-box" :name="stand.standardId">
|
||||
<template slot="label">
|
||||
<stand-item :stand="stand"></stand-item>
|
||||
</template>
|
||||
<div v-if="!questionsList || questionsList.length === 0">
|
||||
<div style="padding: 20px;">
|
||||
暂无数据
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 100%" v-else>
|
||||
<el-tabs
|
||||
class="question-box"
|
||||
type="border-card"
|
||||
style="height: 100%"
|
||||
v-model="activeQue"
|
||||
@tab-click="questionClick"
|
||||
tab-position="left"
|
||||
>
|
||||
<template v-for="question in questionsList">
|
||||
<el-tab-pane class="com-box" :name="question.id">
|
||||
<template slot="label">
|
||||
<questions-item :question="question"></questions-item>
|
||||
</template>
|
||||
<div>
|
||||
<template v-for="(item, index) in answerList">
|
||||
<div class="clearfix">
|
||||
<div class="answer-box" >
|
||||
<question-item-info :answer="item"></question-item-info>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</template>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</template>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane name="BUSINESS_STAND" label="企业标准">
|
||||
<div v-if="!standList || standList.length === 0">
|
||||
<div style="padding: 20px;">
|
||||
暂无数据
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 100%" v-else>
|
||||
<el-tabs
|
||||
class="question-box"
|
||||
type="border-card"
|
||||
v-model="activestand"
|
||||
@tab-click="standClick3"
|
||||
style="height: 100%"
|
||||
tab-position="left"
|
||||
>
|
||||
<template v-for="stand in standList">
|
||||
<el-tab-pane class="com-box" :name="stand.standardId">
|
||||
<template slot="label">
|
||||
<stand-item :stand="stand"></stand-item>
|
||||
</template>
|
||||
<div v-if="!questionsList || questionsList.length === 0">
|
||||
<div style="padding: 20px;">
|
||||
暂无数据
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 100%" v-else>
|
||||
<el-tabs
|
||||
class="question-box"
|
||||
type="border-card"
|
||||
style="height: 100%"
|
||||
v-model="activeQue"
|
||||
@tab-click="questionClick"
|
||||
tab-position="left"
|
||||
>
|
||||
<template v-for="question in questionsList">
|
||||
<el-tab-pane class="com-box" :name="question.id">
|
||||
<template slot="label">
|
||||
<questions-item :question="question"></questions-item>
|
||||
</template>
|
||||
<div>
|
||||
<template v-for="(item, index) in answerList">
|
||||
<div class="clearfix">
|
||||
<div class="answer-box" >
|
||||
<question-item-info :answer="item"></question-item-info>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</template>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</template>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane name="OTHER" label="公共问题">
|
||||
<div v-if="!standList || standList.length === 0">
|
||||
<div style="padding: 20px;">
|
||||
暂无数据
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 100%" v-else>
|
||||
<el-tabs
|
||||
class="question-box"
|
||||
type="border-card"
|
||||
v-model="activestand"
|
||||
@tab-click="standClick3"
|
||||
style="height: 100%"
|
||||
tab-position="left"
|
||||
>
|
||||
<template v-for="stand in standList">
|
||||
<el-tab-pane class="com-box" :name="stand.standardId">
|
||||
<template slot="label">
|
||||
<stand-item :stand="stand"></stand-item>
|
||||
</template>
|
||||
<div v-if="!questionsList || questionsList.length === 0">
|
||||
<div style="padding: 20px;">
|
||||
暂无数据
|
||||
</div>
|
||||
</div>
|
||||
<div style="height: 100%" v-else>
|
||||
<el-tabs
|
||||
class="question-box"
|
||||
type="border-card"
|
||||
style="height: 100%"
|
||||
v-model="activeQue"
|
||||
@tab-click="questionClick"
|
||||
tab-position="left"
|
||||
>
|
||||
<template v-for="question in questionsList">
|
||||
<el-tab-pane class="com-box" :name="question.id">
|
||||
<template slot="label">
|
||||
<questions-item :question="question"></questions-item>
|
||||
</template>
|
||||
<div>
|
||||
<template v-for="(item, index) in answerList">
|
||||
<div class="clearfix">
|
||||
<div class="answer-box" >
|
||||
<question-item-info :answer="item"></question-item-info>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</template>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</template>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
@@ -1033,17 +1444,61 @@ export default {
|
||||
this.questionForm.classification = this.standType
|
||||
},
|
||||
handleClick(){
|
||||
console.log(this.activeName);
|
||||
this.ansSearch()
|
||||
this.standList = []
|
||||
switch (this.activeName) {
|
||||
case 'myQue':
|
||||
this.standSearch() // 查询提问标准
|
||||
break
|
||||
case 'myAns':
|
||||
this.ansSearch() //查询回答标准
|
||||
break
|
||||
case 'mySub':
|
||||
this.subSearch() //查询订阅标准
|
||||
break
|
||||
}
|
||||
|
||||
},
|
||||
sourceClick(){
|
||||
this.questionSerach.classification = this.activeType
|
||||
this.questionSerach.standardEncdoing = ''
|
||||
this.standSearch()
|
||||
},
|
||||
sourceClick2(){
|
||||
this.questionSerach.classification = this.activeType
|
||||
this.ansSearch()
|
||||
},
|
||||
//我的订阅
|
||||
sourceClick3(){
|
||||
this.questionSerach.classification = this.activeType
|
||||
this.subSearch()
|
||||
},
|
||||
standClick(){
|
||||
this.queSearch()
|
||||
},
|
||||
standClick2(){
|
||||
this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
|
||||
standardId: this.activestand,
|
||||
answerer: this.$store.getters.userInfo.userId,
|
||||
},{
|
||||
_this: this
|
||||
}, res => {
|
||||
this.questionsList = res.data
|
||||
}, e =>{
|
||||
|
||||
})
|
||||
},
|
||||
standClick3(){
|
||||
this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
|
||||
standardId: this.activestand,
|
||||
answerer: this.$store.getters.userInfo.userId,
|
||||
},{
|
||||
_this: this
|
||||
}, res => {
|
||||
this.questionsList = res.data
|
||||
}, e =>{
|
||||
|
||||
})
|
||||
},
|
||||
questionClick(){
|
||||
sessionStorage.setItem('queId', this.activeQue)
|
||||
this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
|
||||
@@ -1070,25 +1525,38 @@ export default {
|
||||
queSearch(){
|
||||
this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
|
||||
standardId: this.activestand,
|
||||
answerer: this.$store.getters.userInfo.userId,
|
||||
},{
|
||||
_this: this
|
||||
}, res => {
|
||||
this.questionsList = res.data
|
||||
console.log(this.questionsList);
|
||||
})
|
||||
},
|
||||
//回答查询
|
||||
//查询回答标准
|
||||
ansSearch(){
|
||||
this.$http.get('lawss/AskQuestions/getReplyDetails',{
|
||||
classification: this.questionSerach.classification,
|
||||
classification: this.activeType,
|
||||
answerer: this.$store.getters.userInfo.userId,
|
||||
}, {
|
||||
_this: this,
|
||||
}, res => {
|
||||
|
||||
this.standList = res.data
|
||||
})
|
||||
},
|
||||
//查询标准
|
||||
//查询订阅标准
|
||||
subSearch(){
|
||||
this.$http.get('lawss/AskQuestions/getAskQuestionsBySubscription',{
|
||||
classification: this.activeType,
|
||||
answerer: this.$store.getters.userInfo.userId,
|
||||
},{
|
||||
_this: this
|
||||
}, res => {
|
||||
this.standList = res.data
|
||||
}, e =>{
|
||||
|
||||
})
|
||||
},
|
||||
//查询提问标准
|
||||
standSearch(){
|
||||
this.$http.get('lawss/AskQuestions/getAskQuestionsDetails',{ ...this.questionSerach },{
|
||||
_this: this
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
<div v-else-if="!loading && standList.length" class="card-content" v-for="item in standList" :key="item.id">
|
||||
<div class="standTitle">
|
||||
<div v-if="titleType === 'POLICY'" class="title">{{item.lawsNumber}}</div>
|
||||
<div v-else-if="titleType !== 'POLICY' && item.standYear" class="title">{{item.standSortShow + '  ' + item.standNumber + '-' + item.standYear }}</div>
|
||||
<div v-else class="title">{{item.standSortShow + '  ' + item.standNumber }}</div>
|
||||
<div v-else-if="titleType !== 'POLICY' && item.standYear" class="title">{{item.standSort + '  ' + item.standNumber + '-' + item.standYear }}</div>
|
||||
<div v-else class="title">{{item.standSort + '  ' + item.standNumber }}</div>
|
||||
</div>
|
||||
<div class="standContent">
|
||||
<div class="standState">{{item.standName}}</div>
|
||||
@@ -79,10 +79,10 @@
|
||||
</div>
|
||||
<div class="content-time">
|
||||
<div style="margin-top: 10px">
|
||||
<span style="padding: 20px;">发布日期：
|
||||
{{ item.issueTime ? $moment(item.issueTime).format("YYYY-MM-DD") : "" }}</span>
|
||||
<span style="padding: 20px;" v-if="titleType === 'POLICY'">实施日期： {{item.XCXSSRQLAWS}}</span>
|
||||
<span style="padding: 20px;" v-else>实施日期： {{item.putTime}}</span>
|
||||
<span style="padding-left: 10px;min-width: 200px;">发布日期：
|
||||
{{ item.issueTime ? (item.issueTime !== '' ? $moment(item.issueTime).format("YYYY-MM-DD") : " ") : " " }}</span>
|
||||
<span style="padding-left: 15px;" v-if="titleType === 'POLICY'">实施日期： {{item.XCXSSRQLAWS}}</span>
|
||||
<span style="padding-left: 15px;" v-else>实施日期： {{item.SSRQ}}</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -149,46 +149,31 @@ export default {
|
||||
this.standList = []
|
||||
this.page = 1
|
||||
if(this.titleType === 'INLAND'){
|
||||
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
|
||||
// this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
|
||||
// page: this.page,
|
||||
// standNumber: this.searchKey,
|
||||
// pageSize: 20,
|
||||
// standType: 'INLAND'
|
||||
// },{
|
||||
// _this: this
|
||||
// },res=>{
|
||||
// if (res.ok){
|
||||
// this.standList = res.data.list
|
||||
// this.loading = false
|
||||
// }else {
|
||||
// this.$message.error(res.message)
|
||||
// }
|
||||
// },e=>{
|
||||
// })
|
||||
this.$http.post('search/searchCenter/searchSarBykey',{
|
||||
selectIndex: 'stand',
|
||||
selectValue: this.searchKey,
|
||||
selectType: 'titleSearch',
|
||||
standType: 'INLAND',
|
||||
page: this.page,
|
||||
standNumber: this.searchKey,
|
||||
pageSize: 20,
|
||||
standType: 'INLAND'
|
||||
pageSize: 20
|
||||
},{
|
||||
_this: this
|
||||
},res=>{
|
||||
if (res.ok){
|
||||
this.standList = res.data.list
|
||||
this.loading = false
|
||||
}else {
|
||||
this.$message.error(res.message)
|
||||
}
|
||||
},e=>{
|
||||
})
|
||||
}else if(this.titleType === 'FOREIGN'){
|
||||
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
|
||||
page: 1,
|
||||
pageSize: 20,
|
||||
standNumber: this.searchKey,
|
||||
standType: 'FOREIGN'
|
||||
},{
|
||||
_this: this
|
||||
},res=>{
|
||||
if (res.ok){
|
||||
this.standList = res.data.list
|
||||
this.loading = false
|
||||
}else {
|
||||
this.$message.error(res.message)
|
||||
}
|
||||
},e=>{
|
||||
})
|
||||
}else if(this.titleType === 'POLICY'){
|
||||
this.$http.get('lawss/sarLawsInfo/page',{
|
||||
page: 1,
|
||||
pageSize: 20,
|
||||
lawsNumber: this.searchKey,
|
||||
},{
|
||||
_this: this
|
||||
_this: this,
|
||||
}, res => {
|
||||
if (res.ok){
|
||||
this.standList = res.data.list
|
||||
@@ -196,9 +181,83 @@ export default {
|
||||
}else {
|
||||
this.$message.error(res.message)
|
||||
}
|
||||
}, e =>{
|
||||
console.log(e);
|
||||
}, e => {
|
||||
console.log(e)
|
||||
})
|
||||
}else if(this.titleType === 'FOREIGN'){
|
||||
// this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
|
||||
// page: 1,
|
||||
// pageSize: 20,
|
||||
// standNumber: this.searchKey,
|
||||
// standType: 'FOREIGN'
|
||||
// },{
|
||||
// _this: this
|
||||
// },res=>{
|
||||
// if (res.ok){
|
||||
// this.standList = res.data.list
|
||||
// this.loading = false
|
||||
// }else {
|
||||
// this.$message.error(res.message)
|
||||
// }
|
||||
// },e=>{
|
||||
// })
|
||||
this.$http.post('search/searchCenter/searchSarBykey',{
|
||||
selectIndex: 'stand',
|
||||
selectValue: this.searchKey,
|
||||
selectType: 'titleSearch',
|
||||
standType: 'FOREIGN',
|
||||
page: this.page,
|
||||
pageSize: 20
|
||||
},{
|
||||
_this: this,
|
||||
}, res => {
|
||||
if (res.ok){
|
||||
this.standList = res.data.list
|
||||
this.loading = false
|
||||
}else {
|
||||
this.$message.error(res.message)
|
||||
}
|
||||
}, e => {
|
||||
console.log(e)
|
||||
})
|
||||
|
||||
}else if(this.titleType === 'POLICY'){
|
||||
// this.$http.get('lawss/sarLawsInfo/page',{
|
||||
// page: 1,
|
||||
// pageSize: 20,
|
||||
// lawsNumber: this.searchKey,
|
||||
// },{
|
||||
// _this: this
|
||||
// }, res => {
|
||||
// if (res.ok){
|
||||
// this.standList = res.data.list
|
||||
// this.loading = false
|
||||
// }else {
|
||||
// this.$message.error(res.message)
|
||||
// }
|
||||
// }, e =>{
|
||||
// console.log(e);
|
||||
// })
|
||||
this.$http.post('search/searchCenter/searchSarBykey',{
|
||||
selectIndex: 'laws',
|
||||
selectValue: this.searchKey,
|
||||
selectType: 'titleSearch',
|
||||
type: 'laws',
|
||||
page: this.page,
|
||||
pageSize: 20
|
||||
},{
|
||||
_this: this,
|
||||
}, res => {
|
||||
if (res.ok){
|
||||
this.standList = res.data.list
|
||||
this.loading = false
|
||||
}else {
|
||||
this.$message.error(res.message)
|
||||
}
|
||||
}, e => {
|
||||
console.log(e)
|
||||
})
|
||||
|
||||
}else{
|
||||
this.$http.get("/lawss/NewsFeed/getNewsFeed", {
|
||||
messageType: 'ZYBZFG',
|
||||
@@ -223,15 +282,41 @@ export default {
|
||||
this.listFlag = false
|
||||
this.moreFlag = false
|
||||
if(this.titleType === 'INLAND'){
|
||||
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
|
||||
// this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
|
||||
// page: this.page,
|
||||
// pageSize: 20,
|
||||
// standNumber: this.searchKey,
|
||||
// standType: 'INLAND'
|
||||
// },{
|
||||
// _this: this
|
||||
// },res=>{
|
||||
// if (res.ok){
|
||||
// if(res.data.list.length){
|
||||
// if(this.standList.length){
|
||||
// this.standList = this.standList.concat(res.data.list)
|
||||
// }else{
|
||||
// this.standList = res.data.list
|
||||
// }
|
||||
// this.loading = false
|
||||
// }else{
|
||||
// this.listFlag = true
|
||||
// }
|
||||
// }else {
|
||||
// this.$message.error(res.message)
|
||||
// }
|
||||
// },e=>{
|
||||
// })
|
||||
this.$http.post('search/searchCenter/searchSarBykey',{
|
||||
selectIndex: 'stand',
|
||||
selectValue: this.searchKey,
|
||||
selectType: 'titleSearch',
|
||||
standType: 'INLAND',
|
||||
page: this.page,
|
||||
pageSize: 20,
|
||||
standNumber: this.searchKey,
|
||||
standType: 'INLAND'
|
||||
pageSize: 20
|
||||
},{
|
||||
_this: this
|
||||
},res=>{
|
||||
if (res.ok){
|
||||
_this: this,
|
||||
}, res => {
|
||||
if(res.ok){
|
||||
if(res.data.list.length){
|
||||
if(this.standList.length){
|
||||
this.standList = this.standList.concat(res.data.list)
|
||||
@@ -240,23 +325,52 @@ export default {
|
||||
}
|
||||
this.loading = false
|
||||
}else{
|
||||
this.loading = false
|
||||
this.listFlag = true
|
||||
}
|
||||
}else {
|
||||
}else{
|
||||
this.$message.error(res.message)
|
||||
}
|
||||
},e=>{
|
||||
}, e => {
|
||||
console.log(e)
|
||||
})
|
||||
|
||||
}else if(this.titleType === 'FOREIGN'){
|
||||
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
|
||||
page: 1,
|
||||
pageSize: 20,
|
||||
standNumber: this.searchKey,
|
||||
standType: 'FOREIGN'
|
||||
// this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{
|
||||
// page: 1,
|
||||
// pageSize: 20,
|
||||
// standNumber: this.searchKey,
|
||||
// standType: 'FOREIGN'
|
||||
// },{
|
||||
// _this: this
|
||||
// },res=>{
|
||||
// if (res.ok){
|
||||
// if(res.data.list.length){
|
||||
// if(this.standList.length){
|
||||
// this.standList = this.standList.concat(res.data.list)
|
||||
// }else{
|
||||
// this.standList = res.data.list
|
||||
// }
|
||||
// this.loading = false
|
||||
// }else{
|
||||
// this.listFlag = true
|
||||
// }
|
||||
// }else {
|
||||
// this.$message.error(res.message)
|
||||
// }
|
||||
// },e=>{
|
||||
// })
|
||||
this.$http.post('search/searchCenter/searchSarBykey',{
|
||||
selectIndex: 'stand',
|
||||
selectValue: this.searchKey,
|
||||
selectType: 'titleSearch',
|
||||
standType: 'FOREIGN',
|
||||
page: this.page,
|
||||
pageSize: 20
|
||||
},{
|
||||
_this: this
|
||||
},res=>{
|
||||
if (res.ok){
|
||||
_this: this,
|
||||
}, res => {
|
||||
if(res.ok){
|
||||
if(res.data.list.length){
|
||||
if(this.standList.length){
|
||||
this.standList = this.standList.concat(res.data.list)
|
||||
@@ -265,38 +379,68 @@ export default {
|
||||
}
|
||||
this.loading = false
|
||||
}else{
|
||||
this.loading = false
|
||||
this.listFlag = true
|
||||
}
|
||||
}else {
|
||||
}else{
|
||||
this.$message.error(res.message)
|
||||
}
|
||||
},e=>{
|
||||
}, e => {
|
||||
console.log(e)
|
||||
})
|
||||
}else if(this.titleType === 'POLICY'){
|
||||
this.$http.get('lawss/sarLawsInfo/page',{
|
||||
lawsNumber: this.searchKey,
|
||||
page: 1,
|
||||
pageSize: 20,
|
||||
},{
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok){
|
||||
if(res.data.list.length){
|
||||
if(this.standList.length){
|
||||
this.standList = this.standList.concat(res.data.list)
|
||||
}else{
|
||||
this.standList = res.data.list
|
||||
}
|
||||
this.loading = false
|
||||
}else{
|
||||
this.listFlag = true
|
||||
}
|
||||
}else {
|
||||
this.$message.error(res.message)
|
||||
}
|
||||
}, e =>{
|
||||
console.log(e);
|
||||
})
|
||||
// this.$http.get('lawss/sarLawsInfo/page',{
|
||||
// lawsNumber: this.searchKey,
|
||||
// page: 1,
|
||||
// pageSize: 20,
|
||||
// },{
|
||||
// _this: this
|
||||
// }, res => {
|
||||
// if (res.ok){
|
||||
// if(res.data.list.length){
|
||||
// if(this.standList.length){
|
||||
// this.standList = this.standList.concat(res.data.list)
|
||||
// }else{
|
||||
// this.standList = res.data.list
|
||||
// }
|
||||
// this.loading = false
|
||||
// }else{
|
||||
// this.listFlag = true
|
||||
// }
|
||||
// }else {
|
||||
// this.$message.error(res.message)
|
||||
// }
|
||||
// }, e =>{
|
||||
// console.log(e);
|
||||
// })
|
||||
this.$http.post('search/searchCenter/searchSarBykey',{
|
||||
selectIndex: 'laws',
|
||||
selectValue: this.searchKey,
|
||||
selectType: 'titleSearch',
|
||||
type: 'laws',
|
||||
page: this.page,
|
||||
pageSize: 20
|
||||
},{
|
||||
_this: this,
|
||||
}, res => {
|
||||
if(res.ok){
|
||||
if(res.data.list.length){
|
||||
if(this.standList.length){
|
||||
this.standList = this.standList.concat(res.data.list)
|
||||
}else{
|
||||
this.standList = res.data.list
|
||||
}
|
||||
this.loading = false
|
||||
}else{
|
||||
this.loading = false
|
||||
this.listFlag = true
|
||||
}
|
||||
}else{
|
||||
this.$message.error(res.message)
|
||||
}
|
||||
}, e => {
|
||||
console.log(e)
|
||||
})
|
||||
}else{
|
||||
this.$http.get("/lawss/NewsFeed/getNewsFeed", {
|
||||
messageType: 'ZYBZFG',
|
||||
@@ -315,6 +459,7 @@ export default {
|
||||
}
|
||||
this.loading = false
|
||||
}else{
|
||||
this.loading = false
|
||||
this.listFlag = true
|
||||
}
|
||||
}else {
|
||||
|
||||
+1
-1
@@ -326,7 +326,7 @@
|
||||
<a v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{
|
||||
scope.row.standCode
|
||||
}}</a>
|
||||
<a v-if="scope.row.standStatusShow === '参考'" style="color: #E6A23C" @click="handlePreview(scope.row)" class="table-jump">{{
|
||||
<a v-if="scope.row.standStatusShow === '参考'" style="color: #98E165" @click="handlePreview(scope.row)" class="table-jump">{{
|
||||
scope.row.standCode
|
||||
}}</a>
|
||||
<a v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
|
||||
|
||||
Reference in New Issue
Block a user