Merge branch 'master' of ssh://47.110.145.204:2222/godwithdh/wx_h5

src/view/tiip/IntReportForms/empAna.vue

@@ -35,7 +35,7 @@
         <div class="CONTENT">
             <div class="iCard" ref="chart1">
                 <p>前十名员工（联动）</p>
-                <div ref="myChart1" :style="{width: '100vw', height: '300%',display:chartData1.length > 0 ? 'block' : 'none'}"></div>
+                <div ref="myChart1" :style="{width: '100vw', height: '260px',display:chartData1.length > 0 ? 'block' : 'none'}"></div>
                 <div class="noData" v-if="chartData1.length <= 0">
                     <img src="@/assets/noData.jpg" class="_img" alt="">
                 </div>
@@ -188,8 +188,10 @@ export default {
                     }
                 },
                 grid: {
+                    top:"40",
+                    bottom:"20",
                     left: '2%',   // 与容器左侧的距离
-                    right: '2%', // 与容器右侧的距离
+                    right: '10%', // 与容器右侧的距离
                     containLabel: true
                 },
                 xAxis: [
@@ -260,21 +262,29 @@ export default {
                         }
                     }
                 },
+                grid: {
+                    top:"40",
+                    bottom:"20",
+                    left: '2%',   // 与容器左侧的距离
+                    right: '10%', // 与容器右侧的距离
+                    containLabel: true
+                },
                 xAxis: {
                     type: 'category',
                     data: id == 0 ? this.chartData2.map(x=>x.sMonth) : this.chartData3.map(x=>x.sMonth)
                 },
                 yAxis: {
                     type: 'value',
+                    name: '金额',
                     axisLabel: {
                         margin: 2,
                         formatter: function (value, index) {
                             if(value >= 1000 && value < 10000){
-                                value = value / 1000 + "千";
+                                value = Math.round(value/10) / 100 + "千";
                             }else if (value >= 10000 && value < 10000000) {
-                                value = value / 10000 + "万";
+                                value = Math.round(value/100) / 100 + "万";
                             } else if (value >= 10000000) {
-                                value = value / 10000000 + "千万";
+                                value = Math.round(value/1000) / 10000 + "千万";
                             }
                             return value;
                         }

src/view/tiip/receive/varieties.vue

@@ -63,9 +63,10 @@
             <tbody>
                 <template v-for="(v,k) in list">
                     <tr class="name" :key="k+'_name'">
-                        <td @click="toDetail(k)">{{v.sSampleMaterialNo}}</td>
-                        <td/>
-                        <td/>
+                        <td @click="toDetail(k)">
+                            <div style="color: #cb855d;font-size: 11px;">{{v.sSampleMaterialNo||""}}</div>
+                            <div style="font-size: 14px;">{{v.sProviderName||""}}</div>
+                        </td>
                     </tr>
                     <tr :key="k+'_1'">
                         <td style="color:#048ECA;">期初库存</td>