Merge pull request 'pc-master' (#10) from pc-master into portal

Reviewed-on: #10

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "ysws-vue",
+  "name": "zhihuiyun",
   "version": "0.1.0",
   "private": true,
   "scripts": {

src/App.vue

@@ -43,7 +43,12 @@ input::-webkit-inner-spin-button {
   -webkit-appearance: none !important;
   margin: 0;
 }
-
+#app{
+  min-width: 1290px;
+  min-height: 900px;
+  width: 100vw;
+  height: 100vh;
+}
 @font-face {
   font-family: Oswald;
   src: url(./assets/ttf/Oswald-Medium.ttf);

src/api/index.js

@@ -112,4 +112,8 @@ export default {
   getGethls(data){
     return sendGetRequest("/camera/gethls",data);
   },
+  //根据ID查询用户信息
+  getUser(data){
+    return sendGetRequest('/api/sel/user',data)
+  },
 };

src/assets/css/main.css

@@ -203,8 +203,8 @@
 }
 
 .index {
-  width: 100vw;
-  height: 100vh;
+  width: 100%;
+  height: 100%;
   min-height: 900px;
   overflow: auto;
   background: url(../image/index-background.png) no-repeat;
@@ -377,11 +377,13 @@
   height: 100%;
   background: rgba(0, 29, 68, 0.25);
   border-right: 2px solid rgba(0, 180, 255, 0.25);
+  overflow: auto;
 }
 
 .index .index-content .right {
   width: calc(100% - 240px);
   height: 100%;
+  overflow: auto;
 }
 
 .input-view {
@@ -1358,29 +1360,45 @@
   margin-left: 10px;
 }
 
-.realTime .page-content .flex-list {
-  display: flex;
-  align-items: center;
-  justify-content: space-around;
+.realTime .page-content .realTime-list {
+  width: 100%;
+  overflow: hidden;
 }
 
-.realTime .page-content .flex-list > div {
+.realTime .page-content .realTime-list .seamless-warp {
+  display: flex;
+  align-items: center;
+}
+
+.realTime .page-content .realTime-list .seamless-warp > div {
+  display: flex;
+  overflow: unset !important;
+}
+
+.realTime .page-content .realTime-list .seamless-warp > div > div {
+  display: flex;
+  align-items: center;
+  flex-shrink: 0;
+}
+
+.realTime .page-content .realTime-list .seamless-warp .list-view {
   flex-shrink: 0;
   display: flex;
   flex-direction: column;
   align-items: center;
+  margin-right: 20px;
 }
 
-.realTime .page-content .flex-list > div img {
+.realTime .page-content .realTime-list .seamless-warp .list-view img {
   width: 80px;
   height: 80px;
 }
 
-.realTime .page-content .flex-list > div .text {
+.realTime .page-content .realTime-list .seamless-warp .list-view .text {
   margin: 5px 0;
 }
 
-.realTime .page-content .flex-list > div .number {
+.realTime .page-content .realTime-list .seamless-warp .list-view .number {
   width: 106px;
   height: 40px;
   background: url(../image/real-time-text.png) no-repeat center;
@@ -1394,6 +1412,12 @@
   justify-content: center;
 }
 
+.realTime .page-content .flex-list {
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+
 .realTime .page-content .realTime-bottom {
   height: 440px;
   margin-top: 30px;

src/assets/css/main.scss

@@ -217,14 +217,13 @@
 }
 
 .index {
-    width: 100vw;
-    height: 100vh;
+    width: 100%;
+    height: 100%;
     min-height: 900px;
     overflow: auto;
     background: url(../image/index-background.png) no-repeat;
     background-size: 1920px 1080px;
     background-position: center top;
-
     .no-list {
         color: #fff;
         display: flex;
@@ -392,12 +391,13 @@
             background: rgba(0, 29, 68, 0.25);
             border-right: 2px solid rgba(0, 180, 255, 0.25);
 
-
+            overflow: auto;
         }
 
         .right {
             width: calc(100% - 240px);
             height: 100%;
+            overflow: auto;
         }
     }
 }
@@ -1431,43 +1431,61 @@
                 margin-left: 10px;
             }
         }
-
+        .realTime-list{
+            width: 100%;
+            overflow: hidden;
+                .seamless-warp{
+                    display: flex;
+                    align-items: center;
+                    >div{
+                        // width: 100%!important;
+                        display: flex;
+                        overflow: unset!important;
+                        >div{
+                            display: flex;
+                        align-items: center; 
+                        flex-shrink: 0;
+                        }
+                    }
+                    .list-view {
+                        flex-shrink: 0;
+                        display: flex;
+                        flex-direction: column;
+                        align-items: center;
+                        margin-right: 20px;
+                        img {
+                            width: 80px;
+                            height: 80px;
+        
+                        }
+        
+                        .text {
+                            margin: 5px 0;
+                        }
+        
+                        .number {
+                            width: 106px;
+                            height: 40px;
+                            background: url(../image/real-time-text.png) no-repeat center;
+                            background-size: 100% 100%;
+                            font-size: 20px;
+                            font-family: Arial;
+                            font-weight: bold;
+                            color: #FFFFFF;
+                            display: flex;
+                            align-items: center;
+                            justify-content: center;
+                        }
+                    }
+                }
+        
+        }
         .flex-list {
             display: flex;
             align-items: center;
             justify-content: space-around;
             // flex-wrap: wrap;
 
-            >div {
-                flex-shrink: 0;
-                display: flex;
-                flex-direction: column;
-                align-items: center;
-
-                img {
-                    width: 80px;
-                    height: 80px;
-
-                }
-
-                .text {
-                    margin: 5px 0;
-                }
-
-                .number {
-                    width: 106px;
-                    height: 40px;
-                    background: url(../image/real-time-text.png) no-repeat center;
-                    background-size: 100% 100%;
-                    font-size: 20px;
-                    font-family: Arial;
-                    font-weight: bold;
-                    color: #FFFFFF;
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-                }
-            }
 
         }
 

src/router/index.js

@@ -65,5 +65,12 @@ const router = new VueRouter({
   base: process.env.BASE_URL,
   routes
 })
-
+router.beforeEach(async (to,from,next) => {
+  if (to.meta.title) { // 判断是否有标题
+    document.title = to.meta.title;
+  }else{
+    document.title ='温室智慧云'
+  }
+  next();
+});
 export default router

src/views/HomeView.vue

@@ -44,7 +44,7 @@ export default {
     },
   },
   mounted() {
-    this.getTime()
+    // this.getTime()
     this.gerRouter();
 
     if (localStorage.getItem('token')) {
@@ -53,6 +53,10 @@ export default {
       this.$router.push({ name: 'login' })
 
     }
+    this.$bus.$on('refreshTime',(res)=>{
+        console.log(res,'time');
+        this.time=res
+       })
   },
   methods: {
     refreshData(){
@@ -104,8 +108,8 @@ export default {
 </script>
 <style lang="scss">
 .home {
-  width: 100vw;
-  height: 100vh;
+  width: 100%;
+  height: 100%;
   min-height: 900px;
   overflow: auto;
   background: url(../assets/image/background.jpg) no-repeat;

src/views/index.vue

@@ -2,7 +2,7 @@
     <div class="index">
         <div class="header">
             <div class="header-left">
-                <img  src="../assets/image/logo.png" alt="">
+                <img src="../assets/image/logo.png" alt="">
             </div>
             <div class="header-center">
                 <div @click="toRouter(item)" :class="item.routerList.indexOf(routerNow) != -1 ? 'active' : ''"
@@ -14,7 +14,7 @@
             <div class="header-right" v-if="userInfo">
                 <img src="../assets/image/avatar.png" alt="">
                 <div class="user-data">
-                    <div class="name">欢迎，{{ userInfo.nickname }}</div>
+                    <div class="name">欢迎，{{ userInfo.nickName }}</div>
                     <div class="time" v-if="time"> {{ time.year.year }}-{{ time.year.month }}-{{ time.year.date }}</div>
                 </div>
                 <div class="login-out" @click="loginOut"></div>
@@ -32,9 +32,9 @@
                                 <li class="table-li" @click="toRouter1(item1)"
                                     :class="item.routerList.indexOf(routerNow) != -1 && routerIndex == item1.index ? 'active' : ''"
                                     v-for="item1, index1 in item.list" :key="index1">{{ item1.deviceTypeName }} <div
-                                        class="status" :class="item1.status == 0 ? 'outline' : 'online'"
-                                        v-if="item1.status >= 0">{{
-                                            item1.status == 0 ? '离线' : '在线' }}</div>
+                                        class="status" :class="item1.deviceState == 0 ? 'outline' : 'online'"
+                                        v-if="item1.deviceState >= 0">{{
+                                            item1.deviceState == 0 ? '离线' : '在线' }}</div>
                                 </li>
                             </ul>
                         </el-collapse-item>
@@ -73,12 +73,13 @@ export default {
                 { name: '首页', img: require('../assets/image/index-icon.png'), list: [], router: 'realTime', isRouter: true, },
                 { name: '一号温室', img: require('../assets/image/left-img0.png'), list: [] },
                 { name: '二号温室', img: require('../assets/image/left-img1.png'), list: [] },
-                { name: '施肥机', routerList: ['formula', 'irrigateSet', 'PIDSet', 'systemSet', 'upload', 'sensorSet','realTime'], img: require('../assets/image/left-img2.png'), list: [] },],
+                { name: '施肥机', routerList: ['formula', 'irrigateSet', 'PIDSet', 'systemSet', 'upload', 'sensorSet', 'realTime'], img: require('../assets/image/left-img2.png'), list: [] },],
             routerNow: 'realTime',
             routerIndex: 1,
             equipmentList: [],
             userInfo: null,
-            loading:true,//页面加载
+            loading: true,//页面加载
+            IDTimer:null,
         }
     },
     watch: {
@@ -87,51 +88,73 @@ export default {
         },
     },
     mounted() {
+        const that = this
         this.getTime()
-        if (localStorage.getItem('token')) {
-            this.userInfo = JSON.parse(localStorage.getItem('userInfo'))
-        }
-        this.gerRouter();
-        this.getEqbyid()
-        
+        var router = this.$route.query
+        if (router.token && router.userid) {
+            localStorage.setItem('token', router.token)
 
+            this.api.getUser({ userId: router.userid }).then(res => {
+                var data=res.data.data
+                data.userid=router.userid
+                localStorage.setItem('userInfo', JSON.stringify(data))
+                this.userInfo = JSON.parse(localStorage.getItem('userInfo'))
+                this.gerRouter();
+                this.getEqbyid()
+            })
+            return
+        } else {
+            if (localStorage.getItem('token')) {
+                this.userInfo = JSON.parse(localStorage.getItem('userInfo'))
+            }
+            this.gerRouter();
+            this.getEqbyid()
+        }
+        this.IDTimer&&clearInterval( this.IDTimer)
+      this.IDTimer=  setInterval(() => {
+            that.getEqbyid()
+        }, 120000);
+
+    },
+    beforeDestroy(){
+        this.IDTimer&&clearInterval( this.IDTimer)
     },
     methods: {
         //获取设备名称/配方名称
-        getByid(){
-            var store=this.$store.state
-      var data = {
-        deviceId:store.equipmentList[store.equipmentIndex-1].deviceId,
-      };
-      this.api.getByid(data).then((res) => {
-        if (res.data.code == 200) {
-            store.equipmentName=res.data.data
-        } else {
-          this.$message.error(res.data.msg);
-        }
-        this.loading=false
-      });
+        getByid() {
+            var store = this.$store.state
+            var data = {
+                deviceId: store.equipmentList[store.equipmentIndex - 1].deviceId,
+            };
+            this.api.getByid(data).then((res) => {
+                if (res.data.code == 200) {
+                    store.equipmentName = res.data.data
+                } else {
+                    this.$message.error(res.data.msg);
+                }
+                this.loading = false
+            });
         },
         //获取设备
         getEqbyid() {
             var userInfo = JSON.parse(localStorage.getItem('userInfo'))
             this.api.getEqbyid(userInfo.userid).then((res) => {
                 if (res.data.code == 200) {
-                    this.$store.state.equipmentList = res.data.data.map((item,index) => {
+                    this.$store.state.equipmentList = res.data.data.map((item, index) => {
                         return {
                             ...item,
                             router: 'formula',
-                            index: index+1,
+                            index: index + 1,
                         };
                     });
-                  
+
                     this.leftList.forEach((el, index) => {
                         if (el.name == '施肥机') {
                             this.leftList[index].list = this.$store.state.equipmentList
                         }
                     })
                     this.getByid()
-                    
+
                 }
             })
         },
@@ -163,9 +186,9 @@ export default {
                 if (item.http) {
                     window.location.href = item.http;
                 } else if (item.router == 'formula' && this.$route.query.index != item.index) {
-                    this.$store.state.equipmentIndex=item.index
+                    this.$store.state.equipmentIndex = item.index
                     this.$router.push({ path: `/${item.router}?index=${item.index ? item.index : 1}` })
-                
+
                 } else if (item.router != this.routerNow && !item.http) {
                     this.$router.push({ name: item.router })
                 }
@@ -178,13 +201,13 @@ export default {
                 if (item.http) {
                     window.location.href = item.http;
                 } else if (item.router == 'formula' && this.$route.query.index != item.index) {
-                  if(this.routerNow=='realTime'){
-                    this.$router.push({ path: `/realTime?index=${item.index ? item.index : 1}` })
-                  }else{
-                    this.$store.state.equipmentIndex=item.index
-                    this.$router.push({ path: `/formula?index=${item.index ? item.index : 1}` })
-                
-                  }
+                    if (this.routerNow == 'realTime') {
+                        this.$router.push({ path: `/realTime?index=${item.index ? item.index : 1}` })
+                    } else {
+                        this.$store.state.equipmentIndex = item.index
+                        this.$router.push({ path: `/formula?index=${item.index ? item.index : 1}` })
+
+                    }
                 } else if (item.router != this.routerNow && !item.http) {
                     this.$router.push({ name: item.router })
                 }

src/views/page/realTime.vue

@@ -1,9 +1,10 @@
 <template>
     <div class="formula realTime">
         <div class="page-content">
-            <div class="timeNow" v-if="time">
-                {{ time.year.year }}-{{ time.year.month }}-{{ time.year.date }}<span> {{ time.time }}:{{ time.timeS
-                }}</span>
+            <div class="timeNow" v-if="list.length">
+                <!-- {{ time.year.year }}-{{ time.year.month }}-{{ time.year.date }}<span> {{ time.time }}:{{ time.timeS
+                }}</span> -->
+                {{ list[0].updateTime?list[0].updateTime:'' }}
             </div>
             <div class="table-title">
                 <img src="../../assets/image/real-time.png" alt="" />
@@ -20,12 +21,15 @@
                     </div>
                 </div> -->
             </div>
-            <div class="flex-list scroll">
-                <div class="" v-for="item, index in list " :key="index">
+            <div class="realTime-list" v-if="list.length">
+                <vue-seamless class="seamless-warp" :data="list" :class-option="defaultOption">
+                    <div class="list-view" v-for="item, index in list " :key="index">
                     <img :src="item.img" alt="">
                     <div class="text">{{ item.name }}</div>
                     <div class="number">{{ item.num }}</div>
                 </div>
+                </vue-seamless>
+           
             </div>
             <div class="flex-list realTime-bottom">
                 <div class="left">
@@ -43,8 +47,23 @@ import { getnowtime } from '../../assets/js/nowTime'
 import { realTimeLine } from '@/assets/js/charts'
 import videojs from 'video.js';
 import video_zhCN from 'video.js/dist/lang/zh-CN.json'
+import vueSeamless from 'vue-seamless-scroll'
 export default {
-
+    components: { vueSeamless },
+    computed: {
+        defaultOption() {
+            return {
+                step: 0.3, // 数值越大速度滚动越快
+                limitMoveNum: 9, // 开始无缝滚动的数据量 this.dataList.length
+                hoverStop: true, // 是否开启鼠标悬停stop
+                direction: 2, // 0向下 1向上 2向左 3向右
+                openWatch: true, // 开启数据实时监控刷新dom
+                singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
+                singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
+                waitTime: 1000 // 单步运动停止的时间(默认值1000ms)
+            }
+        }
+    },
     data() {
         return {
             time: null,//右上角时间
@@ -69,7 +88,7 @@ export default {
         const that = this;
         this.indexs = this.$route.query.index ? this.$route.query.index : 1;
 
-        this.getTime()
+        // this.getTime()
 
 
         setTimeout(() => {
@@ -79,6 +98,7 @@ export default {
             that.dataInit();
            }, 60000);
         }, 0);
+   
     },
     beforeDestroy() {
         const that = this;
@@ -87,6 +107,7 @@ export default {
             this.player.dispose();
         }
          that.timer&&clearInterval(that.timer)
+         this.$bus.$off('refreshTime')
     },
     methods: {
         createVideo() {
@@ -174,10 +195,12 @@ export default {
                            }
 
                             this.list.push({
+                                ...el,
                                 name:name,
                                  num: num,
                                   img: require(`../../assets/image/real-time-${el.formula}.png`) 
-                            })
+                            
+                                })
                            
                         }
                         })

src/views/page/status.vue

@@ -35,8 +35,8 @@
                         </div>
                     </div>
                     <div class="left-btn">
-                        <div :class="left1Act == 1&&left1Act==3 ? 'active' : ''">进水泵</div>
-                        <div :class="left1Act == 2&&left1Act==3 ? 'active' : ''">配肥泵</div>
+                        <div :class="left1Act == 1 && left1Act == 3 ? 'active' : ''">进水泵</div>
+                        <div :class="left1Act == 2 && left1Act == 3 ? 'active' : ''">配肥泵</div>
                     </div>
                 </div>
 
@@ -139,7 +139,7 @@ import vueSeamless from 'vue-seamless-scroll'
 export default {
     data() {
         return {
-            pageTimer:null,
+            pageTimer: null,
             left1Act: -1,
             openType: '',
             left2List: [
@@ -260,7 +260,7 @@ export default {
             centerBottom: [],
             numberList: [273, 278, 283, 288, 293, 298],
             inputData1: [],
-            loading:true,
+            loading: true,
         }
     },
     components: { vueSeamless },
@@ -279,26 +279,26 @@ export default {
         }
     },
     //清除监听
-    beforeDestroy(){ 
+    beforeDestroy() {
         const that = this;
         this.$bus.$off('refreshData')
-        //  that.pageTimer&&clearInterval(that.pageTimer)
+        that.pageTimer && clearInterval(that.pageTimer)
     },
     mounted() {
         const that = this;
         if (localStorage.getItem('token')) {
             that.getEqbyid();
-        // setTimeout(() => {
-        //     that.pageTimer&&clearInterval(that.pageTimer)
-        //     that.pageTimer= setInterval(() => {
-        //     that.getEqbyid();
-        //    }, 5000);
-        // }, 0);
+            setTimeout(() => {
+                that.pageTimer && clearInterval(that.pageTimer)
+                that.pageTimer = setInterval(() => {
+                    that.getEqbyid();
+                }, 5000);
+            }, 0);
         } else {
             //   this.$router.push({ name: 'login' })
         }
-        this.$bus.$on('refreshData',(res)=>{
-             that.getEqbyid();
+        this.$bus.$on('refreshData', (res) => {
+            that.getEqbyid();
         })
     },
     methods: {
@@ -308,16 +308,16 @@ export default {
         //2是原数据/10 
         //3是(原数据-400) / 10
         countType1(data) {
-            var num=data - 400
+            var num = data - 400
             return num.toFixed(2)
         },
         countType2(data) {
-            var num=data / 10
+            var num = data / 10
             return num.toFixed(2)
         },
         countType3(data) {
 
-            var num=(data - 400) / 10
+            var num = (data - 400) / 10
             return num.toFixed(2)
         },
         getTypeData(dataCode, typeCode) {
@@ -357,17 +357,17 @@ export default {
                 data: '1#EC ' + this.countData100(inputData['52']),
                 ADdata: '2#EC ' + this.countData100(inputData['54']),
             }
-           
+
             this.tableList1[2] = {
                 name: '传感器1',
                 data: this.getTypeData('40', '273'),
-                ADdata:inputData['39'],
+                ADdata: inputData['39'],
             }
 
             this.tableList1[3] = {
                 name: '传感器2',
                 data: this.getTypeData('42', '278'),
-                ADdata:inputData['41'] ,
+                ADdata: inputData['41'],
             }
 
             this.tableList1[4] = {
@@ -385,15 +385,15 @@ export default {
             this.tableList1[6] = {
                 name: '传感器5',
                 data: this.getTypeData('48', '293'),
-                ADdata:inputData['47'] ,
+                ADdata: inputData['47'],
             }
 
             this.tableList1[7] = {
                 name: '传感器6',
                 data: this.getTypeData('50', '298'),
-                ADdata:inputData['49'] ,
+                ADdata: inputData['49'],
             }
-            this.loading=false
+            this.loading = false
         },
         getEqbyid() {
             var store = this.$store.state
@@ -491,40 +491,51 @@ export default {
 
             var statusIndex = 8
             for (var j = 0; j < statusIndex; j++) {
-                if (Number(number[number.length-1 - j])) {
-                    if(j=0){
-                        this.right2Index.push(1)
-                    }else if(j=1){
-                        this.right2Index.push(0)
-                    }else{
+                if (Number(number[number.length - 1 - j])) {
+                    if (j == 0) {
+                        this.right2Index.push('1')
+                    } else if (j == 1) {
+                        this.right2Index.push('0')
+                    } else {
                         this.right2Index.push(j)
                     }
                 }
             }
+            console.log(this.right2Index, 123);
         },
         //进水泵和出水泵状态
         getData30() {
-        //     var number = this.padString(this.inputData['30'].toString(2), 2)
-        //     if (Number(number[0])) {
-        //         this.left1Act = 1
-        //     }
-        //    if (Number(number[1])) {
-        //         this.left1Act = 0
-        //     }
-        //     if (Number(number[0])&&Number(number[1])) {
-        //         this.left1Act = 3
-        //     }
+            //     var number = this.padString(this.inputData['30'].toString(2), 2)
+            //     if (Number(number[0])) {
+            //         this.left1Act = 1
+            //     }
+            //    if (Number(number[1])) {
+            //         this.left1Act = 0
+            //     }
+            //     if (Number(number[0])&&Number(number[1])) {
+            //         this.left1Act = 3
+            //     }
             // else {
             //     this.left1Act = -1
             // }
         },
         dataInit() {
+            const that = this
             var deviceDetail = this.deviceDetail
             var data = {
                 "equipmentId": deviceDetail.deviceId,
                 "pattern": 0,//需要根据文档填写 //6目标ph-数值
                 "regNum": 71
             }
+            var week = [
+                "星期日",
+                "星期一",
+                "星期二",
+                "星期三",
+                "星期四",
+                "星期五",
+                "星期六",
+            ]
             this.api.postState(data).then(res => {
                 if (res.data.code == 200) {
                     this.inputData = res.data.data;
@@ -535,20 +546,37 @@ export default {
                     this.getleft2List()//获取左下角数据
                     this.getrightList3()//获取又下角数据
                     this.getcenterBottom()//获取电磁阀
+                    var h = this.checkTime(this.inputData[3])
+                    var m = this.checkTime(this.inputData[4])
+                    var month_ = this.checkTime(this.inputData[1])
+                    var date_ = this.checkTime(this.inputData[2])
+                    var time = {
+                        year: { year: this.inputData[0], month: month_, date: date_ },
+                        week: week[this.inputData[5]],
+                        time: h + ":" + m,
+                    }
+                    this.$bus.$emit('refreshTime',time)
                 } else {
                     this.$message.error(res.data.msg);
                 }
             })
 
         },
+        checkTime(i) {
+            if (i < 10) {
+                i = "0" + i;
+            }
+
+            return i;
+        },
         getReg() {
             var deviceDetail = this.deviceDetail
-                    //获取传感器种类
-                    var data1 = {
-                        equipmentId: deviceDetail.deviceId,
-                        pattern: 272, //需要根据文档填写 //6目标ph-数值
-                        regNum: 31,//从pattern取多少个数据
-                    };
+            //获取传感器种类
+            var data1 = {
+                equipmentId: deviceDetail.deviceId,
+                pattern: 272, //需要根据文档填写 //6目标ph-数值
+                regNum: 31,//从pattern取多少个数据
+            };
             this.api.postReg(data1).then((res) => {
                 if (res.data.code == 200) {
                     this.inputData1 = res.data.data;