feat: There is no way the, bug #52284

This commit is contained in:
super_liu
2022-04-05 20:30:18 +08:00
parent 3f98756c14
commit b21baf6a68
3 changed files with 9 additions and 9 deletions
@@ -42,7 +42,7 @@
<div @click="detailsLaws(item)" > <div @click="detailsLaws(item)" >
<el-col :span="5" :offset="1"> <el-col :span="5" :offset="1">
<i class="el-icon-collection-tag" style="position: relative; left: -15px" /> <i class="el-icon-collection-tag" style="position: relative; left: -15px" />
所属板块{{ item.collectType === 'INLAND_LAWS' ? '国内政策' : '国外政策' }} 所属板块{{ '国外政策' }}
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top"> <el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top">
@@ -52,8 +52,7 @@
<el-col :span="4" :offset="3"> 创建时间{{getDate(item.creationTime)}}</el-col> <el-col :span="4" :offset="3"> 创建时间{{getDate(item.creationTime)}}</el-col>
</div> </div>
<el-col :span="4"> <el-col :span="4">
<el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2" @click="cancelLaws(item.id)" v-btn-permission="'2dee468b4139ac3f26ebe8ac498b9da6'">{{$t('m.cancelCollection')}}</el-button> <el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2" @click="cancelLaws(item.id)" v-btn-permission="'015f4508c4c5066b90f23d752b43a9df'">取消收藏</el-button>
<!-- <el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2" @click="writeLawsNotes(item,index1)">{{item.seeBtn}}</el-button>-->
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -273,7 +272,7 @@ export default {
this.$http.get('person/personCollect/page', { this.$http.get('person/personCollect/page', {
pageNo: this.page, pageNo: this.page,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
modeType: 'LAWS_STAND', modeType: 'FOREIGN_LAWS',
collectTitle: this.search.collectionLaws, collectTitle: this.search.collectionLaws,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.userId
}, { }, {
@@ -139,7 +139,8 @@ export default {
pageNo: this.page, pageNo: this.page,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
collectTitle: this.search.name collectTitle: this.search.name,
modeType: 'INLAND_STAND,FOREIGN_STAND,BUSINESS_STAND'
}, { }, {
_this: this, _this: this,
loading: 'loading' loading: 'loading'
@@ -3685,10 +3685,10 @@
formData.menuId = this.selectSarMenu.id formData.menuId = this.selectSarMenu.id
} }
// 处理我的收藏和个性化标签传参 // 处理我的收藏和个性化标签传参
if (this.selectSarMenu.id === 'qbwdsc') { if (this.selectSarMenu.menuName === '我的收藏') {
formData.labelMenuId = undefined formData.menuId = undefined
formData.menuId = 'qbwdsc' formData.labelMenuId = undefined
formData.collectMenuId = 'qbwdsc' formData.collectMenuId = 'zcwdsc'
} else if (this.selectSarMenu.id === 'gxhbq' || this.selectSarMenu.pId === 'gxhbq') { } else if (this.selectSarMenu.id === 'gxhbq' || this.selectSarMenu.pId === 'gxhbq') {
formData.menuId = undefined formData.menuId = undefined
formData.labelMenuId = this.selectSarMenu.id formData.labelMenuId = this.selectSarMenu.id