修改

src/views/currency.vue

@@ -114,13 +114,13 @@
         <el-table-column
           label="目标币当日波动量(比例)">
           <template slot-scope="scope">
-            <span>{{ scope.row.coin_wave }}{{scope.row.coin}}（{{scope.row.coin_wave_percent.slice(1)}}）≈¥{{Number(scope.row.coin_wave)*Number(scope.row.coin_wave_ticker)}}</span>
+            <span>{{ scope.row.coin_wave }}{{scope.row.coin}}（{{scope.row.coin_wave_percent.slice(1)}}）≈¥{{Number(scope.row.coin_wave_ticker)}}</span>
           </template>
         </el-table-column>
         <el-table-column
           label="基础币当日波动量(比例)">
           <template slot-scope="scope">
-            <span>{{ scope.row.base_wave }}{{scope.row.base}}（{{scope.row.base_wave_percent.slice(1)}}）≈¥{{Number(scope.row.base_wave)*Number(scope.row.base_wave_ticker)}}</span>
+            <span>{{ scope.row.base_wave }}{{scope.row.base}}（{{scope.row.base_wave_percent.slice(1)}}）≈¥{{Number(scope.row.base_wave_ticker)}}</span>
           </template>
         </el-table-column>
         <el-table-column

src/views/overview.vue

@@ -105,7 +105,17 @@
           </div>
         </div>
         <p class="robot-name">{{item.tag}}</p>
-        <p v-show="item.status==='normal'" class="type" :class="{'inside':environment=='inside'||'super','outside':environment=='outside'}">正在运行</p>
+        <p v-show="item.status==='normal'
+        &&item.base_status!=='abnormal'
+        &&item.coin_status!=='abnormal'
+        &&item.coin_wave_status !== 'abnormal'
+        &&item.base_wave_status !== 'abnormal'
+        " 
+        class="type" :class="{'inside':environment=='inside'||'super','outside':environment=='outside'}">正在运行</p>
+        <p v-show="item.status==='normal'
+        &&(item.base_status==='abnormal' ||item.coin_status==='abnormal' || item.coin_wave_status === 'abnormal'|| item.base_wave_status === 'abnormal')
+        " 
+        class="type" :class="{'inside':environment=='inside'||'super','outside':environment=='outside'}">运行异常</p>
         <p v-show="item.status==='stop'" class="type" :class="{'inside':environment=='inside'||'super','outside':environment=='outside'}">停止运行</p>
         <!-- <p class="robot-nameTwo">{{item.status}}</p> -->
         <div class="twoChart-box" >
@@ -113,14 +123,14 @@
           <p v-show="parseInt(permission_read[0])"  class="title">{{item.coin}}波动</p>
           <p v-show="parseInt(permission_read[0])"  class="data" :class="item.today_profit && item.today_profit.indexOf('-')!== -1 ? 'lose' : 'gain'">{{item.coin_wave_percent}}</p>
           <p v-show="parseInt(permission_read[0])"  class="dataTwo">{{item.coin_wave}}</p>
-          <p v-show="parseInt(permission_read[0])"  class="title">≈¥{{item.coin_wave*item.coin_ticker}}</p>
+          <p v-show="parseInt(permission_read[0])"  class="title">≈¥{{(item.coin_wave*item.coin_ticker).toFixed(2)}}</p>
 
         </div>
           <div class="chart-box">
           <p v-show="parseInt(permission_read[0])"  class="title">{{item.base}}波动</p>
           <p v-show="parseInt(permission_read[0])"  class="data" :class="item.today_profit && item.today_profit.indexOf('-')!== -1 ? 'lose' : 'gain'">{{item.base_wave_percent}}</p>
           <p v-show="parseInt(permission_read[0])"  class="dataTwo">{{item.base_wave}}</p>
-          <p v-show="parseInt(permission_read[0])"  class="title">≈¥{{item.base_wave*item.base_ticker}}</p>
+          <p v-show="parseInt(permission_read[0])"  class="title">≈¥{{(item.base_wave*item.base_ticker).toFixed(2)}}</p>
 
         </div>
         </div>
@@ -135,7 +145,7 @@
         <div class="coin" >
           <span>≈¥{{item.coin_ticker}}</span>
           <div class="sum">
-             <span>≈¥{{item.coin_amount*item.coin_ticker}}</span>
+             <span>≈¥{{(item.coin_amount*item.coin_ticker).toFixed(2)}}</span>
             <!-- <span>{{item.coin}}</span> -->
           </div>
         </div>
@@ -704,7 +714,9 @@
       border:1px solid rgba(146,208,171,1);
       .chart-box {
         background-color: rgba(166,216,186,0.3);
-        /* border: 3px solid #73C795; */
+        .data {
+          color: #4CAB73;
+        }
       }
       .type {
         text-align: center;
@@ -715,9 +727,10 @@
     &.stop {
       border:1px solid rgba(208,216,220,1);
       .chart-box {
-        /* border: 3px solid rgba(208,216,220,1); */
         background-color:rgba(199,217,225,0.3);
-
+        .data {
+          color: #798286;
+        }
       }
       .type {
         font-size: 14px;
@@ -728,8 +741,10 @@
     &.abnormal {
       border:1px solid rgba(217,120,120,1);
       .chart-box {
-        /* border: 3px solid rgba(217,120,120,1); */
         background-color:rgba(236,184,184,0.3);
+        .data {
+          color: #D97878;
+        }
       }
       .type {
         font-size: 14px;
@@ -793,15 +808,6 @@
       margin-top: 10px;
       font-size:24px;
       line-height:33px;
-      &.gain {
-        color:rgba(217,120,120,1);
-      }
-      &.lose {
-        color:rgba(76,171,115,1);
-      }
-      &.none {
-        color:rgba(208,216,220,1);
-      }
     }
     .dataTwo{
       margin:5px 0 5px 0 ;