Merge remote-tracking branch 'origin/develop' into develop

src/pages/personal/pages/my-collection/components/CollectionStandard.vue

@@ -62,7 +62,7 @@
                 <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
               </div>
               <el-col :span="4">
-                <el-button size="mini" @click="cancelStandard(item.id)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
+                <el-button size="mini" @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
               </el-col>
             </el-row>
           </div>
@@ -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 = {}
+        // var json = {
-        json.userId = this.$store.getters.userInfo.userId
+        //   id: item.collectId
-        json.id = id
+        // }
-        this.$http.postData('/sarPersonalCenter/sar-user-star/delete',json, {
+        // 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 => {
         })

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();
+              const paramsInfo = {
-              params.set('json', JSON.stringify(json))
+                type: '8'
-              params.set('userId', this.$store.getters.userInfo.userId)
+              }
-              params.set('taskIds', this.taskID)
+              startProcess(paramsInfo).then(res => {
-              completeTask(params).then(res => {
+                this.taskID = res.data
-                if(res.success === true) {
+                const params = new FormData();
-                  this.$message.success('提交成功')
+                params.set('json', JSON.stringify(json))
-                  this.$router.push("/processCenter");
+                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");
+                  }
+                })
               })
             }
           })

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -973,8 +973,8 @@ export default {
         return false
       }
       // 判断文件上传大小
-      if (file.size / 1024 / 1024 > 300) {
+      if (file.size / 1024 / 1024 > 200) {
-        this.$message.warning('文件' + file.name + '大小不能超过300M')
+        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 => {
       })
     },

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 => {
       })
     },

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 => {
       })
     },

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -59,7 +59,7 @@
               align="center">
           </el-table-column>
           <el-table-column
-              prop="standId"
+              prop="standNumber"
               label="项目编号"
               fixed="left"
               width="260px"
@@ -555,7 +555,7 @@ export default {
             this.active = -1
           }
         }
-        // 考虑如果没有当前时间，颜色怎么设置
+        // 考虑如果没有当前时间， 颜色怎么设置
       })
       this.selectTableDataList()
     },
@@ -586,6 +586,7 @@ export default {
           }
           const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
               'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
+          console.log(exportURL)
           window.open(exportURL)
           this.$message.success('导出信息成功')
         }