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

src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue

@@ -4,17 +4,18 @@
       <div class="back" title="返回" @click="back">
         <i class="el-icon-back"></i>
       </div>
-      <div class="title">
+    </div>
-        {{ detailInfoForm.dataTitle + '-详情' }}
+    <!--title 标题-->
-      </div>
+    <div class="details-header">
+      <span>
+        {{detailInfoForm.dataTitle}}
+      </span>
     </div>
     <transition name="el-zoom-in-top">
       <div class="transition-box">
         <p class="transition-box-p">
           <label class="transition-box-label">类型：</label>
-          <span class="transition-box-span">
+          <span class="transition-box-span">{{ detailInfoForm.dataType }}</span>
-             {{ detailInfoForm.dataType }}
-            </span>
         </p>
         <p class="transition-box-p">
           <label class="transition-box-label">资料标题：</label>
@@ -204,8 +205,8 @@ export default {
 
   },
   created() {
-    this.detailInfoId = this.$route.params.id
+    this.detailInfoId = this.$route.query.id
-    console.log('13', this.$route.params.id)
+    console.log('13', this.$route.query.id)
   },
   mounted() {
     let fileId
@@ -250,15 +251,14 @@ export default {
   .transition-box {
     padding: 0 10% 0 10%;
     background: #ffffff;
-    font-size: 28px;
+    font-size: 16px;
 
     .transition-box-p {
       line-height: 50px;
-
+      border-bottom: 1px solid #E5E5E5;
       .transition-box-label {
         display: inline-block;
-        font-weight: bolder;
+        width: 100px;
-        width: 200px;
         vertical-align: top;
       }
 
@@ -266,6 +266,8 @@ export default {
         display: inline-block;
         color: #7e8083;
         width: calc(~'100% - 100px');
+        word-break: break-all;
+        white-space: pre-wrap;
       }
 
       .file-box {
@@ -277,6 +279,7 @@ export default {
           width: 100%;
           cursor: pointer;
           color: #4498f0;
+          word-break: break-all;
         }
 
         p {
@@ -309,4 +312,18 @@ export default {
     }
   }
 }
+
+
+.details-header {
+  padding: 34px 20%;
+  font-size: 20px;
+  font-weight: bold;
+  color: #555555;
+  text-align: center;
+  word-break: break-all;
+  white-space: pre-wrap;
+  & > span {
+    width: 100%;
+  }
+}
 </style>

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="结束日期">
@@ -134,12 +134,14 @@
             prop="dataType"
             width="250"
             label="类型"
+            :show-overflow-tooltip="true"
             align="center">
           </el-table-column>
           <el-table-column
             prop="dataTitle"
             min-width="250"
             label="资料标题"
+            :show-overflow-tooltip="true"
             align="center">
             <template slot-scope="scope">
               <span @click.stop="toDetail(scope.row)" style="cursor:pointer;color: #409eff">{{ scope.row.dataTitle }}</span>
@@ -296,7 +298,7 @@
                 :on-remove="handleRemove"
                 :before-remove="beforeRemove"
                 multiple
-                :limit="3"
+                :limit="50"
                 :on-exceed="handleExceed"
                 :on-success="uploadSuccess"
                 :file-list="fileList">
@@ -602,7 +604,7 @@ export default {
     toDetail(row){
       this.$router.push({
         name: "dataCenterDetail",
-        params: {
+        query: {
           id: row.id
         }
       });
@@ -630,7 +632,7 @@ export default {
     handlePreview(file) {
     },
     handleExceed(files, fileList) {
-      this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+      this.$message.warning(`当前限制选择 50 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
     },
     beforeRemove(file, fileList) {
       return this.$confirm(`确定移除 ${file.name}？`);
@@ -666,8 +668,13 @@ export default {
     },
     searchInfo() {
       this.loading = true
-      this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0]
+      if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){
-      this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1]
+        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 => {
@@ -805,7 +812,6 @@ export default {
   display: flex;
 }
 #left {
-  width: calc(30% - 5px);
   height: 100%;
   float: left;
 }

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=>{
@@ -944,7 +957,6 @@ export default {
     //清空
     delSearch(){
       this.questionSerach = {
-        classification: 'INLAND',
         standardName: '',  //标准名称
         standardEncdoing: '', //标准编号
         questioner: this.$store.getters.userInfo.userId,   //提问人