Головна сторінка Огляд Довідка
Увійти
macq
/
fxc_desktop
1
0
Відгалуження 0
Файли Проблеми 0 Запити на злиття 0 Wiki
Переглянути джерело

11

lihao 4 роки тому
батько
34e3152755
коміт
9c53bf3c6e
26 змінених файлів з 265 додано та 188 видалено
Об'єднаний вигляд Показати статистику Diff
  1. 1 0
      public/index.html
  2. 20 20
      src/api/screen.js
  3. BIN
      src/assets/images/fxc_imgs00.png
  4. BIN
      src/assets/images/index_icon_1000.png
  5. BIN
      src/assets/images/index_icon_1010.png
  6. BIN
      src/assets/images/index_icon_1020.png
  7. BIN
      src/assets/images/index_icon_2000.png
  8. BIN
      src/assets/images/index_icon_2010.png
  9. BIN
      src/assets/images/index_icon_2020.png
  10. BIN
      src/assets/images/index_icon_3000.png
  11. BIN
      src/assets/images/index_icon_3010.png
  12. BIN
      src/assets/images/index_icon_3020.png
  13. BIN
      src/assets/images/index_icon_4000.png
  14. BIN
      src/assets/images/index_icon_4010.png
  15. BIN
      src/assets/images/index_icon_4020.png
  16. BIN
      src/assets/images/index_icon_5000.png
  17. BIN
      src/assets/images/index_icon_5010.png
  18. BIN
      src/assets/images/index_icon_5020.png
  19. 86 38
      src/components/bigData/index.vue
  20. 27 14
      src/components/fangxincha/barChart.vue
  21. 33 21
      src/components/fangxincha/huan2d.vue
  22. 58 49
      src/components/fangxincha/lineChart.vue
  23. 32 21
      src/components/fangxincha/map.vue
  24. 6 23
      src/components/signIn/SignIn.vue
  25. 1 1
      src/main.js
  26. 1 1
      src/utils/request.js

+ 1 - 0
public/index.html
Переглянути файл 

@@ -5,6 +5,7 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
     <title><%= htmlWebpackPlugin.options.title %></title>
 
     <title><%= htmlWebpackPlugin.options.title %></title>
 
   </head>
 
   </head>
 
   <body>
 
   <body>

+ 20 - 20
src/api/screen.js
Переглянути файл 

@@ -20,47 +20,47 @@ export function getFxcToken() {
 
     }
 
     }
 
   })
 
   })
 
 }
 
 }
 
+//获取冷链的温度监控数据
 
+export function getFxcChainTemperature(data) {
 
+  return request({
 
+    url: '/fxc/index/listChainTemperature',
 
+    method: 'post',
 
+    data,
 
+  })
 
+}
 
+//冷链详细信息查询
 
+export function getFxcChainInfo(data) {
 
+  return request({
 
+    url: '/fxc/index/getChainInfo',
 
+    method: 'post',
 
+    data,
 
+  })
 
+}
 
 //放芯查冷链位置查询
 
 //放芯查冷链位置查询
 
-export function getFxclistChainLocal(token) {
 
+export function getFxclistChainLocal() {
 
   return request({
 
   return request({
 
     url: '/fxc/index/listChainLocal',
 
     url: '/fxc/index/listChainLocal',
 
     method: 'post',
 
     method: 'post',
 
-    headers:{
 
-      isToken:false,
 
-      Authorization:'Bearer '+token
 
-    },
 
   })
 
   })
 
 }
 
 }
 
 //标签在不同产品中用量统计
 
 //标签在不同产品中用量统计
 
-export function getFxcProductChipState(token) {
 
+export function getFxcProductChipState() {
 
   return request({
 
   return request({
 
     url: '/fxc/index/productChipState',
 
     url: '/fxc/index/productChipState',
 
     method: 'post',
 
     method: 'post',
 
-    headers:{
 
-      isToken:false,
 
-      Authorization:'Bearer '+token
 
-    },
 
   })
 
   })
 
 }
 
 }
 
 //产品标签使用量总和统计
 
 //产品标签使用量总和统计
 
-export function getFxcProductTypeChipCount(token) {
 
+export function getFxcProductTypeChipCount() {
 
   return request({
 
   return request({
 
     url: '/fxc/index/productTypeChipCount',
 
     url: '/fxc/index/productTypeChipCount',
 
     method: 'post',
 
     method: 'post',
 
-    headers:{
 
-      isToken:false,
 
-      Authorization:'Bearer '+token
 
-    },
 
   })
 
   })
 
 }
 
 }
 
 //冷链运输状态查询,以及预警状态数量
 
 //冷链运输状态查询,以及预警状态数量
 
-export function getFxcChainStatus(token) {
 
+export function getFxcChainStatus() {
 
   return request({
 
   return request({
 
     url: '/fxc/index/getChainStatus',
 
     url: '/fxc/index/getChainStatus',
 
     method: 'post',
 
     method: 'post',
 
-    headers:{
 
-      isToken:false,
 
-      Authorization:'Bearer '+token
 
-    },
 
   })
 
   })
 
 }
 
 }

BIN
src/assets/images/fxc_imgs00.png
Переглянути файл


BIN
src/assets/images/index_icon_1000.png
Переглянути файл


BIN
src/assets/images/index_icon_1010.png
Переглянути файл


BIN
src/assets/images/index_icon_1020.png
Переглянути файл


BIN
src/assets/images/index_icon_2000.png
Переглянути файл


BIN
src/assets/images/index_icon_2010.png
Переглянути файл


BIN
src/assets/images/index_icon_2020.png
Переглянути файл


BIN
src/assets/images/index_icon_3000.png
Переглянути файл


BIN
src/assets/images/index_icon_3010.png
Переглянути файл


BIN
src/assets/images/index_icon_3020.png
Переглянути файл


BIN
src/assets/images/index_icon_4000.png
Переглянути файл


BIN
src/assets/images/index_icon_4010.png
Переглянути файл


BIN
src/assets/images/index_icon_4020.png
Переглянути файл


BIN
src/assets/images/index_icon_5000.png
Переглянути файл


BIN
src/assets/images/index_icon_5010.png
Переглянути файл


BIN
src/assets/images/index_icon_5020.png
Переглянути файл


+ 86 - 38
src/components/bigData/index.vue
Переглянути файл 

@@ -17,7 +17,7 @@
 
           <div class="fxc_top_num">
 
           <div class="fxc_top_num">
 
             <numCard v-for="(item,index) in ''+finished" :key="index" :num="item || 0" :color="'#EF4598'"></numCard>
 
             <numCard v-for="(item,index) in ''+finished" :key="index" :num="item || 0" :color="'#EF4598'"></numCard>
 
           </div>
 
           </div>
 
-          <div class="fxc_top_type">已结束(个)</div>
 
+          <div class="fxc_top_type">已出库(个)</div>
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
       <div class="fxc_top_item">
 
       <div class="fxc_top_item">
 
@@ -26,7 +26,7 @@
 
           <div class="fxc_top_num">
 
           <div class="fxc_top_num">
 
             <numCard v-for="(item,index) in ''+transit" :key="index" :num="item || 0" :color="'#F8B30E'"></numCard>
 
             <numCard v-for="(item,index) in ''+transit" :key="index" :num="item || 0" :color="'#F8B30E'"></numCard>
 
           </div>
 
           </div>
 
-          <div class="fxc_top_type">运输中(个)</div>
 
+          <div class="fxc_top_type">已入库(个)</div>
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
       <div class="fxc_top_item">
 
       <div class="fxc_top_item">
 
@@ -35,7 +35,7 @@
 
           <div class="fxc_top_num">
 
           <div class="fxc_top_num">
 
             <numCard v-for="(item,index) in ''+used" :key="index" :num="item || 0" :color="'#3E9DFF'"></numCard>
 
             <numCard v-for="(item,index) in ''+used" :key="index" :num="item || 0" :color="'#3E9DFF'"></numCard>
 
           </div>
 
           </div>
 
-          <div class="fxc_top_type">已使用(个)</div>
 
+          <div class="fxc_top_type">已结束(个)</div>
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
@@ -94,46 +94,47 @@
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
-    <div class="fxc_mid">
 
+    <div class="fxc_mid" @click="hideInfo">
 
       <div class="fxc_map">
 
       <div class="fxc_map">
 
-        <mapPage></mapPage>
 
+        <mapPage :markers="markers"></mapPage>
 
       </div>
 
       </div>
 
-      <div class="fxc_mid_con1">
 
+      <div class="fxc_mid_con1" v-if="markerInfo">
 
         <div class="fxc_win_icon1"></div>
 
         <div class="fxc_win_icon1"></div>
 
         <div class="fxc_win_icon2"></div>
 
         <div class="fxc_win_icon2"></div>
 
         <div class="fxc_win_icon3"></div>
 
         <div class="fxc_win_icon3"></div>
 
         <div class="fxc_win_icon4"></div>
 
         <div class="fxc_win_icon4"></div>
 
         <div class="fxc_mc1_txt">
 
         <div class="fxc_mc1_txt">
 
-          检测对象：货物<br>
 
-          当前温度：42℃<br>
 
-          最低温度：12℃<br>
 
-          检测状态：正常<br>
 
-          更新时间：2021-09-09 12:00
 
+          检测对象：{{markerInfo.name||"--"}}<br>
 
+          当前温度：{{markerInfo.lastTemperature||"--"}}℃<br>
 
+          最低温度：{{markerInfo.minTemperature||"--"}}℃<br>
 
+          检测状态：{{markerInfo.statusStr||"--"}}<br>
 
+          更新时间：{{markerInfo.updateTime||"--"}}
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
-      <div class="fxc_mid_con2">
 
+      <div class="fxc_mid_con2" v-if="chaintemp">
 
         <div class="fxc_win_icon1"></div>
 
         <div class="fxc_win_icon1"></div>
 
         <div class="fxc_win_icon2"></div>
 
         <div class="fxc_win_icon2"></div>
 
         <div class="fxc_win_icon3"></div>
 
         <div class="fxc_win_icon3"></div>
 
         <div class="fxc_win_icon4"></div>
 
         <div class="fxc_win_icon4"></div>
 
         <div class="fxc_mc2_con">
 
         <div class="fxc_mc2_con">
 
-          <lineChart></lineChart>
 
+          <lineChart :chaintemp="chaintemp"></lineChart>
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
     <div class="fxc_right1">
 
     <div class="fxc_right1">
 
       <div class="fxc_tit">储运状态</div>
 
       <div class="fxc_tit">储运状态</div>
 
       <div class="fxc_right1_con">
 
       <div class="fxc_right1_con">
 
-        <barChart></barChart>
 
+        <barChart :chipStates="chipStates"></barChart>
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
     <div class="fxc_right2">
 
     <div class="fxc_right2">
 
       <div class="fxc_tit">监测数量</div>
 
       <div class="fxc_tit">监测数量</div>
 
       <div class="fxc_right2_con">
 
       <div class="fxc_right2_con">
 
-        <huan2d :id="'huan2d1'" :value1="1220" :value2="1000" :value3="1200"></huan2d>
 
+        <huan2d :id="'huan2d1'" :chipCountData="chipCountData"></huan2d>
 
+        <!-- <huan2d :id="'huan2d1'" :chipCountData="chipCountData" :value1="1220" :value2="1000" :value3="1200"></huan2d> -->
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
-    <div class="no_login" @click="goLogin">
 
+    <div class="no_login" @click="goLogin" v-if="!token">
 
         <div>去登录</div>
 
         <div>去登录</div>
 
     </div>
 
     </div>
 
   </div>
 
   </div>
 
@@ -146,7 +147,7 @@ import Huan2d from "../../components/fangxincha/huan2d"//
 
 import MapPage from "../../components/fangxincha/map"//高德地图
 
 import MapPage from "../../components/fangxincha/map"//高德地图
 
 import LineChart from "../../components/fangxincha/lineChart"//
 
 import LineChart from "../../components/fangxincha/lineChart"//
 
 import BarChart from "../../components/fangxincha/barChart"//
 
 import BarChart from "../../components/fangxincha/barChart"//
 
-import { getFxcToken,getFxclistChainLocal,getFxcProductTypeChipCount,getFxcProductChipState,getFxcChainStatus } from '@/api/screen'
 
+import { getFxcToken,getFxclistChainLocal,getFxcProductTypeChipCount,getFxcProductChipState,getFxcChainStatus,getFxcChainInfo,getFxcChainTemperature } from '@/api/screen'
 
 export default({
 
 export default({
 
   name:"Shop",
 
   name:"Shop",
 
   components: {
 
   components: {
 
@@ -168,12 +169,27 @@ export default({
 
       normal:6780,
 
       normal:6780,
 
       warning:6780,
 
       warning:6780,
 
       error:6780,
 
       error:6780,
 
+      token:"",
 
+      markers:[],
 
+      markerInfo:"",
 
+      chaintemp:"",
 
+      chainStatus:{},
 
+      chipCountData:[],
 
+      chipStates:[],
 
     }
 
     }
 
   },
 
   },
 
   created () {
 
   created () {
 
-    this.changeNum()
 
+    this.token = localStorage.getItem("token");
 
+    if(this.token){
 
+      this.getListChainLocal()
 
+      this.getProductTypeChipCount()
 
+      this.getProductChipState()
 
+      this.getChainStatus()
 
+    }else{
 
+      this.changeNum()
 
+    }
 
     // this.randomNum()
 
     // this.randomNum()
 
-    this.getLoginToken()
 
+    // this.getLoginToken()
 
     // this.$store.dispatch("FxcLogin").then((res)=>{
 
     // this.$store.dispatch("FxcLogin").then((res)=>{
 
     //   var fxcToken = this.$store.getters.fxcToken
 
     //   var fxcToken = this.$store.getters.fxcToken
 
     //   this.getListChainLocal(fxcToken)
 
     //   this.getListChainLocal(fxcToken)
 
@@ -182,35 +198,67 @@ export default({
 
     // })
 
     // })
 
   },
 
   },
 
   methods: {
 
   methods: {
 
-    getLoginToken(){
 
-      getFxcToken().then(response => {
 
-        var fxcToken = response.token
 
-        this.getListChainLocal(fxcToken)
 
-        this.getProductTypeChipCount(fxcToken)
 
-        this.getProductChipState(fxcToken)
 
-        this.getChainStatus(fxcToken)
 
+    // getLoginToken(){
 
+    //   getFxcToken().then(response => {
 
+    //     var fxcToken = response.token
 
+    //     this.getListChainLocal(fxcToken)
 
+    //     this.getProductTypeChipCount(fxcToken)
 
+    //     this.getProductChipState(fxcToken)
 
+    //     this.getChainStatus(fxcToken)
 
+    //   });
 
+    // },
 
+    getListChainLocal(){
 
+      getFxclistChainLocal().then(response => {
 
+        this.markers = response.data
 
       });
 
       });
 
     },
 
     },
 
-    getListChainLocal(token){
 
-      getFxclistChainLocal(token).then(response => {
 
-        
+    getProductChipState(){
 
+      getFxcProductChipState().then(response => {
 
+        this.chipStates = response.data
 
       });
 
       });
 
     },
 
     },
 
-    getProductChipState(token){
 
-      getFxcProductChipState(token).then(response => {
 
-        
+    getProductTypeChipCount(){
 
+      getFxcProductTypeChipCount().then(response => {
 
+        var data = response.data
 
+        var list = []
 
+        for(var i in data){
 
+          list[i] = []
 
+          list[i][0] = data[i].productTypeName
 
+          list[i][1] = data[i].num
 
+        }
 
+        this.chipCountData = list
 
       });
 
       });
 
     },
 
     },
 
-    getProductTypeChipCount(token){
 
-      getFxcProductTypeChipCount(token).then(response => {
 
-        
+    getChainStatus(){
 
+      getFxcChainStatus().then(response => {
 
+        var data = response.data
 
+        this.produced = data.total
 
+        this.finished = data.inTrans
 
+        this.transit = data.inStore
 
+        this.used = data.inEnd
 
+        this.normal = data.temperatureDTO.normal
 
+        this.warning = data.temperatureDTO.warning
 
+        this.error = data.temperatureDTO.alarm
 
+
 
       });
 
       });
 
     },
 
     },
 
-    getChainStatus(token){
 
-      getFxcChainStatus(token).then(response => {
 
-        
+    getChainInfo(id){
 
+      getFxcChainInfo({id}).then(response => {
 
+        var data = response.data
 
+        data.status && (data.statusStr = {"00": "已入库", "10": "已出库", "20": "已结束"}[data.status])
 
+        this.markerInfo = data
 
       });
 
       });
 
     },
 
     },
 
+    getChainTemperature(id){
 
+      getFxcChainTemperature({id}).then(response => {
 
+        var data = response.data
 
+        this.chaintemp = data.length && data
 
+      });
 
+    },
 
+    hideInfo(){
 
+      this.markerInfo = null
 
+      this.chaintemp = null
 
+    },
 
     changeNum(){
 
     changeNum(){
 
       const that = this
 
       const that = this
 
       var list = that.attrs
 
       var list = that.attrs

+ 27 - 14
src/components/fangxincha/barChart.vue
Переглянути файл 

@@ -5,18 +5,22 @@
 
 import { getEvvmChipStatus2 } from '@/api/screen'
 
 import { getEvvmChipStatus2 } from '@/api/screen'
 
 export default {
 
 export default {
 
   name: 'barChart',
 
   name: 'barChart',
 
+  props: {
 
+    chipStates: Array
 
+  },
 
   methods:{
 
   methods:{
 
-    getData(){
 
-      getEvvmChipStatus2().then(response => {
 
-        var data = response.data
 
-        var option = this.option
 
-        option.series[0].data[0].value = data.used
 
-        option.series[0].data[1].value = data.act
 
-        option.series[0].data[2].value = data.noAct
 
-        this.myChart.setOption(option);
 
-      });
 
-    },
 
+    // getData(){
 
+    //   getEvvmChipStatus2().then(response => {
 
+    //     var data = response.data
 
+    //     var option = this.option
 
+    //     option.series[0].data[0].value = data.used
 
+    //     option.series[0].data[1].value = data.act
 
+    //     option.series[0].data[2].value = data.noAct
 
+    //     this.myChart.setOption(option);
 
+    //   });
 
+    // },
 
 	  myEcharts(){
 
 	  myEcharts(){
 
+      var chipStates = this.chipStates
 
 		  this.myChart = this.echarts.init(document.getElementById('barchartCon'));
 
 		  this.myChart = this.echarts.init(document.getElementById('barchartCon'));
 
 		  this.option = {
 
 		  this.option = {
 
         color:["#3E9DFF","#EE9C17","#E82A30"],
 
         color:["#3E9DFF","#EE9C17","#E82A30"],
 
@@ -45,7 +49,7 @@ export default {
 
 			  },
 
 			  },
 
         xAxis: {
 
         xAxis: {
 
             type: 'category',
 
             type: 'category',
 
-            data: [ '2016', '2017', '2018', '2019', '2020', '2021'],
 
+            data: chipStates.map(o=>o.productTypeName),//[ '2016', '2017', '2018', '2019', '2020', '2021'],
 
             axisLine:{
 
             axisLine:{
 
               lineStyle:{
 
               lineStyle:{
 
                 color:"#0E61B6",
 
                 color:"#0E61B6",
 
@@ -94,17 +98,26 @@ export default {
 
           {
 
           {
 
             name: '全程温控',
 
             name: '全程温控',
 
             type: 'bar',
 
             type: 'bar',
 
-            data: [120, 132, 101, 134, 90, 230, 210]
 
+            barMaxWidth:15,
 
+            barMinWidth :10,
 
+            barMinHeight :5,
 
+            data: chipStates.map(o=>o.state10),//[120, 132, 101, 134, 90, 230, 210]
 
           },
 
           },
 
           {
 
           {
 
             name: '实时温控',
 
             name: '实时温控',
 
             type: 'bar',
 
             type: 'bar',
 
-            data: [120, 132, 101, 134, 90, 230, 210]
 
+            barMaxWidth:15,
 
+            barMinWidth :10,
 
+            barMinHeight :5,
 
+            data:  chipStates.map(o=>o.state11),//[120, 132, 101, 134, 90, 230, 210]
 
           },
 
           },
 
           {
 
           {
 
             name: '追溯标签',
 
             name: '追溯标签',
 
             type: 'bar',
 
             type: 'bar',
 
-            data: [120, 132, 101, 134, 90, 230, 210]
 
+            barMaxWidth:15,
 
+            barMinWidth :10,
 
+            barMinHeight :5,
 
+            data:  chipStates.map(o=>o.state20),//[120, 132, 101, 134, 90, 230, 210]
 
           },
 
           },
 
         ]
 
         ]
 
 		  };
 
 		  };

+ 33 - 21
src/components/fangxincha/huan2d.vue
Переглянути файл 

@@ -12,14 +12,17 @@
 
         type:String,
 
         type:String,
 
         required:true
 
         required:true
 
       },
 
       },
 
-      value1:{
 
-        default:1,
 
-      },
 
-      value2:{
 
-        default:1,
 
-      },
 
-      value3:{
 
-        default:1,
 
+      // value1:{
 
+      //   default:1,
 
+      // },
 
+      // value2:{
 
+      //   default:1,
 
+      // },
 
+      // value3:{
 
+      //   default:1,
 
+      // },
 
+      chipCountData:{
 
+        default:[],
 
       },
 
       },
 
     },
 
     },
 
     data() {
 
     data() {
 
@@ -31,13 +34,16 @@
 
       this.moreChart();
 
       this.moreChart();
 
     },
 
     },
 
     watch: {
 
     watch: {
 
-      value1(){
 
-        this.updataChart()
 
-      },
 
-      value2(){
 
-        this.updataChart()
 
-      },
 
-      value3(){
 
+      // value1(){
 
+      //   this.updataChart()
 
+      // },
 
+      // value2(){
 
+      //   this.updataChart()
 
+      // },
 
+      // value3(){
 
+      //   this.updataChart()
 
+      // },
 
+      chipCountData(){
 
         this.updataChart()
 
         this.updataChart()
 
       },
 
       },
 
     },
 
     },
 
@@ -45,14 +51,18 @@
 
       updataChart(){
 
       updataChart(){
 
         const that = this
 
         const that = this
 
         this.chart.series[0].update({
 
         this.chart.series[0].update({
 
-          data:[
 
-            ['科兴',that.value1],
 
-            ['康希诺',that.value2],
 
-            ['生物',that.value3],
 
-          ]
 
+          data:that.chipCountData
 
         })
 
         })
 
+        // this.chart.series[0].update({
 
+        //   data:[
 
+        //     ['科兴',that.value1],
 
+        //     ['康希诺',that.value2],
 
+        //     ['生物',that.value3],
 
+        //   ]
 
+        // })
 
       },
 
       },
 
       moreChart() {
 
       moreChart() {
 
+        var chipCountData = this.chipCountData
 
         const that = this
 
         const that = this
 
         if (this.chart) {
 
         if (this.chart) {
 
           this.chart.destroy();
 
           this.chart.destroy();
 
@@ -109,7 +119,9 @@
 
             innerSize: '60%',
 
             innerSize: '60%',
 
             center:["50%","50%"],
 
             center:["50%","50%"],
 
             // center:["40%","50%"],
 
             // center:["40%","50%"],
 
-            data: [
 
+            data: 
+            // chipCountData,
 
+            [
 
               ['科兴',that.value1],
 
               ['科兴',that.value1],
 
               ['康希诺',that.value2],
 
               ['康希诺',that.value2],
 
               ['生物',that.value3],
 
               ['生物',that.value3],

+ 58 - 49
src/components/fangxincha/lineChart.vue
Переглянути файл 

@@ -2,21 +2,30 @@
 
   <div class="chart_con" id="lineChartCon"></div>
 
   <div class="chart_con" id="lineChartCon"></div>
 
 </template>
 
 </template>
 
 <script>
 
 <script>
 
-import { getEvvmChipStatus2 } from '@/api/screen'
 
+// import { getEvvmChipStatus2 } from '@/api/screen'
 
 export default {
 
 export default {
 
   name: 'lineChart',
 
   name: 'lineChart',
 
+  data(){
 
+    return{
 
+      list:[]
 
+    }
 
+  },
 
+  props: {
 
+    chaintemp: Array
 
+  },
 
   methods:{
 
   methods:{
 
-    getData(){
 
-      getEvvmChipStatus2().then(response => {
 
-        var data = response.data
 
-        var option = this.option
 
-        option.series[0].data[0].value = data.used
 
-        option.series[0].data[1].value = data.act
 
-        option.series[0].data[2].value = data.noAct
 
-        this.myChart.setOption(option);
 
-      });
 
-    },
 
+    // getData(){
 
+    //   getEvvmChipStatus2().then(response => {
 
+    //     var data = response.data
 
+    //     var option = this.option
 
+    //     option.series[0].data[0].value = data.used
 
+    //     option.series[0].data[1].value = data.act
 
+    //     option.series[0].data[2].value = data.noAct
 
+    //     this.myChart.setOption(option);
 
+    //   });
 
+    // },
 
 	  myEcharts(){
 
 	  myEcharts(){
 
+      var list = this.chaintemp
 
 		  this.myChart = this.echarts.init(document.getElementById('lineChartCon'));
 
 		  this.myChart = this.echarts.init(document.getElementById('lineChartCon'));
 
 		  this.option = {
 
 		  this.option = {
 
         color:["#23D9E9","#EE9C17","#E82A30"],
 
         color:["#23D9E9","#EE9C17","#E82A30"],
 
@@ -46,7 +55,7 @@ export default {
 
         xAxis: {
 
         xAxis: {
 
             type: 'category',
 
             type: 'category',
 
             boundaryGap: false,
 
             boundaryGap: false,
 
-            data: ['2015', '2016', '2017', '2018', '2019', '2020', '2021'],
 
+            data: list.map(o=>o.createTime),//['2015', '2016', '2017', '2018', '2019', '2020', '2021'],
 
             axisLine:{
 
             axisLine:{
 
               lineStyle:{
 
               lineStyle:{
 
                 color:"#0E61B6",
 
                 color:"#0E61B6",
 
@@ -88,8 +97,8 @@ export default {
 
                 opacity:0.2,
 
                 opacity:0.2,
 
               }
 
               }
 
             },
 
             },
 
-            animationDuration: 300,
 
-            animationDurationUpdate: 300,
 
+            animationDuration: 100,
 
+            animationDurationUpdate: 100,
 
         },
 
         },
 
 			  series: [
 
 			  series: [
 
           {
 
           {
 
@@ -106,43 +115,43 @@ export default {
 
             emphasis: {
 
             emphasis: {
 
                 focus: 'series'
 
                 focus: 'series'
 
             },
 
             },
 
-            data: [120, 132, 101, 134, 90, 230, 210],
 
-            animationDuration: 5000,
 
-          },
 
-          {
 
-            name: '预警',
 
-            type: 'line',
 
-            stack: '总量',
 
-            smooth: true,
 
-            areaStyle: {
 
-              opacity:0.3,
 
-            },
 
-            lineStyle : {
 
-              width:1,
 
-            },
 
-            emphasis: {
 
-                focus: 'series'
 
-            },
 
-            data: [120, 132, 101, 134, 90, 230, 210],
 
-            animationDuration: 5000,
 
-          },
 
-          {
 
-            name: '报警',
 
-            type: 'line',
 
-            smooth: true,
 
-            stack: '总量',
 
-            areaStyle: {
 
-              opacity:0.3,
 
-            },
 
-            lineStyle : {
 
-              width:1,
 
-            },
 
-            emphasis: {
 
-                focus: 'series'
 
-            },
 
-            data: [120, 132, 101, 134, 90, 230, 210],
 
+            data: list.map(o=>o.temp),//[120, 132, 101, 134, 90, 230, 210],
 
             animationDuration: 5000,
 
             animationDuration: 5000,
 
           },
 
           },
 
+          // {
 
+          //   name: '预警',
 
+          //   type: 'line',
 
+          //   stack: '总量',
 
+          //   smooth: true,
 
+          //   areaStyle: {
 
+          //     opacity:0.3,
 
+          //   },
 
+          //   lineStyle : {
 
+          //     width:1,
 
+          //   },
 
+          //   emphasis: {
 
+          //       focus: 'series'
 
+          //   },
 
+          //   data: [120, 132, 101, 134, 90, 230, 210],
 
+          //   animationDuration: 5000,
 
+          // },
 
+          // {
 
+          //   name: '报警',
 
+          //   type: 'line',
 
+          //   smooth: true,
 
+          //   stack: '总量',
 
+          //   areaStyle: {
 
+          //     opacity:0.3,
 
+          //   },
 
+          //   lineStyle : {
 
+          //     width:1,
 
+          //   },
 
+          //   emphasis: {
 
+          //       focus: 'series'
 
+          //   },
 
+          //   data: [120, 132, 101, 134, 90, 230, 210],
 
+          //   animationDuration: 5000,
 
+          // },
 
         ]
 
         ]
 
 		  };
 
 		  };
 
       //this.getData();
 
       //this.getData();

+ 32 - 21
src/components/fangxincha/map.vue
Переглянути файл 

@@ -7,13 +7,24 @@
 
   import icon2 from '@/assets/images/fxc_img7.png'
 
   import icon2 from '@/assets/images/fxc_img7.png'
 
   import icon3 from '@/assets/images/fxc_img8.png'
 
   import icon3 from '@/assets/images/fxc_img8.png'
 
   import { getEvvmListOffice } from '@/api/screen'
 
   import { getEvvmListOffice } from '@/api/screen'
 
+  
   export default({
 
   export default({
 
     name:"MapPage",
 
     name:"MapPage",
 
+    props: {
 
+      markers: Array
 
+    },
 
     data () {
 
     data () {
 
       return {
 
       return {
 
-        
+        list:[],
 
       }
 
       }
 
     },
 
     },
 
+    watch: {
 
+      markers(nv,ov){
 
+        var list = nv
 
+        this.list = list
 
+        this.setMarkers(list)
 
+      },
 
+    },
 
     async mounted () {
 
     async mounted () {
 
       var MapKey = this.MapKey
 
       var MapKey = this.MapKey
 
       // 已载入高德地图API，则直接初始化地图
 
       // 已载入高德地图API，则直接初始化地图
 
@@ -28,11 +39,15 @@
 
       }
 
       }
 
     },
 
     },
 
     methods: {
 
     methods: {
 
-      getList(){
 
-        getEvvmListOffice().then(response => {
 
-          var list = response.data
 
-          this.setMarkers(list)
 
-        });
 
+      // getList(){
 
+      //   getEvvmListOffice().then(response => {
 
+      //     var list = response.data
 
+      //     this.setMarkers(list)
 
+      //   });
 
+      // },
 
+      getInfo(id){
 
+        this.$parent.getChainInfo(id)
 
+        this.$parent.getChainTemperature(id)
 
       },
 
       },
 
       initMap () {
 
       initMap () {
 
         let AMap = this.AMap = window.AMap
 
         let AMap = this.AMap = window.AMap
 
@@ -52,35 +67,31 @@
 
         ], function(){
 
         ], function(){
 
           map.addControl(new AMap.ControlBar());
 
           map.addControl(new AMap.ControlBar());
 
         })
 
         })
 
-        this.getList()
 
+        // this.getList()
 
       },
 
       },
 
       setMarkers(list){
 
       setMarkers(list){
 
+        var that = this
 
         this.map.clearMap()// 清除地图上所有添加的覆盖物
 
         this.map.clearMap()// 清除地图上所有添加的覆盖物
 
         var markers = []
 
         var markers = []
 
         for(var i in list){
 
         for(var i in list){
 
-          if(list[i].longitude && list[i].latitude){
 
+          if(list[i].lng && list[i].lat){
 
             let marker = new AMap.Marker({
 
             let marker = new AMap.Marker({
 
-              position: new AMap.LngLat(list[i].longitude,list[i].latitude),  
+              position: new AMap.LngLat(list[i].lng,list[i].lat),  
               //title: list[i].NAME + '<br>' + list[i].address,
 
               //title: list[i].NAME + '<br>' + list[i].address,
 
               //offset: new AMap.Pixel(-20,43),//偏移量，默认以marker左上角位置为基准点
 
               //offset: new AMap.Pixel(-20,43),//偏移量，默认以marker左上角位置为基准点
 
               icon:new AMap.Icon({
 
               icon:new AMap.Icon({
 
-                  size: new AMap.Size(25,25),    // 图标尺寸
 
-                  image: [icon1,icon2,icon3][list[i].type],  // Icon的图像
 
+                  size: new AMap.Size(45,45),    // 图标尺寸
 
+                  image: require('@/assets/images/index_icon_'+list[i].transportType+list[i].status+'.png'),//[icon1,icon2,icon3][list[i].type],  // Icon的图像
 
                   // imageOffset: new AMap.Pixel(0, -60),  // 图像相对展示区域的偏移量，适于雪碧图等
 
                   // imageOffset: new AMap.Pixel(0, -60),  // 图像相对展示区域的偏移量，适于雪碧图等
 
-                  imageSize: new AMap.Size(25, 25)   // 根据所设置的大小拉伸或压缩图片
 
+                  imageSize: new AMap.Size(45, 45)   // 根据所设置的大小拉伸或压缩图片
 
               }),
 
               }),
 
               clickable:true,
 
               clickable:true,
 
               extData:list[i],
 
               extData:list[i],
 
             });
 
             });
 
-            marker.on("mouseover",function(e){
 
-              var extData = this.Ce.extData
 
-              this.setLabel({
 
-                content:extData.NAME + '<br>' + extData.address,
 
-                direction:'top'
 
-              })
 
-            })
 
-            marker.on("mouseout",function(e){
 
-              this.setLabel(null)
 
+            marker.on("click",function(e){
 
+              var extData = e.target.De.extData
 
+              var id = extData.id
 
+              that.getInfo(id)
 
             })
 
             })
 
             markers.push(marker)
 
             markers.push(marker)
 
           }
 
           }

+ 6 - 23
src/components/signIn/SignIn.vue
Переглянути файл 

@@ -187,36 +187,16 @@ export default {
 
     },
 
     },
 
   },
 
   },
 
   mounted() {
 
   mounted() {
 
-    console.log(6)
 
-    this.$message('这是一条消息提示');
 
     // 获取图片验证码
 
     // 获取图片验证码
 
     this.createCode();
 
     this.createCode();
 
-    // 判断初始化时cookies时有效的
 
-    // let telephone = this.$cookies.get("telephone");
 
-    // let password = this.$cookies.get("password");
 
-    // if (telephone != "" && this.$cookies.get("remPassword") == "true") {
 
-    //   this.ruleForm.telephone = telephone;
 
-    //   this.ruleForm.password = password;
 
-    //   this.ruleForm.checked = true;
 
-    //   this.ruleForm.randYZM = this.ruleForm.imageCode;
 
-    //   this.submitForm("ruleForm"); // 执行登录
 
-    // } else {
 
-    //   this.ruleForm.telephone = "";
 
-    //   this.ruleForm.password = "";
 
-    //   this.ruleForm.randYZM = "";
 
-    //   //this.ruleForm.telephone = '13682152685';
 
-    //   //this.ruleForm.password = '123456';
 
-    //   this.ruleForm.checked = false;
 
-    // }
 
-    // window.addEventListener('pywebviewready',function(){
 
-      
-    // },)
 
   },
 
   },
 
 };
 
 };
 
 </script>
 
 </script>
 
 
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 
 <style>
 
 <style>
 
+.contentChild .el-row{ position: static; width: 100%; max-width: 800px;}
 
+.contentChild .el-input__inner{ background: transparent; border: 1px solid #3591FF; color: #ffffff;}
 
 .bgStyle{ position: absolute; top: 0; left: 0; width: 100%; height: 100%; overflow: hidden; background: url(../../assets/images/opt_bg.png); background-size: 100% 100%; }
 
 .bgStyle{ position: absolute; top: 0; left: 0; width: 100%; height: 100%; overflow: hidden; background: url(../../assets/images/opt_bg.png); background-size: 100% 100%; }
 
 .title{ position: absolute; top: 0; left: 0; width: 100%; height: 11vh; line-height: 11vh; color: #53A0FF; font-size:2vw; text-align: center;font-weight: bold;
 
 .title{ position: absolute; top: 0; left: 0; width: 100%; height: 11vh; line-height: 11vh; color: #53A0FF; font-size:2vw; text-align: center;font-weight: bold;
 
 background-image:-webkit-linear-gradient(bottom,#53A0FF,#ffffff);-webkit-background-clip:text;background-clip: text;-webkit-text-fill-color:transparent;
 
 background-image:-webkit-linear-gradient(bottom,#53A0FF,#ffffff);-webkit-background-clip:text;background-clip: text;-webkit-text-fill-color:transparent;
 
@@ -227,7 +207,10 @@ background-image:-webkit-linear-gradient(bottom,#53A0FF,#ffffff);-webkit-backgro
 
   border: 1px solid #3591FF;
 
   border: 1px solid #3591FF;
 
   box-shadow: 0px 0px 38px 2px rgba(48, 137, 243, 0.7) inset;
 
   box-shadow: 0px 0px 38px 2px rgba(48, 137, 243, 0.7) inset;
 
   width: 50vw; height:60vh;
 
   width: 50vw; height:60vh;
 
-  position: absolute; top:50%; left: 50%; margin: -25vh -25vw;
 
+  position: fixed; top:50%; left: 50%; margin: -25vh -25vw;
 
+  padding: 10px; box-sizing: border-box; 
+  display: flex; justify-content: center; align-items: center;
 
+
 
 }
 
 }
 
 .contentChild h2{
 
 .contentChild h2{
 
    background: url(../../assets/images/cardTit.png); background-size: 100% 100%;
 
    background: url(../../assets/images/cardTit.png); background-size: 100% 100%;

+ 1 - 1
src/main.js
Переглянути файл 

@@ -1,7 +1,7 @@
 
 import Vue from 'vue';
 
 import Vue from 'vue';
 
 import App from './App.vue';
 
 import App from './App.vue';
 
 import Element from 'element-ui';
 
 import Element from 'element-ui';
 
-import 'element-ui/lib/theme-chalk/index.css';
 
+import 'element-ui/lib/theme-chalk/index.css'
 
 import './assets/style/global.css';
 
 import './assets/style/global.css';
 
 Vue.config.productionTip = false
 
 Vue.config.productionTip = false
 
 import router from "./router";
 
 import router from "./router";

+ 1 - 1
src/utils/request.js
Переглянути файл 

@@ -22,7 +22,7 @@ const service = axios.create({
 
 service.interceptors.request.use(config => {
 
 service.interceptors.request.use(config => {
 
   // 是否需要设置 token
 
   // 是否需要设置 token
 
   const isToken = (config.headers || {}).isToken === false
 
   const isToken = (config.headers || {}).isToken === false
 
-  var myToken = localStorage.getItem("myToken")
 
+  var myToken = localStorage.getItem("token")
 
   if (!isToken && myToken) {
 
   if (!isToken && myToken) {
 
     config.headers['Authorization'] = 'Bearer ' + myToken// 让每个请求携带自定义token 请根据实际情况自行修改
 
     config.headers['Authorization'] = 'Bearer ' + myToken// 让每个请求携带自定义token 请根据实际情况自行修改
 
   }
 
   }