Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
This commit is contained in:
@@ -2270,8 +2270,8 @@ export default {
|
|||||||
this.uploadFilesplitEo.standNumSplit = this.sarStandardsInfoEO.lawsNumber
|
this.uploadFilesplitEo.standNumSplit = this.sarStandardsInfoEO.lawsNumber
|
||||||
this.uploadFilesplitEo.standNameSplit = this.sarStandardsInfoEO.lawsName
|
this.uploadFilesplitEo.standNameSplit = this.sarStandardsInfoEO.lawsName
|
||||||
this.uploadFilesplitEo.standId = this.sarStandardsInfoEO.id
|
this.uploadFilesplitEo.standId = this.sarStandardsInfoEO.id
|
||||||
// this.uploadFilesplitEo.fileType = this.$route.params.pageType
|
this.uploadFilesplitEo.fileType = this.$route.params.pageType
|
||||||
this.uploadFilesplitEo.fileType = this.sarStandardsInfoEO.textStatus
|
// this.uploadFilesplitEo.fileType = this.sarStandardsInfoEO.textStatus
|
||||||
|
|
||||||
var filename = file.name
|
var filename = file.name
|
||||||
var index1 = filename.lastIndexOf('.')
|
var index1 = filename.lastIndexOf('.')
|
||||||
|
|||||||
@@ -1675,7 +1675,7 @@ export default {
|
|||||||
this.tagsLoading = true
|
this.tagsLoading = true
|
||||||
this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{
|
this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{
|
||||||
standardId: this.activestand,
|
standardId: this.activestand,
|
||||||
answerer: this.$store.getters.userInfo.userId,
|
answererId: this.$store.getters.userInfo.userId,
|
||||||
},{
|
},{
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
|
|||||||
@@ -1710,7 +1710,7 @@ export default {
|
|||||||
this.tagsLoading = true
|
this.tagsLoading = true
|
||||||
this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{
|
this.$http.get('lawss/AskQuestions/getSubscriptionByStandId',{
|
||||||
standardId: this.activestand,
|
standardId: this.activestand,
|
||||||
answerer: this.$store.getters.userInfo.userId,
|
answererId: this.$store.getters.userInfo.userId,
|
||||||
},{
|
},{
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
|
|||||||
Reference in New Issue
Block a user