Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

src/views/dynamic/parts/down-pie.vue

@@ -16,7 +16,7 @@
                 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="100" align="center">
+            <el-table-column label="操作" width="100" align="center" fixed="right">
               <template slot-scope="scoped">
                 <el-button @click="$router.push({ path: '/dynamic/dealDetail', query: { id: scoped.row.id } })" type="text" size="small">
                   <i class="el-icon-view"></i>
@@ -67,10 +67,9 @@ export default {
         let arr = res.data.filter(f => f.status != '3');
         let newArr = _.chunk(arr, 6);
         this.$set(this, `tableData`, newArr[0]);
-        let taking = rooms.errcode == 0 ? rooms.total : 0;
+        let s3 = res.data.filter(f => f.status == '0'); //正在洽谈
         let s1 = res.data.filter(f => f.status == '1'); //达成意向
         let s2 = res.data.filter(f => f.status == '2'); //对接完成
-        let s3 = res.data.filter(f => f.status == '3'); //未达成意向
         this.myChart = echarts.init(document.getElementById('chartPie'));
         const option = {
           title: {},
@@ -87,9 +86,9 @@ export default {
               },
               type: this.type,
               data: [
-                { name: '正在洽谈', value: taking, itemStyle: { color: '#7cb5ec' } },
-                { name: '达成意向', value: s1.length, itemStyle: { color: '#ffa94b' } },
-                { name: '对接完成', value: s2.length, itemStyle: { color: '#346da4' } },
+                { seriesId: 's3', name: '正在洽谈', value: s3.length, itemStyle: { color: '#7cb5ec' } },
+                { seriesId: 's1', name: '达成意向', value: s1.length, itemStyle: { color: '#ffa94b' } },
+                { seriesId: 's2', name: '对接完成', value: s2.length, itemStyle: { color: '#346da4' } },
               ],
               animationType: 'scale',
             },
@@ -103,6 +102,17 @@ export default {
           },
         };
         this.myChart.setOption(option);
+        this.myChart.on('click', pieConsole);
+        function pieConsole(params) {
+          console.log(params);
+          if (params.dataIndex === 0) {
+            console.log('正在洽谈', s3);
+          } else if (params.dataIndex === 1) {
+            console.log('达成意向', s1);
+          } else {
+            console.log('对接完成', s2);
+          }
+        }
       }
     },
   },