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

src/pages/regulatoryRepository/dataCenter/index.vue

@@ -81,9 +81,9 @@
             <el-date-picker
               v-model="dataCenterSearch.dataUploadTime"
               clearable
-              value-format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd"
               size="small"
-              type="datetimerange"
+              type="daterange"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期">
@@ -666,8 +666,13 @@ export default {
     },
     searchInfo() {
       this.loading = true
-      this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0]
-      this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1]
+      if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){
+        this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0]
+        this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1]
+      }else{
+        this.dataCenterSearch.startDataUploadTime =''
+        this.dataCenterSearch.endDataUploadTime = ''
+      }
       this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, {
         _this: this
       }, res => {

src/pages/regulatoryRepository/standQA/index.vue

@@ -671,6 +671,9 @@ export default {
         case '查看':
           this.handleDetail(command[0])
           break
+        case '订阅':
+          this.subscribe(command[0])
+          break
       }
     },
     handleDetail(row){
@@ -686,6 +689,16 @@ export default {
       }, e => {
       })
     },
+    subscribe(row){
+      this.$http.postData('lawss/Subscription/insertSubscription',{
+        askId: row.id,
+        usId: this.$store.getters.userInfo.userId,
+      },{
+        _this: this
+      }, res => {
+        console.log(res);
+      })
+    },
     refreshStandMap(){
       this.standMap = new Map()
       this.standList.forEach(item=>{