siteId统一

src/mixins/article/index.js

@@ -1,6 +1,5 @@
 import Setting from '@/setting'
 import Util from '@/libs/util'
-import { mapState } from 'vuex'
 export default {
   data() {
     return {
@@ -8,9 +7,9 @@ export default {
     }
   },
   computed: {
-    ...mapState('content', [
+    site() {
-      'site'
+      return this.$route.query.siteId || this.$store.state.content.site
-    ])
+    }
   },
   mounted() {
     

src/mixins/overview/index.js

@@ -27,7 +27,7 @@ export default {
       if (i == 1) path = '/overviewDevHistory?id=214'
       if (i == 2) path = '/overviewTrailer?id=215'
       if (i == 3) path = '/overviewLocation?id=216'
-      if (i == 4) path = '/overviewSetup?id=217'
+      if (i == 4) path = '/overviewSetup?id=229'
       this.$router.push(path + '&siteId=3')
     },
   }

src/pages/article/activity.vue

@@ -125,7 +125,7 @@ export default {
     // 资讯
     getColumn() {
       this.$post(this.api.listWithTreeMenuVisible, {
-        siteId: this.$route.query.siteId || this.$store.state.content.site,
+        siteId: this.site,
         columnName: '',
         templateId: '',
         typeId	: '',
@@ -135,7 +135,7 @@ export default {
         this.getInfo()
       }).catch(err => {})
       
-      this.$post(`${this.api.hotContent}?siteId=${this.$route.query.siteId || this.$store.state.content.site}`).then(({ data }) => {
+      this.$post(`${this.api.hotContent}?siteId=${this.site}`).then(({ data }) => {
         this.hots = Util.removeTag(data)
       }).catch(err => {})
     },
@@ -144,7 +144,7 @@ export default {
       this.$post(this.api.newlyPublishedArticles, {
         pageNum: 1,
         pageSize: 5,
-        siteId: this.$route.query.siteId || this.$store.state.content.site
+        siteId: this.site
       }).then(({ data }) => {
         this.news = Util.removeTag(data.records)
       }).catch(res => {})

src/pages/article/index.vue

@@ -140,7 +140,7 @@ export default {
     // 资讯
     getColumn() {
       this.$post(this.api.listWithTreeMenuVisible, {
-        siteId: this.$route.query.siteId || this.$store.state.content.site,
+        siteId: this.site,
         columnName: '',
         templateId: '',
         typeId	: '',
@@ -150,7 +150,7 @@ export default {
         this.getInfo()
       }).catch(err => {})
       
-      this.$post(`${this.api.hotContent}?siteId=${this.$route.query.siteId || this.$store.state.content.site}`).then(({ data }) => {
+      this.$post(`${this.api.hotContent}?siteId=${this.site}`).then(({ data }) => {
         this.hots = Util.removeTag(data)
       }).catch(err => {})
     },
@@ -159,7 +159,7 @@ export default {
       this.$post(this.api.newlyPublishedArticles, {
         pageNum: 1,
         pageSize: 5,
-        siteId: this.$route.query.siteId || this.$store.state.content.site
+        siteId: this.site
       }).then(({ data }) => {
         this.news = Util.removeTag(data.records)
       }).catch(res => {})

src/pages/column/index.vue

@@ -260,7 +260,7 @@ export default {
     },
     // 获取标签
     getLabel() {
-      this.$post(`${this.api.queryLabel}?siteId=${this.$route.query.siteId || this.site}`)
+      this.$post(`${this.api.queryLabel}?siteId=${this.site}`)
         .then(({ data }) => {
           this.labels = data;
           // 修改placeholder
@@ -334,7 +334,7 @@ export default {
     // 右边资讯
     getColumn() {
       this.$post(this.api.listWithTreeMenuVisible, {
-        siteId: this.$route.query.siteId || this.$store.state.content.site,
+        siteId: this.site,
         columnName: '',
         templateId: '',
         typeId: '',
@@ -345,7 +345,7 @@ export default {
         })
         .catch((err) => { });
 
-      this.$post(`${this.api.hotContent}?siteId=${this.$route.query.siteId || this.$store.state.content.site}`)
+      this.$post(`${this.api.hotContent}?siteId=${this.site}`)
         .then(({ data }) => {
           this.hots = Util.removeTag(data);
         })
@@ -356,7 +356,7 @@ export default {
       this.$post(this.api.newlyPublishedArticles, {
         pageNum: 1,
         pageSize: 5,
-        siteId: this.$route.query.siteId || this.$store.state.content.site
+        siteId: this.site
       })
         .then(({ data }) => {
           this.news = Util.removeTag(data.records);
@@ -375,7 +375,7 @@ export default {
       if (left && to.level === 1 && (typeId === 2 || typeId === 3)) return false;
       // 出版物则跳转到出版物列表
       if (to.templateId === 8) {
-        this.$router.replace(`/publish?id=${this.id}&siteId=${this.$route.query.siteId || this.site}`);
+        this.$router.replace(`/publish?id=${this.id}&siteId=${this.site}`);
         return;
       }
       // 跳转链接
@@ -427,7 +427,7 @@ export default {
         if (this.lableId.includes(e.id)) labelName.push(e.labelName);
       });
       this.$post(this.api.newlyPublishedArticles, {
-        siteId: this.$route.query.siteId || this.site,
+        siteId: this.site,
         columnIds,
         pageNum: this.page,
         pageSize: this.info.pageSize,

src/pages/column/result.vue

@@ -61,9 +61,7 @@ export default {
     getArticle() {
       this.setKeyword('')
       this.$post(this.api.newlyPublishedArticles, {
-        
+        siteId: this.site,
-        
-        siteId: this.$route.query.siteId || this.site,
         pageNum: 1,
         pageSize: 1000,
         title: this.title

src/pages/publication/monograph.vue

@@ -99,7 +99,7 @@ export default {
 .forms {
   display: flex;
   align-items: center;
-  padding: 30px;
+  padding: 15px;
   margin-bottom: 20px;
   background-color: #fff;
   .item {

src/pages/publication/patent.vue

@@ -117,7 +117,7 @@ export default {
 .forms {
   display: flex;
   align-items: center;
-  padding: 30px;
+  padding: 15px;
   margin-bottom: 20px;
   background-color: #fff;
   .item {

src/pages/publication/thesis.vue

@@ -22,7 +22,7 @@
     </div>
 
     <ul class="list">
-      <li v-for="(item, i) in articles" :key="i">
+      <li v-for="(item, i) in articles" :key="i" @click="$parent.toArtice(item)">
         <h6>{{ item.title }}</h6>
         <p class="meta">作者: {{ item.author }}</p>
         <p class="meta">期刊名称: {{ item.periodicalName }}</p>
@@ -92,7 +92,7 @@ export default {
 .forms {
   display: flex;
   align-items: center;
-  padding: 30px;
+  padding: 15px;
   margin-bottom: 20px;
   background-color: #fff;
   .item {
@@ -146,6 +146,7 @@ export default {
     padding: 30px;
     margin-bottom: 15px;
     background-color: #fff;
+    cursor: pointer;
   }
   h6 {
     margin-bottom: 10px;