11

package-lock.json

@@ -1698,6 +1698,16 @@
           "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
           "dev": true
         },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
         "cacache": {
           "version": "13.0.1",
           "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz",
@@ -1724,6 +1734,53 @@
             "unique-filename": "^1.1.1"
           }
         },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true,
+          "optional": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true,
+          "optional": true
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
@@ -1740,6 +1797,16 @@
             "minipass": "^3.1.1"
           }
         },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
         "terser-webpack-plugin": {
           "version": "2.3.8",
           "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz?cache=0&sync_timestamp=1610194262897&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.8.tgz",
@@ -1756,6 +1823,18 @@
             "terser": "^4.6.12",
             "webpack-sources": "^1.4.3"
           }
+        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.1.2",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz",
+          "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          }
         }
       }
     },
@@ -4567,12 +4646,12 @@
       }
     },
     "echarts": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.0.1.tgz",
-      "integrity": "sha512-JYn22Dolt2esY2jEzUsw1OxbobuW67oGjIoTjZO3rW89SWkfJ4kbrmC2OW9JjsBrD1rdkmaWBuZZ2HgmThyxJw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.0.2.tgz",
+      "integrity": "sha512-En0VYpc96nw2/2AZoBWPHsGi471zMublttj50kfFpYAeR4geup0Tj9iVgEXh7QYZFPnRiruDJEjcB5PXZ+BYzQ==",
       "requires": {
         "tslib": "2.0.3",
-        "zrender": "5.0.3"
+        "zrender": "5.0.4"
       },
       "dependencies": {
         "tslib": {
@@ -11264,87 +11343,6 @@
         }
       }
     },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.1.2",
-      "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.1.2.tgz?cache=0&sync_timestamp=1608187989529&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-16.1.2.tgz",
-      "integrity": "sha1-XAO2xQ0qX5g8fOuhXFDXjKKymPQ=",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1611326384145&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
-          "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz?cache=0&sync_timestamp=1591687042638&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-4.1.0.tgz",
-          "integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
-          "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
-          "dev": true,
-          "optional": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
-          "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
-          "dev": true,
-          "optional": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
-          "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1611394404603&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
-          "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "vue-meta": {
       "version": "2.4.0",
       "resolved": "https://registry.npm.taobao.org/vue-meta/download/vue-meta-2.4.0.tgz",
@@ -12274,9 +12272,9 @@
       }
     },
     "zrender": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.0.3.tgz",
-      "integrity": "sha512-TVcN2IMdo7je3GEq/E4CER4AGBe/n50/izILdupppyHf/hVHuiXCRliqdu8+32Z1OmGg6RfKt5qQlkX+bOtU0g==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.0.4.tgz",
+      "integrity": "sha512-DJpy0yrHYY5CuH6vhb9IINWbjvBUe/56J8aH86Jb7O8rRPAYZ3M2E469Qf5B3EOIfM3o3aUrO5edRQfLJ+l1Qw==",
       "requires": {
         "tslib": "2.0.3"
       },

package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "axios": "^0.21.1",
     "core-js": "^3.6.5",
-    "echarts": "^5.0.1",
+    "echarts": "^5.0.2",
     "element-ui": "^2.15.0",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.20",

src/router/index.js

@@ -110,6 +110,12 @@ const live = [
     meta: { title: '直播大厅-参展项目', subSite: true },
     component: () => import('../views/achieveLive/product/index.vue'),
   },
+  {
+    path: '/achieveLive/product/detail',
+    name: 'achieveLive_detail',
+    meta: { title: '直播大厅-对接项目', subSite: true },
+    component: () => import('../views/achieveLive/product/detail.vue'),
+  },
   {
     path: '/achieveLive/guestRoad/index',
     name: 'achieveLive_guestRoad',

src/views/achieveLive/detail/productData.vue

@@ -97,7 +97,7 @@ export default {
     },
     // 成果对接
     achievetransBtn(data) {
-      console.log(data);
+      this.$router.push({ path: '/achieveLive/product/detail', query: { dock_id: this.id, id: data._id } });
     },
     // 取消查看
     handleClose() {

src/views/achieveLive/product/detail.vue

@@ -0,0 +1,102 @@
+<template>
+  <div id="detail">
+    <el-row>
+      <el-col :span="24" class="main">
+        <subTop :liveInfo="liveInfo"></subTop>
+        <el-col :span="24" class="info">
+          <div class="w_1200">
+            <el-col :span="24" class="infoMess">
+              <el-col :span="24" class="btn">
+                <el-button type="primary" size="mini" @click="back">返回活动首页</el-button>
+              </el-col>
+              <el-col :span="24">
+                <detailInfo :form="info"></detailInfo>
+              </el-col>
+            </el-col>
+          </div>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import subTop from '../parts/subTop.vue';
+import detailInfo from '../product/detailInfo.vue';
+import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: dock } = createNamespacedHelpers('dock');
+const { mapActions: product } = createNamespacedHelpers('product');
+export default {
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+  name: 'detail',
+  props: {},
+  components: {
+    subTop,
+    detailInfo,
+  },
+  data: function() {
+    return {
+      liveInfo: {},
+      info: {},
+    };
+  },
+  async created() {
+    await this.search();
+  },
+  methods: {
+    ...dock(['fetch']),
+    ...product({ productFetch: 'fetch' }),
+    async search() {
+      if (this.dock_id) {
+        let res = await this.fetch(this.dock_id);
+        if (this.$checkRes(res)) {
+          this.$set(this, `liveInfo`, res.data);
+        }
+        res = await this.productFetch(this.id);
+        if (this.$checkRes(res)) {
+          this.$set(this, `info`, res.data);
+        }
+      }
+    },
+    // 返回
+    back() {
+      this.$router.push({ path: '/achieveLive/detail', query: { id: this.dock_id } });
+    },
+  },
+  computed: {
+    ...mapState(['user']),
+    dock_id() {
+      return this.$route.query.dock_id;
+    },
+    id() {
+      return this.$route.query.id;
+    },
+  },
+  watch: {},
+};
+</script>
+
+<style lang="less" scoped>
+.main {
+  .info {
+    position: absolute;
+    top: 70%;
+    padding: 0 0 15px 0;
+    .infoMess {
+      min-height: 630px;
+      box-shadow: 0 0 5px #ccc;
+      background-color: #fff;
+      padding: 20px;
+      .btn {
+        text-align: right;
+        margin: 0 0 10px 0;
+        height: 40px;
+        overflow: hidden;
+        border-bottom: 2px solid #666;
+      }
+    }
+  }
+}
+</style>

src/views/achieveLive/product/detailInfo.vue

@@ -159,8 +159,8 @@
           </el-col>
         </el-col>
         <el-col :span="24" class="anniu" v-if="showBtn">
-          <el-button type="primary" size="mini" v-if="this.user.uid != form.userid">交流洽谈</el-button>
-          <el-button type="success" size="mini" v-if="this.user.uid != form.userid">供求对接</el-button>
+          <el-button type="primary" size="mini">交流洽谈</el-button>
+          <el-button type="success" size="mini">供求对接</el-button>
         </el-col>
       </el-col>
     </el-row>

src/views/achieveLive/product/index.vue

@@ -88,7 +88,7 @@ export default {
     },
     // 对接
     toCheck({ data }) {
-      console.log(data);
+      this.$router.push({ path: '/achieveLive/product/detail', query: { dock_id: this.dock_id, id: data._id } });
     },
     // 返回
     back() {

src/views/admin/live/science.vue

@@ -29,7 +29,12 @@ export default {
       menus: [
         { num: '1', title: '基本信息', icon: 'el-icon-notebook-1', component: 'sBase' },
         { num: '2', title: '视频管理', icon: 'el-icon-video-camera-solid', component: 'sVideo' },
-        { num: '3', title: '进入频道', icon: 'el-icon-refresh', component: () => this.$router.push({ path: '/channel/index', query: { id: this.user.id } }) },
+        {
+          num: '3',
+          title: '进入频道',
+          icon: 'el-icon-refresh',
+          component: () => this.$router.push({ path: '/channelLive/index', query: { id: this.user.id } }),
+        },
       ],
     };
   },

src/views/admin/live/train.vue

@@ -29,7 +29,7 @@ export default {
         { num: '1', title: '基本信息', icon: 'el-icon-notebook-1', component: 'tBase' },
         { num: '2', title: '视频管理', icon: 'el-icon-video-camera-solid', component: 'tVideo' },
         { num: '3', title: '用户管理', icon: 'el-icon-user', component: 'tUser' },
-        { num: '4', title: '进入频道', icon: 'el-icon-refresh', component: () => this.$router.push({ path: '/channel/index', query: { id: this.user.id } }) },
+        { num: '4', title: '进入频道', icon: 'el-icon-refresh', component: () => this.$router.push({ path: '/trainLive/index', query: { id: this.user.id } }) },
       ],
     };
   },

src/views/dynamic/parts/achieveCom copy.vue

@@ -0,0 +1,130 @@
+<template>
+  <div id="top-right">
+    <el-row>
+      <el-col :span="24" class="main" v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading">
+        <el-col :span="24" class="one">
+          e专利
+        </el-col>
+        <el-col :span="24" class="two">
+          <div id="patentData" class="style"></div>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import * as echarts from 'echarts/lib/echarts';
+import 'echarts/lib/chart/bar';
+import 'echarts/lib/chart/pie';
+import 'echarts/lib/chart/line';
+import 'echarts/lib/component/title';
+import 'echarts/lib/component/legend';
+import 'echarts/lib/component/toolbox';
+import 'echarts/lib/component/markPoint';
+import 'echarts/lib/component/tooltip';
+import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: statistics } = createNamespacedHelpers('statistics');
+export default {
+  name: 'top-right',
+  props: {},
+  components: {},
+  data: () => {
+    return {
+      myChart: null,
+      loading: true,
+      data: [],
+    };
+  },
+  created() {
+    this.init();
+  },
+  methods: {
+    ...statistics(['query']),
+    async init() {
+      let res = await this.query('patent');
+      if (this.$checkRes(res)) {
+        let viewData = res.data.map(i => i.name);
+        console.log(viewData);
+        this.myChart = echarts.init(document.getElementById('patentData'));
+        const option = {
+          title: {},
+          tooltip: { trigger: 'axis' },
+          grid: {
+            y2: 140,
+          },
+          xAxis: {
+            type: 'category',
+            boundaryGap: [0, 0.01],
+            name: '申请人',
+            data: viewData,
+            axisLabel: {
+              interval: 0, //横轴信息全部显示
+              rotate: -30, //-30度角倾斜显示
+            },
+            axisTick: {
+              // 坐标轴 刻度
+              show: true, // 是否显示
+              inside: true, // 是否朝内
+              length: 3, // 长度
+              lineStyle: {
+                // 默认取轴线的样式
+                color: 'red',
+                width: 1,
+                type: 'solid',
+              },
+            },
+          },
+          yAxis: {},
+          series: [
+            {
+              name: 'e专利',
+              label: {
+                show: true,
+                position: 'top',
+              },
+              type: 'bar',
+              itemStyle: {
+                normal: {
+                  color: function(params) {
+                    var colorList = ['#C1232B', '#B5C334', '#FCCE10', '#E87C25', '#27727B', '#FE8463', '#9BCA63', '#FAD860', '#F3A43B', '#60C0DD', '#778899'];
+                    return colorList[params.dataIndex];
+                  },
+                },
+              },
+              data: res.data,
+            },
+          ],
+        };
+        this.myChart.setOption(option);
+        this.loading = false;
+      }
+    },
+  },
+  computed: {
+    ...mapState(['top-right']),
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.main {
+  .one {
+    padding: 15px 0 30px 0;
+    text-align: center;
+    font-size: 18px;
+    font-weight: bold;
+  }
+  .two {
+    .style {
+      height: 430px;
+    }
+  }
+}
+</style>

src/views/dynamic/parts/achieveCom.vue

@@ -1,12 +1,12 @@
 <template>
-  <div id="top-right">
+  <div id="eachers">
     <el-row>
-      <el-col :span="24" class="main" v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading">
+      <el-col :span="24" class="main">
         <el-col :span="24" class="one">
           e专利
         </el-col>
         <el-col :span="24" class="two">
-          <div id="achieveCom" class="style"></div>
+          <div id="myChart" :style="{ width: '558px', height: '430px' }"></div>
         </el-col>
       </el-col>
     </el-row>
@@ -14,39 +14,38 @@
 </template>
 
 <script>
-import echarts from 'echarts/lib/echarts';
-import 'echarts/lib/chart/bar';
-import 'echarts/lib/chart/pie';
-import 'echarts/lib/chart/line';
-import 'echarts/lib/component/title';
-import 'echarts/lib/component/legend';
-import 'echarts/lib/component/toolbox';
-import 'echarts/lib/component/markPoint';
-import 'echarts/lib/component/tooltip';
+// 引入基本模板
+let echarts = require('echarts/lib/echarts');
+// 引入柱状图组件
+require('echarts/lib/chart/bar');
+// 引入提示框和title组件
+require('echarts/lib/component/tooltip');
+require('echarts/lib/component/title');
+echarts = require('echarts');
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: statistics } = createNamespacedHelpers('statistics');
 export default {
-  name: 'top-right',
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+  name: 'eachers',
   props: {},
   components: {},
-  data: () => {
-    return {
-      myChart: null,
-      loading: true,
-      data: [],
-    };
+  data: function() {
+    return {};
   },
-  created() {
-    this.init();
+  created() {},
+  mounted() {
+    this.drawLine();
   },
   methods: {
     ...statistics(['query']),
-    async init() {
+    async drawLine() {
       let res = await this.query('patent');
       if (this.$checkRes(res)) {
         let viewData = res.data.map(i => i.name);
-        this.myChart = echarts.init(document.getElementById('achieveCom'));
-        const option = {
+        let myChart = echarts.init(document.getElementById('myChart'));
+        myChart.setOption({
           title: {},
           tooltip: { trigger: 'axis' },
           grid: {
@@ -94,21 +93,14 @@ export default {
               data: res.data,
             },
           ],
-        };
-        this.myChart.setOption(option);
-        this.loading = false;
+        });
       }
     },
   },
   computed: {
-    ...mapState(['top-right']),
-    pageTitle() {
-      return `${this.$route.meta.title}`;
-    },
-  },
-  metaInfo() {
-    return { title: this.$route.meta.title };
+    ...mapState(['user']),
   },
+  watch: {},
 };
 </script>
 

src/views/dynamic/parts/achieveFiled.vue

@@ -16,7 +16,7 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: statistics } = createNamespacedHelpers('statistics');
-import echarts from 'echarts/lib/echarts';
+import * as echarts from 'echarts/lib/echarts';
 import 'echarts/lib/chart/pie';
 import 'echarts/lib/chart/pie';
 import 'echarts/lib/chart/line';

src/views/dynamic/parts/expertCom.vue

@@ -16,7 +16,7 @@
 <script>
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions: statistics } = createNamespacedHelpers('statistics');
-import echarts from 'echarts/lib/echarts';
+import * as echarts from 'echarts/lib/echarts';
 import 'echarts/lib/chart/pie';
 import 'echarts/lib/chart/pie';
 import 'echarts/lib/chart/line';

src/views/dynamic/parts/userTwo.vue

@@ -12,48 +12,6 @@
               <p>{{ item.value }}</p>
             </el-col>
           </el-col>
-          <!-- <el-col class="box" :span="5">
-            <el-col :span="24" class="two one">
-              <p>个人注册数量</p>
-              <p>{{ detail.num2 }}</p>
-            </el-col>
-          </el-col>
-          <el-col class="box" :span="5">
-            <el-col :span="24" class="three one">
-              <p>专家注册数量</p>
-              <p>{{ detail.num3 }}</p>
-            </el-col>
-          </el-col>
-          <el-col class="box" :span="5">
-            <el-col :span="24" class="five one">
-              <p>信息发布数量</p>
-              <p>{{ detail.num4 }}</p>
-            </el-col>
-          </el-col>
-          <el-col class="box" :span="5">
-            <el-col :span="24" class="five one">
-              <p>交流互动</p>
-              <p>{{ detail.num5 }}</p>
-            </el-col>
-          </el-col>
-          <el-col class="box" :span="5">
-            <el-col :span="24" class="three one">
-              <p>正在洽谈</p>
-              <p>{{ transaction1 }}</p>
-            </el-col>
-          </el-col>
-          <el-col class="box" :span="5">
-            <el-col :span="24" class="two one">
-              <p>达成意向</p>
-              <p>{{ transaction2 }}</p>
-            </el-col>
-          </el-col>
-          <el-col class="box" :span="5">
-            <el-col :span="24" class="four one">
-              <p>对接完成</p>
-              <p>{{ transaction3 }}</p>
-            </el-col>
-          </el-col> -->
         </el-col>
       </el-col>
     </el-row>

src/views/market/list/expert.vue

@@ -54,7 +54,7 @@ export default {
     translate(data) {
       const list = data.map(i => {
         const obj = { id: i.id || i.user_id };
-        obj.p1 = _.get(i, 'expertimage');
+        obj.p1 = _.get(i, 'img_path');
         obj.p2 = _.get(i, 'name');
         obj.p3 = _.get(i, 'company');
         obj.p4 = _.get(i, 'expertise');