diff --git a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
index 2c38af157..1724579a5 100644
--- a/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+++ b/src/pages/personal/pages/my-collection/components/CollectionStandard.vue
@@ -62,7 +62,7 @@
创建时间:{{getDate(item.creationTime)}}
- 取消收藏
+ 取消收藏
@@ -150,7 +150,7 @@ export default {
}, e => {})
},
// 取消收藏
- cancelStandard (id) {
+ cancelStandard (item) {
this.$confirm('确定取消收藏此数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -158,16 +158,18 @@ export default {
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
- var json = {}
- json.userId = this.$store.getters.userInfo.userId
- json.id = id
- this.$http.postData('/sarPersonalCenter/sar-user-star/delete',json, {
+ // var json = {
+ // id: item.collectId
+ // }
+ // json.userId = this.$store.getters.userInfo.userId
+ this.$http.put('person/personCollect/updateByUserId',{'id': item.id}, {
_this: this
}, res => {
if (res.ok) {
this.$message.success('已取消收藏')
this.contentOpen = false
this.pageChange(1)
+ this.selectStandard()
}
}, e => {
})
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index a04520354..58f1a1b86 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -288,18 +288,7 @@ export default {
ProcessFooter,
ProcessTitle
},
- mounted () {
- this.getJsonData()
- },
methods: {
- getJsonData() {
- const params = {
- type: '8'
- }
- startProcess(params).then(res => {
- this.taskID = res.data
- })
- },
//点击新增事件
addList() {
standUnqualified(this.queryUnqualidiedData).then(res => {
@@ -383,15 +372,21 @@ export default {
} else {
this.$refs['roleForm'].validate((valid) => {
if (valid) {
- const params = new FormData();
- params.set('json', JSON.stringify(json))
- params.set('userId', this.$store.getters.userInfo.userId)
- params.set('taskIds', this.taskID)
- completeTask(params).then(res => {
- if(res.success === true) {
- this.$message.success('提交成功')
- this.$router.push("/processCenter");
- }
+ const paramsInfo = {
+ type: '8'
+ }
+ startProcess(paramsInfo).then(res => {
+ this.taskID = res.data
+ const params = new FormData();
+ params.set('json', JSON.stringify(json))
+ params.set('userId', this.$store.getters.userInfo.userId)
+ params.set('taskIds', this.taskID)
+ completeTask(params).then(res => {
+ if(res.success === true) {
+ this.$message.success('提交成功')
+ this.$router.push("/processCenter");
+ }
+ })
})
}
})
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 8d81c22bc..853fa1c92 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -973,8 +973,8 @@ export default {
return false
}
// 判断文件上传大小
- if (file.size / 1024 / 1024 > 300) {
- this.$message.warning('文件' + file.name + '大小不能超过300M')
+ if (file.size / 1024 / 1024 > 200) {
+ this.$message.warning('文件' + file.name + '大小不能超过200M')
return false
}
return true
@@ -1403,7 +1403,7 @@ export default {
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
- this.drawerTotal = res.data.list.length
+ this.drawerTotal = res.data.count
}, e => {
})
},
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index df8f46aec..52da71b0b 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -1369,7 +1369,7 @@ export default {
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
- this.drawerTotal = res.data.list.length
+ this.drawerTotal = res.data.count
}, e => {
})
},
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index fc4bc99ef..4dfcc1846 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -1368,7 +1368,7 @@ export default {
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
- this.drawerTotal = res.data.list.length
+ this.drawerTotal = res.data.count
}, e => {
})
},
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index da1ae7721..f15f0a7f3 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -59,7 +59,7 @@
align="center">