dist/css/app.a251cddd.css

@@ -0,0 +1 @@
+*{margin:0;padding:0}#app{height:100%}#app,body,html{height:100%}#app,body,html,ul{padding:0;margin:0}li{list-style:none}

dist/css/app.d6c22f52.css

@@ -1 +0,0 @@
-*{margin:0;padding:0}#app{height:100%}

package.json

@@ -25,7 +25,8 @@
     "@vue/cli-plugin-router": "~4.5.0",
     "@vue/cli-plugin-vuex": "~4.5.0",
     "@vue/cli-service": "~4.5.0",
-    "vue-template-compiler": "^2.6.11"
+    "vue-template-compiler": "^2.6.11",
+    "webpack-cli": "^4.7.2"
   },
   "browserslist": [
     "> 1%",

src/assets/css/global.css

@@ -0,0 +1,13 @@
+/* 全局样式 */ 
+html,body,#app{
+    height: 100%;
+    padding: 0;
+    margin: 0;
+}
+ul{
+   margin: 0px;
+    padding: 0px;
+}
+li{
+    list-style: none;
+}

src/components/zdh/plcdata.vue

@@ -0,0 +1,121 @@
+<template>
+  <div>
+    <div class="content" v-for="item in data">
+      <div class="top">
+        <div class="left">{{ item.run.tag_name }}</div>
+        <div class="right">运行</div>
+      </div>
+      <div class="data">
+        <ul>
+          <li v-for="list in item.list">
+            <div class="title">{{ list.tag_name }}</div>
+            <div class="num">
+              {{ list.tag_value.substring(0, list.tag_value.indexOf(".") + 3) }}
+            </div>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "plcdata",
+  data() {
+    return {
+      data: "",
+    };
+  },
+  methods: {
+    async getData() {
+      const { data: res } = await this.$http.post(
+        "http://nmjt.nxjiewei.com:8011/api/automate/mine_ventilate/get_list",
+        { mine_id: "zaoquan" }
+      );
+      console.log(res.content.data);
+      this.data = res.content.data;
+    },
+  },
+  mounted() {
+    this.getData();
+    this.infos = setInterval(this.getData, 5000);
+  },
+  beforeDestroy() {
+    clearInterval(this.infos);
+  },
+};
+</script>
+
+<style scoped>
+.content {
+  font-weight: 400;
+  background-color: #ffffff;
+  box-shadow: 0px 0px 40px 0px rgba(0, 0, 0, 0.14);
+  border-radius: 5px;
+  margin: 5px;
+  background-color: #2873ff;
+}
+.top {
+  background-color: #ffffff;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  /* padding: 10px; */
+  height: 33px;
+  margin-left: 5px;
+  border-bottom: 1px #f3f3f3 solid;
+  padding: 10px;
+}
+/* span{
+        background-color: #2873FF;
+        width: 9px;
+        height: 33px;
+
+    } */
+.left {
+  height: 33px;
+  line-height: 33px;
+  /* margin-left: 10px; */
+}
+.right {
+  width: 33px;
+  height: 20px;
+  background-color: #27ae60;
+  border-radius: 2px;
+  color: #ffffff;
+  text-align: center;
+  font-size: 10px;
+  line-height: 14px;
+  font-weight: 400;
+  padding-top: 4px;
+}
+.data {
+  background-color: #ffffff;
+  padding: 0 10px;
+}
+/* ul{
+        
+    } */
+li {
+  /* margin-right: 5%; */
+  /* float: left; */
+  height: 39px;
+  /* line-height: 39px; */
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px 0px;
+  border-bottom: 1px #f3f3f3 solid;
+}
+li div {
+  height: 17px;
+  padding-bottom: 3px;
+}
+.num {
+  width: 80px;
+  text-align: center;
+  background-color: #2873ff;
+  color: #fff;
+}
+</style>

src/components/zdh/topimg.vue

@@ -0,0 +1,105 @@
+<template>
+  <div class="img">
+    <img src="../../assets/images/tongfeng.png" alt="">
+    <h1>通风系统</h1>
+    <p>{{   nowTime }}</p>
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {
+         src: '../../assets/images/tongfeng.png',
+          nowTime:''
+      }
+    },
+    
+     mounted() {
+       setInterval(this.getNowFormatDate, 1000);
+    },
+    beforeDestroy() {
+      if(this.timeId){
+ 
+
+               clearInterval(this.getNowFormatDate);
+ 
+
+           }
+    },
+    methods: {
+      
+      getNowFormatDate() {
+      var now = new Date();
+      var year = now.getFullYear(); //获取年份
+      var month = now.getMonth(); //获取月份
+      var date = now.getDate(); //获取日期
+      var day = now.getDay(); //获取星期
+      var hour = now.getHours(); //获取小时
+      var minute = now.getMinutes(); //获取分钟
+      // if(minute.length<=1){
+      //   minute="0"+minute;
+      // }
+      // console.log(minute.length);
+      var seconds =
+        now.getSeconds() < 10 ? "0" + now.getSeconds() : now.getSeconds(); //获取秒
+      month = month + 1;
+      var arr_week = new Array(
+        "星期日",
+        "星期一",
+        "星期二",
+        "星期三",
+        "星期四",
+        "星期五",
+        "星期六"
+      );
+      var week = arr_week[day];
+      var time =
+        year +
+        "年" +
+        month +
+        "月" +
+        date +
+        "日 " +
+        week +
+        " " +
+        hour +
+        ":" +
+        minute +
+        ":" +
+        seconds;
+      this.nowTime= time;
+    },
+  },
+};
+   
+</script>
+
+<style  scoped>
+  .img{
+    height: 180px;
+    position: relative;
+  }
+  img{
+    width: 100%;
+    height: 100%;
+  }
+  h1{
+    color: #FFFFFF;
+    position: absolute;
+    top: 5px;
+    left: 50%;
+    transform: translate(-50%);
+    text-shadow: 5px 5px 4px #0E0E0E;
+    font-size: 30px;
+    margin: 0;
+  }
+  p{
+    position: absolute;
+    right: 5px;
+    /* left: 10px; */
+    color: #FFFFFF;
+    bottom: 0px;
+    margin: 0px;
+  }
+</style>

src/main.js

@@ -2,6 +2,10 @@ import Vue from 'vue'
 import App from './App.vue'
 import router from './router'
 import store from './store'
+<<<<<<< HEAD
+import './assets/css/global.css'
+=======
+>>>>>>> 92b8cfb605bcdd3ab5813fe21ab53ebc4f66da8f
 import "./plugins/axios.js"
 
 // import axios from "axios"

src/router/index.js

@@ -41,6 +41,17 @@ const routes = [
     name:'leader-mailbox-reply',
     component:()=>import('../views/xixuanzhongxin/leader-mailbox/leader-mailbox-reply.vue')
   },
+<<<<<<< HEAD
+
+
+
+
+  //枣泉tongfeng
+  {
+    path:'/tongfeng/zaoquan/tongfeng_xijin',
+    name:'tongfeng_xijin',
+    component:()=>import('../views/tongfeng/zaoquan/tongfeng_xijin.vue')
+=======
   //枣泉矿井水系统
   {
     path:'/zaoquan/kuangjingshui/kuangjingshui',
@@ -67,11 +78,20 @@ const routes = [
     meta:{
       title:'拼图游戏'
     }
+>>>>>>> 92b8cfb605bcdd3ab5813fe21ab53ebc4f66da8f
   },
   //路由重定向
   {
     path:'/',
+<<<<<<< HEAD
+<<<<<<< HEAD
+    redirect:{"name":"tongfeng_xijin"}
+=======
+    redirect:{"name":"puzzle-infos"}
+>>>>>>> 92b8cfb605bcdd3ab5813fe21ab53ebc4f66da8f
+=======
     redirect:{"name":"puzzle"}
+>>>>>>> 4dc4f2de13aeec9d60e608b6522969df45127964
   }
 ]
 

src/views/tongfeng/zaoquan/tongfeng_xijin.vue

@@ -0,0 +1,22 @@
+<template>
+    <div>
+            <topimg></topimg>
+            <plcdata></plcdata>
+             
+    </div>
+</template>
+
+<script>
+import plcdata from '@/components/zdh/plcdata.vue';
+import topimg from '@/components/zdh/topimg.vue'
+    export default {
+         name:'tongfeng_xijin',
+  components: { topimg,plcdata },
+        
+         
+    }
+</script>
+
+<style  scoped>
+
+</style>