Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

src/pages/details/otherStandardDetails/index.vue

@@ -189,12 +189,12 @@
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
+                  <el-button
+                      @click="showItemsModel(child.attrField)"
+                      class="decomposition-btn"
+                      icon="icon-separate"
+                  >标准分解单</el-button>
                 </p>
-                <el-button
-                  @click="showItemsModel(child.attrField)"
-                  class="decomposition-btn"
-                  icon="icon-separate"
-                >标准分解单</el-button>
               </div>
             </div>
 
@@ -281,12 +281,12 @@
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                 </p>
-<!--                <el-button-->
+                <el-button
-<!--                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
+                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"
-<!--                  @click="showItemsModel(child.attrField)"-->
+                  @click="showItemsModel(child.attrField)"
-<!--                  class="decomposition-btn"-->
+                  class="decomposition-btn"
-<!--                  icon="icon-separate"-->
+                  icon="icon-separate"
-<!--                >标准分解单2</el-button>-->
+                >标准分解单</el-button>
               </div>
             </div>
 
@@ -2023,7 +2023,7 @@ export default {
       }
       // 缺少文件
       if (this.$route.params.pageType === 'INLAND_STAND') {
-        if (this.$hasPermission('ZWBGBNTL11')) {
+        if (this.$hasPermission('2d6ab9d465ab73d415194e1ca4313793')) {
           this.$http.get('lawss/sarStandFile/queryConvertAtt', {
             attId: attId
           }, {
@@ -2067,7 +2067,7 @@ export default {
         }
       } else {
         // 国外在线预览权限
-        if (this.$hasPermission('YfS94QodMK')) {
+        if (this.$hasPermission('ee684b4a9975f5d8a6dfe898c0332f98  ')) {
           this.$http.get('lawss/sarStandFile/queryConvertAtt', {
             attId: attId
           }, {

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

@@ -53,13 +53,13 @@
                 </el-col>
                 <el-col :span="6">
                   <el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top" v-if="item.collectTitle">
-                    <div class="left-contents">标题：{{ item.name }}</div>
+                    <div class="left-contents">标题：{{ item.collectTitle }}</div>
                   </el-tooltip>
                   <div v-else>
-                    <div class="left-contents">标题：{{ item.name }}</div>
+                    <div class="left-contents">标题：{{ item.collectTitle }}</div>
                   </div>
                 </el-col>
-                <el-col :span="4" :offset="3">创建时间：{{getDate(item.createTime)}}</el-col>
+                <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>
@@ -127,6 +127,7 @@ export default {
       this.$http.get('person/personCollect/page', {
         pageNo: this.page,
         pageSize: this.$store.getters.userInfo.configContent,
+        userId: this.$store.getters.userInfo.userId,
         collectTitle: this.search.name
       }, {
         _this: this,

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -2118,6 +2118,8 @@ export default {
         this.personCollect.collectTitle = item.standName + '  ( 编号:' + item.standSort + ' ' + item.standNumber + ' )'
       }
       this.personCollect.collectType = 'INLAND_STAND'
+      this.personCollect.id = item.id
+      this.personCollect.userId = this.$store.getters.userInfo.userId
       this.$http.postData('person/personCollect', this.personCollect, {
         _this: this
       }, res => {

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -1910,6 +1910,8 @@ export default {
         this.personCollect.collectTitle = item.standName + '  ( 编号:' + item.standSort + ' ' + item.standNumber + ' )'
       }
       this.personCollect.collectType = 'FOREIGN_STAND'
+      this.personCollect.id = item.id
+      this.personCollect.userId = this.$store.getters.userInfo.userId
       this.$http.postData('person/personCollect', this.personCollect, {
         _this: this
       }, res => {