3/21

src/views/main/CommondbPort/addForm.vue

@@ -36,10 +36,7 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="航线" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
+              <a-input placeholder="请输入航线" v-decorator="['shippingRoute']" />
-                placeholder="请输入航线"
-                v-decorator="['shippingRoute', { rules: [{ required: true, message: '请输入航线！' }] }]"
-              />
             </a-form-item>
           </a-col>
           <a-col :span="12">

src/views/main/CommondbPort/editForm.vue

@@ -35,14 +35,11 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="航线" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
+              <a-input placeholder="请输入航线" v-decorator="['shippingRoute']" />
-                placeholder="请输入航线"
-                v-decorator="['shippingRoute', { rules: [{ required: true, message: '请输入航线！' }] }]"
-              />
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="12">
             <a-form-item label="国家" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input

src/views/main/CommondbPort/index.vue

@@ -119,12 +119,12 @@ export default {
           width: '80',
           dataIndex: 'cnName'
         },
-        {
+        // {
-          title: '航线',
+        //   title: '航线',
-          align: 'center',
+        //   align: 'center',
-          width: '80',
+        //   width: '80',
-          dataIndex: 'shippingRoute'
+        //   dataIndex: 'shippingRoute'
-        },
+        // },
         {
           title: '国家',
           align: 'center',

src/views/system/dashboard/Analysis.vue

@@ -27,7 +27,9 @@
           <div>
             <mini-area />
           </div>
-          <template slot="footer">日访问量<span> {{ '1234' | NumberFormat }}</span></template>
+          <template slot="footer"
+            >日访问量<span> {{ '1234' | NumberFormat }}</span></template
+          >
         </chart-card>
       </a-col>
       <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
@@ -153,16 +155,20 @@
                 :pagination="{ pageSize: 5 }"
               >
                 <span slot="range" slot-scope="text, record">
-                  <trend :flag="record.status === 0 ? 'up' : 'down'">
+                  <trend :flag="record.status === 0 ? 'up' : 'down'"> {{ text }}% </trend>
-                    {{ text }}%
-                  </trend>
                 </span>
               </a-table>
             </div>
           </a-card>
         </a-col>
         <a-col :xl="12" :lg="24" :md="24" :sm="24" :xs="24">
-          <a-card class="antd-pro-pages-dashboard-analysis-salesCard" :loading="loading" :bordered="false" title="销售额类别占比" :style="{ height: '100%' }">
+          <a-card
+            class="antd-pro-pages-dashboard-analysis-salesCard"
+            :loading="loading"
+            :bordered="false"
+            title="销售额类别占比"
+            :style="{ height: '100%' }"
+          >
             <div slot="extra" style="height: inherit;">
               <!-- style="bottom: 12px;display: inline-block;" -->
               <span class="dashboard-analysis-iconGroup">
@@ -208,7 +214,17 @@
 </template>
 <script>
 import moment from 'moment'
-import { ChartCard, MiniArea, MiniBar, MiniProgress, RankList, Bar, Trend, NumberInfo, MiniSmoothArea } from '@/components'
+import {
+  ChartCard,
+  MiniArea,
+  MiniBar,
+  MiniProgress,
+  RankList,
+  Bar,
+  Trend,
+  NumberInfo,
+  MiniSmoothArea
+} from '@/components'
 import { mixinDevice } from '@/utils/mixin'
 const barData = []
 const barData2 = []
@@ -232,7 +248,9 @@ for (let i = 0; i < 7; i++) {
 const searchUserData = []
 for (let i = 0; i < 7; i++) {
   searchUserData.push({
-    x: moment().add(i, 'days').format('YYYY-MM-DD'),
+    x: moment()
+      .add(i, 'days')
+      .format('YYYY-MM-DD'),
     y: Math.ceil(Math.random() * 10)
   })
 }
@@ -246,7 +264,8 @@ const searchUserScale = [
     alias: '用户数',
     min: 0,
     max: 10
-  }]
+  }
+]
 const searchTableColumns = [
   {
     dataIndex: 'MenuIndex.vue',
@@ -288,11 +307,13 @@ const sourceData = [
   { item: '母婴产品', count: 9 },
   { item: '其他', count: 7.8 }
 ]
-const pieScale = [{
+const pieScale = [
+  {
     dataKey: 'percent',
     min: 0,
     formatter: '.0%'
-}]
+  }
+]
 const dv = new DataSet.View().source(sourceData)
 dv.transform({
   type: 'percent',
@@ -371,9 +392,9 @@ export default {
 .dashboard-analysis-iconGroup {
   i {
     margin-left: 16px;
-      color: rgba(0,0,0,.45);
+    color: rgba(0, 0, 0, 0.45);
     cursor: pointer;
-      transition: color .32s;
+    transition: color 0.32s;
     color: black;
   }
 }