guhongwei 4 years ago
parent
commit
6cc4e544ad

+ 1 - 1
src/layout/live/foot.vue

@@ -4,7 +4,7 @@
       <div class="superdown">
         <div class="w_1200">
           <p>
-            <span>技术运营:吉林省科技大市场 专利分市场</span>
+            <span>技术运营:吉林省科技大市场专利分市场</span>
           </p>
           <p>
             <span>技术支持:长春福瑞科技有限公司</span>

+ 3 - 3
src/views/dynamic/parts/achieveCom.vue

@@ -46,7 +46,7 @@ export default {
         // 中科院长春分院
         let s1 = res.data.filter(f => f.company.includes('中科院长春分院'));
         // 中国科学院东北地理与农业生态研究所
-        let s2 = res.data.filter(f => f.company.includes('中国科学院东北地理与农业生态研究所'));
+        // let s2 = res.data.filter(f => f.company.includes('中国科学院东北地理与农业生态研究所'));
         // 中国科学院长春应用化学研究所
         let s3 = res.data.filter(f => f.company.includes('中国科学院长春应用化学研究所'));
         // 中科院长春光学精密机械与物理研究所
@@ -79,7 +79,7 @@ export default {
             type: 'category',
             boundaryGap: [0, 0.01],
             name: '单位',
-            data: ['长春分院', '地理所', '应化所', '光机所', '吉林大学', '长春工业大学', '长春工程学院', '其他'],
+            data: ['长春分院', '应化所', '光机所', '吉林大学', '长春工业大学', '长春工程学院', '其他'],
             axisLabel: {
               interval: 0, //横轴信息全部显示
               rotate: -30, //-30度角倾斜显示
@@ -108,7 +108,7 @@ export default {
               type: 'bar',
               data: [
                 { name: '中科院长春分院', value: s1.length, itemStyle: { color: '#800000' } },
-                { name: '地理所', value: s2.length, itemStyle: { color: '#F08080' } },
+                // { name: '地理所', value: s2.length, itemStyle: { color: '#F08080' } },
                 { name: '应化所', value: s3.length, itemStyle: { color: '#8B4513' } },
                 { name: '光机所', value: s4.length, itemStyle: { color: '#D2B48C' } },
                 { name: '吉林大学', value: s5.length, itemStyle: { color: '#FFD700' } },

+ 10 - 9
src/views/dynamic/parts/achieveFiled.vue

@@ -76,9 +76,9 @@ export default {
             {
               name: '技术成果',
               // 大小
-              radius: '45%',
+              radius: '50%',
               // 位置
-              center: ['50%', '60%'],
+              center: ['50%', '55%'],
               label: {
                 show: true,
                 position: 'top',
@@ -98,13 +98,14 @@ export default {
               },
             },
           ],
-          toolbox: {
-            show: true,
-            feature: {
-              dataView: { readOnly: false },
-              saveAsImage: {},
-            },
-          },
+          // 数据视图
+          // toolbox: {
+          //   show: true,
+          //   feature: {
+          //     dataView: { readOnly: false },
+          //     saveAsImage: {},
+          //   },
+          // },
         };
         this.myChart.setOption(option);
         this.loading = false;

+ 0 - 7
src/views/dynamic/parts/expertCom.vue

@@ -112,13 +112,6 @@ export default {
               },
             },
           ],
-          toolbox: {
-            show: true,
-            feature: {
-              dataView: { readOnly: false },
-              saveAsImage: {},
-            },
-          },
         };
         this.myChart.setOption(option);
         this.loading = false;

+ 4 - 2
src/views/market/index.vue

@@ -112,8 +112,10 @@ export default {
       if (this.$checkRes(res)) this.$set(this, `businessList`, res.data);
       res = await this.expertquery({ skip: 0, limit: 8 });
       if (this.$checkRes(res)) this.$set(this, `expertList`, res.data);
-      res = await this.adshowQuery({ skip: 0, limit: 5 });
-      if (this.$checkRes(res)) this.$set(this, `roadshowList`, res.data);
+      res = await this.adshowQuery({ skip: 0 });
+      if (this.$checkRes(res)) {
+        this.$set(this, `roadshowList`, _.uniqBy(res.data, 'title'));
+      }
     },
   },
   computed: {

+ 3 - 1
src/views/market/index/roadshow.vue

@@ -73,10 +73,12 @@ export default {
   }
   .down {
     height: 450px;
+    overflow: hidden;
     position: relative;
     .roadshowList {
       border-bottom: 1px dashed #000;
-      padding: 10px 0;
+      border-bottom: 1px dashed #000;
+      padding: 12px 0;
       .date {
         text-align: center;
         span {

+ 3 - 2
src/views/market/marketlists.vue

@@ -293,8 +293,9 @@ export default {
         this.$set(this, `technologyTotal`, res.total);
       } else if (columnName == '项目路演') {
         let res = await this.adshowQuery({ skip: 0, ...info });
-        if (this.$checkRes(res)) this.$set(this, `roadshowList`, res.data);
-        this.$set(this, `roadshowTotal`, res.total);
+        let data = _.uniqBy(res.data, 'title');
+        if (this.$checkRes(res)) this.$set(this, `roadshowList`, data);
+        this.$set(this, `roadshowTotal`, data.length);
       }
     },
     // 点击查看详情