浏览代码

生物安防

xsh 3 年之前
父节点
当前提交
e9d3367820
共有 4 个文件被更改,包括 8 次插入9 次删除
  1. 4 4
      src/views/Home/Home.vue
  2. 0 1
      src/views/Monit/Monit.vue
  3. 3 3
      src/views/Zoology/Zoology.vue
  4. 1 1
      src/views/Zoology/charts/ChartLine.vue

+ 4 - 4
src/views/Home/Home.vue

@@ -158,10 +158,10 @@
           </div>
         </div>
         <div class="case-center">
-          <div class="case-title">下月预计可出栏</div>
+          <div class="case-title">本月卖猪</div>
           <div class="case-content">
             <div class="case-two">
-              <span><strong class="sign">2354</strong>头</span>
+              <span><strong class="sign">{{pro.quantity ? pro.quantity : '设备暂无数据'}}</strong>{{pro.quantity ? '头' : ''}}</span>
             </div>
           </div>
         </div>
@@ -169,7 +169,7 @@
           <div class="case-title">本月累计销售额度</div>
           <div class="case-content">
             <div class="case-two">
-              <span><strong class="sign">{{pro.money ? pro.money : '设备暂无数据'}}</strong>{{pro.money ? '元' : ''}}</span>
+              <span><strong class="sign">{{pro.money ? (Math.floor(Number(pro.money) * 100) / 100).toLocaleString() : '设备暂无数据'}}</strong>{{pro.money ? '元' : ''}}</span>
             </div>
           </div>
         </div>
@@ -195,7 +195,7 @@
           <div class="case-title">流量</div>
           <div class="case-content">
             <div class="case-two">
-              <span><strong class="sign">{{envList.liu ?  envList.liu : '设备暂无数据'}}</strong>{{envList.liu ?  'T' : ''}}</span>
+              <span><strong class="sign">{{envList.liu ?  envList.liu : '设备暂无数据'}}</strong>{{envList.liu ?  'L/s' : ''}}</span>
             </div>
           </div>
         </div>

+ 0 - 1
src/views/Monit/Monit.vue

@@ -10,7 +10,6 @@
           :props="{value: 'id', label: 'cameraName', children: 'cameraList', expandTrigger: 'hover', disabled: 'runStatus'}"
           :show-all-levels="false"></el-cascader>
       </div>
-
       <iframe v-if="isVideo" :src="'static/jinm/index.html?'+'1'+','+ cameraOne +','+ cameraTwo + ',' +'100%' + ',' + '0'" style="width: 100%; height: 100%;" frameborder="0"  allowfullscreen="true"></iframe>
     </div>
     <div class="monit-right">

+ 3 - 3
src/views/Zoology/Zoology.vue

@@ -144,19 +144,19 @@ export default {
       swiperData: [],
       waterDates: [], // 用水量模拟
       waterData: { // 左中 —— 模拟数据
-        xAxisName: '',
+        xAxisName: '水量',
         xAxisData: ['07-01', '07-02', '07-03', '07-04', '07-05'],
         yAxisName: '吨',
         yAxisData: [37.1, 37.4, 36.8, 37.9, 34.2]
       },
       tempData: {
-        xAxisName: '',
+        xAxisName: '温度',
         xAxisData: [],
         yAxisName: '℃',
         yAxisData: [],
       },
       rhData: {
-        xAxisName: '',
+        xAxisName: '湿度',
         xAxisData: [],
         yAxisName: 'RH',
         yAxisData: [],

+ 1 - 1
src/views/Zoology/charts/ChartLine.vue

@@ -101,7 +101,7 @@ export default {
         //],
         series: [
           {
-            name: this.data.yAxisName,
+            name: this.data.xAxisName,
             type: 'line',
             smooth: false,
             data: this.data.yAxisData,