ss 4 tháng trước cách đây
mục cha
commit
08b1d1f7ae

+ 1 - 1
.env.test

@@ -2,5 +2,5 @@ NODE_ENV = 'development'
 VUE_APP_ENV = 'test'
 VUE_APP_VERSION = '1.0'
 VUE_APP_PLATFORM = 'pc'
-VUE_APP_PHP_URL = http://mingde.com
+VUE_APP_PHP_URL = http://jili2.com
 BASE_URL = '/'

+ 3 - 0
src/apps/home/components/screen-module.vue

@@ -106,6 +106,7 @@
                 <smodule96 v-if="item.name === 'mode96'" :data="data" />
                 <smodule97 v-if="item.name === 'mode97'" :data="data" />
                 <smodule98 v-if="item.name === 'mode98'" :data="data" />
+                <smodule99 v-if="item.name === 'mode99'" :data="data" />
 
             </div>
         </template>
@@ -215,6 +216,7 @@ import Smodule95 from '@/apps/home/components/smodule/smodule95.vue';
 import Smodule96 from '@/apps/home/components/smodule/smodule96.vue';
 import Smodule97 from '@/apps/home/components/smodule/smodule97.vue';
 import Smodule98 from '@/apps/home/components/smodule/smodule98.vue';
+import Smodule99 from '@/apps/home/components/smodule/smodule99.vue';
 
 @Component({
     props: {
@@ -327,6 +329,7 @@ import Smodule98 from '@/apps/home/components/smodule/smodule98.vue';
         Smodule96,
         Smodule97,
         Smodule98,
+        Smodule99,
     },
 })
 export default class Echarts extends Vue {

+ 12 - 0
src/apps/home/components/screen-tem1.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="page">
         <div class="header">
+            <img class="header-logo" src="../images/screen-tem2/logo.png" alt="">
             <img class="header-img" src="../images/screen-tem1/title.png" alt="">
             <div class="header-title">
                 <div class="header-title1">
@@ -139,4 +140,15 @@ export default class Echarts extends Vue {
         height: 40.7vh;
         background-image: url(../images/screen-tem1/middle.png);
     }
+
+    .header-logo{
+        position: absolute;
+        left: 1vw;
+        display: inline-block;
+          /* width: 12.5vw; */
+        width: 7.7vw;
+        height: 2.8vh;
+        vertical-align: middle;
+        margin-top: 4vh;
+    }
 </style>

+ 23 - 7
src/apps/home/components/screen-tem11.vue

@@ -3,13 +3,15 @@
         <div class="header">
             <div class="header-box">
                 <div class="header-left">
-                    <span>{{day}}</span>
-                    <span>{{time}}</span>
-                    <span>{{week}}</span>
+                    <img class="header-img" src="../images/screen-tem2/logo.png" alt="">
+
+                    系统已运行{{yxDay}}天
                 </div>
                 <div class="title">{{data.title}}</div>
                 <div class="header-right">
-                    系统已运行{{yxDay}}天
+                    <span>{{day}}</span>
+                    <span>{{time}}</span>
+                    <span>{{week}}</span>
                 </div>
 
             </div>
@@ -152,21 +154,33 @@ export default class Echarts extends Vue {
         height: 7.2vh;
         line-height: 7.2vh;
         font-size: 22px;
+        overflow: hidden;
     }
     .header-box .header-left{
         width: 27.6vw;
         height: 7.2vh;
         line-height: 7.2vh;
         display: inline-block;
-        text-align: right;
+        text-align: left;
     }
-    .header-box .header-left span{
+    .header-box .header-right span{
         font-size: 20px;
         font-family: Source Han Sans CN;
         font-weight: 400;
         color: #FFFFFF;
         margin-left: 1vw;
     }
+    .header-box .header-img{
+        display: inline-block;
+           /* width: 12.5vw; */
+           width: 7.7vw;
+        height: 2.8vh;
+        vertical-align: middle;
+        margin-top: -4px;
+        text-align: left;
+        margin-left: 1.5vw;
+        margin-right: 1.5vw;
+    }
     .header-box .title{
         width: 44.8vw;
         height: 7.2vh;
@@ -179,7 +193,7 @@ export default class Echarts extends Vue {
         color: #FFFFFF;
     }
     .header-right{
-        width: 27.6vw;
+        width: 26.6vw;
         height: 7.2vh;
         line-height: 7.2vh;
         display: inline-block;
@@ -187,6 +201,8 @@ export default class Echarts extends Vue {
         font-family: Source Han Sans CN;
         font-weight: 400;
         color: #FFFFFF;
+        text-align: right;
+        padding-right: 1vw;
     }
     .main{
         height: 90vh;

+ 1 - 1
src/apps/home/components/screen-tem13.vue

@@ -13,7 +13,7 @@
                     <img class="header-line" src="../images/screen-tem2/line.png" alt="">
                     <span>{{week}}</span>
                 </div>
-                <div class="header-title">{{data.orgName}}{{data.title}}</div>
+                <div class="header-title">{{data.title}}</div>
                 <img class="header-blue-line" src="../images/screen-tem2/blue-line.png" alt="">
             </div>
 

+ 1 - 1
src/apps/home/components/screen-tem14.vue

@@ -13,7 +13,7 @@
                     <img class="header-line" src="../images/screen-tem2/line.png" alt="">
                     <span>{{week}}</span>
                 </div>
-                <div class="header-title">{{data.orgName}}{{data.title}}</div>
+                <div class="header-title">{{data.title}}</div>
                 <img class="header-blue-line" src="../images/screen-tem2/blue-line.png" alt="">
             </div>
 

+ 1 - 1
src/apps/home/components/screen-tem15.vue

@@ -13,7 +13,7 @@
                     <img class="header-line" src="../images/screen-tem15/line.png" alt="">
                     <span>{{week}}</span>
                 </div>
-                <div class="header-title">{{data.orgName}}{{data.title}}</div>
+                <div class="header-title">{{data.title}}</div>
                 <img class="header-blue-line" src="../images/screen-tem15/blue-line.png" alt="">
             </div>
 

+ 2 - 2
src/apps/home/components/screen-tem16.vue

@@ -12,8 +12,8 @@
                     <img class="header-line" src="../images/screen-tem2/line.png" alt="">
                     <span>{{week}}</span>
                 </div>
-                <div v-if="isWebp" class="header-title webpimg">{{data.orgName}}{{data.title}}</div>
-                <div v-if="!isWebp" class="header-title">{{data.orgName}}{{data.title}}</div>
+                <div v-if="isWebp" class="header-title webpimg">{{data.title}}</div>
+                <div v-if="!isWebp" class="header-title">{{data.title}}</div>
                 <!-- <img class="header-blue-line" src="../images/screen-tem2/blue-line.png" alt=""> -->
             </div>
         </div>

+ 1 - 1
src/apps/home/components/screen-tem3.vue

@@ -13,7 +13,7 @@
                     <img class="header-line" src="../images/screen-tem2/line.png" alt="">
                     <span>{{week}}</span>
                 </div>
-                <div class="header-title">{{data.orgName}}{{data.title}}</div>
+                <div class="header-title">{{data.title}}</div>
                 <img class="header-blue-line" src="../images/screen-tem2/blue-line.png" alt="">
             </div>
 

+ 16 - 2
src/apps/home/components/screen-tem4.vue

@@ -2,6 +2,7 @@
     <div class="page">
         <div class="header">
             <!-- <div class="header-box"> -->
+            <img class="header-logo" src="../images/screen-tem2/logo.png" alt="">
             <div class="title">{{data.title}}</div>
             <div class="header-img">
                 <img src="../images/screen-tem4/header.png" alt="">
@@ -64,9 +65,11 @@ export default class Echarts extends Vue {
         left: 0;
         bottom: 0;
         right: 0;
-        background-color: #14111f;
+      //  background-color: #14111f;
         overflow: hidden;
-        background-image: url(../images/screen-tem4/bg.png);
+        // background-image: url(../images/screen-tem4/bg.png);
+        background-image: url(../images/screen-tem2/bg.png);
+        background-repeat: no-repeat;
         background-repeat: no-repeat;
         background-size: 100% 100%;
         color: #ffffff;
@@ -167,4 +170,15 @@ export default class Echarts extends Vue {
         background-size: 100% 100%;
     }
 
+    .header-logo{
+        position: absolute;
+        left: 1vw;
+        display: inline-block;
+          /* width: 12.5vw; */
+        width: 7.7vw;
+        height: 2.8vh;
+        vertical-align: middle;
+        margin-top: -4px;
+    }
+
 </style>

+ 1 - 1
src/apps/home/components/screen-tem6.vue

@@ -13,7 +13,7 @@
                     <img class="header-line" src="../images/screen-tem2/line.png" alt="">
                     <span>{{week}}</span>
                 </div>
-                <span class="headr-title">{{data.orgName}}{{data.title}}</span>
+                <span class="headr-title">{{data.title}}</span>
 
                 <img class="header-blue-line" src="../images/screen-tem2/blue-line.png" alt="">
             </div>

+ 3 - 3
src/apps/home/components/smodule/smodule26.vue

@@ -44,12 +44,12 @@ export default class Smodule17 extends Vue {
         api.getWasteRecord().then((res) => {
             this.config = {
                 header: ['收取科室', '收取人', '收取时间', '状态'],
-                headerBGC: '#061D4E',
+                headerBGC: '#13397d',
                 headerHeight: 45,
                 data: res.data,
                 align: 'center',
-                oddRowBGC: '#223661',
-                evenRowBGC: '#061D4E',
+                oddRowBGC: '#163f85',
+                evenRowBGC: '#13397d',
                 rowNum: 8,
             };
         }).catch(() => {}).finally(() => {

+ 2 - 1
src/apps/home/components/smodule/smodule35.vue

@@ -65,7 +65,8 @@ export default class Echarts extends Vue {
     }
 
     clickMore() {
-        window.open('https://mdyg.sdmingde.cn/admin/orders/index.html?mode=1');
+        const url = `${process.env.VUE_APP_PHP_URL}/admin/orders/index.html?mode=1`;
+        window.open(url);
     }
 }
 </script>

+ 2 - 1
src/apps/home/components/smodule/smodule51.vue

@@ -62,7 +62,8 @@ export default class Echarts extends Vue {
     }
 
     clickMore() {
-        window.open('https://mdyg.sdmingde.cn/admin/patrol_record/index/mode/2');
+        const url = `${process.env.VUE_APP_PHP_URL}/admin/patrol_record/index/mode/2`;
+        window.open(url);
     }
 }
 </script>

+ 2 - 1
src/apps/home/components/smodule/smodule57.vue

@@ -200,7 +200,8 @@ export default class Echarts extends Vue {
     }
 
     clickMore() {
-        window.open('https://mdyg.sdmingde.cn/admin/orders/index.html?mode=0');
+        const url = `${process.env.VUE_APP_PHP_URL}/admin/orders/index.html?mode=0`;
+        window.open(url);
     }
 }
 </script>

+ 2 - 1
src/apps/home/components/smodule/smodule60.vue

@@ -96,7 +96,8 @@ export default class smodule8 extends Vue {
     }
 
     clickMore() {
-        window.open('https://mdyg.sdmingde.cn/admin/orders/index.html?mode=0');
+        const url = `${process.env.VUE_APP_PHP_URL}/admin/orders/index.html?mode=0`;
+        window.open(url);
     }
 }
 </script>

+ 2 - 1
src/apps/home/components/smodule/smodule61.vue

@@ -93,7 +93,8 @@ export default class smodule8 extends Vue {
     }
 
     clickMore() {
-        window.open('https://mdyg.sdmingde.cn/admin/patrol_record/index/mode/4');
+        const url = `${process.env.VUE_APP_PHP_URL}/admin/patrol_record/index/mode/4`;
+        window.open(url);
     }
 }
 </script>

+ 173 - 0
src/apps/home/components/smodule/smodule99.vue

@@ -0,0 +1,173 @@
+<template>
+    <div class="module-main">
+        <div class="module-box">
+            <div class="module-public module-top-box">
+                <div class="header">
+                    员工状态总览
+                </div>
+                <div class="center-box">
+                    <div class="center-left-box">
+                        <div class="nums">{{count1}}</div>
+                        <div class="title">任务中的员工</div>
+                    </div>
+                </div>
+                <div class="bottom-box">
+                    <dv-scroll-board :config="config" class="bottom-left-box" />
+
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import Vue from 'vue';
+import Component from 'vue-class-component';
+import api from '../../api';
+
+@Component({
+    props: {
+        data: {
+            type: Object,
+            default: null,
+        },
+    },
+})
+export default class Echarts extends Vue {
+    config = {
+
+    }
+
+    config2 = {
+
+    }
+
+    config3 = {
+
+    }
+
+    count1 = 0;
+
+    count2 = 0;
+
+    created() {
+        this.getWxUserStatus();
+        setInterval(() => {
+            this.getWxUserStatus();
+        }, 5000 * 60);
+    }
+
+    getWxUserStatus() {
+        api.getWxUserStatus().then((res) => {
+            this.count1 = res.data.list2.count;
+            this.count2 = res.data.list.count;
+            this.config = {
+                header: ['姓名', '维修次数', '最新位置'],
+                headerBGC: '#163f85',
+                headerHeight: 45,
+                data: res.data.list2.list,
+                align: 'center',
+                oddRowBGC: '#163f85',
+                evenRowBGC: '#13397d',
+                rowNum: 4,
+            };
+            this.config2 = {
+                header: ['姓名', '维修次数', '最新位置'],
+                headerBGC: '#163f85',
+                headerHeight: 45,
+                data: res.data.list.list,
+                align: 'center',
+                oddRowBGC: '#163f85',
+                evenRowBGC: '#13397d',
+                rowNum: 4,
+            };
+        }).catch(() => {}).finally(() => {
+        });
+    }
+}
+</script>
+
+<style scoped lang="scss">
+    .module-box .header{
+        width: 97%;
+        height: 40px;
+        line-height: 40px;
+        font-size: 16px;
+        // font-weight: bold;
+        // color: #0BE2DF;
+        padding-left: 3%;
+    }
+
+    .module-top-box{
+        width: 100%;
+        height: 100%;
+        position: relative;
+    }
+    .module-top-box .center-box{
+        width: 100%;
+        height: 80px;
+    }
+    .module-top-box .center-box .center-left-box{
+        width: 100%;
+        height: 100%;
+        display: inline-block;
+        overflow: hidden;
+    }
+    .module-top-box .center-box .center-left-box .nums{
+        width: 100%;
+        font-size: 30px;
+        font-weight: bold;
+        color: #11E799;
+        text-align: center;
+    }
+    .module-top-box .center-box .center-left-box .title{
+        width: 100%;
+        font-size: 18px;
+        color: #11E799;
+        text-align: center;
+    }
+    .module-top-box .center-box .center-right-box{
+        width: 50%;
+        height: 100%;
+        display: inline-block;
+        overflow: hidden;
+    }
+    .module-top-box .center-box .center-right-box .nums{
+        width: 100%;
+        font-size: 30px;
+        font-weight: bold;
+        color: #FFE400;
+        text-align: center;
+    }
+    .module-top-box .center-box .center-right-box .title{
+        width: 100%;
+        font-size: 18px;
+        color: #FFE400;
+        text-align: center;
+    }
+    .module-top-box .bottom-box{
+         width: 100%;
+         height: auto;
+         position: absolute;
+         top: 120px;
+         left: 0;
+         right: 0;
+         bottom: 0;
+
+    }
+    .module-top-box .bottom-box .bottom-left-box{
+        width: 100%;
+        height: 100%;
+        // display: inline-block;
+        // float: left;
+        overflow: hidden;
+    }
+    .module-top-box .bottom-box .bottom-right-box{
+        width: 49%;
+        height: 100%;
+        display: inline-block;
+        float: right;
+        overflow: hidden;
+    }
+
+</style>

+ 8 - 2
src/apps/twolevel/views/two-level.js

@@ -481,8 +481,11 @@ export default class BannerIndex extends Vue {
         if (id) {
             // this.$router.push({ name: 'threelevel', params: { orgId: id } });
 
-            window.location.href = `https://mdyg.sdmingde.cn/h5/screen/project?org_id=${id}`;
+            // window.location.href = `https://mdyg.sdmingde.cn/h5/screen/project?org_id=${id}`;
             // window.location.href = `http://mingde.com/h5/screen/project?org_id=${id}`;
+
+            const url = `${process.env.VUE_APP_PHP_URL}/h5/screen/project?org_id=${id}`;
+            window.open(url);
         }
     }
 
@@ -789,7 +792,10 @@ export default class BannerIndex extends Vue {
         // } else {
         //     this.$router.push({ name: 'threelevel', params: { orgId: id } });
         // }
-        window.location.href = `https://mdyg.sdmingde.cn/h5/screen/project?org_id=${id}`;
+        //   window.location.href = `https://mdyg.sdmingde.cn/h5/screen/project?org_id=${id}`;
+
+        const url = `${process.env.VUE_APP_PHP_URL}/h5/screen/project?org_id=${id}`;
+        window.open(url);
         // window.location.href = `http://mingde.com/h5/screen/project?org_id=${id}`;
     }