liying5537 3 سال پیش
والد
کامیت
9165b151cc

+ 14 - 14
master/src/main/resources/application.yml

@@ -93,24 +93,24 @@ spring:
         max-wait: -1ms
   # 邮箱配置
   mail:
-#    host: smtpout.basf-it-services.com
-#    protocol: smtp
-#    default-encoding: UTF-8
-#    password:
-#    username:
-#    port: 25
-#    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
-#    properties.mail.debug: true
-#    from: CPMS.byc@BASF-YPC.com.cn
-    host: smtp.exmail.qq.com
+    host: smtpout.basf-it-services.com
     protocol: smtp
     default-encoding: UTF-8
-    password: vvTAT8hciG7FLk4C
-    username: email@seashoreept.com
-    port: 587
+    password:
+    username:
+    port: 25
     properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
     properties.mail.debug: true
-    from: email@seashoreept.com
+    from: CPMS.byc@BASF-YPC.com.cn
+#    host: smtp.exmail.qq.com
+#    protocol: smtp
+#    default-encoding: UTF-8
+#    password: vvTAT8hciG7FLk4C
+#    username: email@seashoreept.com
+#    port: 587
+#    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
+#    properties.mail.debug: true
+#    from: email@seashoreept.com
 # token配置
 token:
     # 令牌自定义标识

+ 1 - 1
ui/src/views/monitor/elec/bottomLeft.vue

@@ -6,7 +6,7 @@
           <icon name="chart-bar"></icon>
         </span>
         <div class="d-flex">
-          <span class="fs-xl text mx-2">环排放控制</span>
+          <span class="fs-xl text mx-2">环排放控制</span>
         </div>
       </div>
       <div>

+ 1 - 1
ui/src/views/monitor/elec/bottomRight.vue

@@ -6,7 +6,7 @@
           <icon name="chart-area"></icon>
         </span>
         <div class="d-flex">
-          <span class="fs-xl text mx-2">天然气消耗</span>
+          <span class="fs-xl text mx-2">天然气消耗</span>
           <div class="decoration2">
             <dv-decoration-2 :reverse="true" style="width:5px;height:480px;" />
           </div>

+ 19 - 18
ui/src/views/monitor/elec/center.vue

@@ -13,16 +13,17 @@
         <span style="color:#5cd9e8">
           <icon name="align-left"></icon>
         </span>
-        <span class="fs-xl text mx-2 mb-1">班组排行榜</span>
+        <span class="fs-xl text mx-2 mb-1">装置耗电量排名
+</span>
         <dv-scroll-ranking-board :config="ranking" style="height:2.75rem" />
       </div>
       <div class="percent">
         <div class="item bg-color-black">
-          <span>今日任务通过率</span>
+          <span>实际能耗/计划能耗</span>
           <centerChart :id="rate[0].id" :tips="rate[0].tips" :colorObj="rate[0].colorData" />
         </div>
         <div class="item bg-color-black">
-          <span>今日任务达标率</span>
+          <span>任务合规性</span>
           <centerChart :id="rate[1].id" :tips="rate[1].tips" :colorObj="rate[1].colorData" />
         </div>
         <div class="water">
@@ -41,7 +42,7 @@ export default {
     return {
       titleItem: [
         {
-          title: "Year Power Generation(mw)",
+          title: "年发电量n(mw)",
           number: {
             number: [120],
             toFixed: 1,
@@ -49,7 +50,7 @@ export default {
           }
         },
         {
-          title: "Month Power Generation(mw)",
+          title: "月发电量(mw)",
           number: {
             number: [18],
             toFixed: 1,
@@ -57,7 +58,7 @@ export default {
           }
         },
         {
-          title: "Day Power Generation(mw)",
+          title: "日发电量(mw)",
           number: {
             number: [2],
             toFixed: 1,
@@ -65,7 +66,7 @@ export default {
           }
         },
         {
-          title: "Year Power Generation(mw)",
+          title: "年消耗量(mw)",
           number: {
             number: [14],
             toFixed: 1,
@@ -73,7 +74,7 @@ export default {
           }
         },
         {
-          title: "Month Power Generation(mw)",
+          title: "月消耗量(mw)",
           number: {
             number: [106],
             toFixed: 1,
@@ -81,7 +82,7 @@ export default {
           }
         },
         {
-          title: "Day Power Generation(mw)",
+          title: "日消耗量(mw)",
           number: {
             number: [100],
             toFixed: 1,
@@ -92,41 +93,41 @@ export default {
       ranking: {
         data: [
           {
-            name: "周口",
+            name: "公应工程",
             value: 55
           },
           {
-            name: "南阳",
+            name: "BCC",
             value: 120
           },
           {
-            name: "西峡",
+            name: "碳一",
             value: 78
           },
           {
-            name: "驻马店",
+            name: "EU",
             value: 66
           },
           {
-            name: "新乡",
+            name: "电厂",
             value: 80
           },
           {
-            name: "新乡",
+            name: "AE",
             value: 80
           },
           {
-            name: "新乡",
+            name: "AA",
             value: 80
           },
           {
-            name: "新乡",
+            name: "苯乙烯",
             value: 80
           }
         ],
         waitTime: 4000,
         carousel: "page",
-        unit: ""
+        unit: "mw"
       },
       water: {
         data: [24, 45],

+ 5 - 5
ui/src/views/monitor/elec/centerLeft1.vue

@@ -6,7 +6,7 @@
           <icon name="chart-bar"></icon>
         </span>
         <div class="d-flex">
-          <span class="fs-xl text mx-2">Source of Power</span>
+          <span class="fs-xl text mx-2">燃料情况</span>
           <dv-decoration-3 style="width:1.25rem;height:.25rem; position:relative;top:-.0375rem;" />
         </div>
       </div>
@@ -70,7 +70,7 @@ export default {
             toFixed: 1,
             content: "{nt}"
           },
-          text: "Power Genration Capacity"
+          text: "发电能力"
         },
         {
           number: {
@@ -78,7 +78,7 @@ export default {
             toFixed: 1,
             content: "{nt}"
           },
-          text: "Power Genration Capacity"
+          text: "发电能力"
         },
         {
           number: {
@@ -86,7 +86,7 @@ export default {
             toFixed: 1,
             content: "{nt}"
           },
-          text: "Power Genration Capacity"
+          text: "发电能力"
         },
         {
           number: {
@@ -94,7 +94,7 @@ export default {
             toFixed: 1,
             content: "{nt}"
           },
-          text: "Power Genration Capacity"
+          text: "发电能力"
         }
       ]
     };

+ 1 - 1
ui/src/views/monitor/elec/centerLeft2.vue

@@ -6,7 +6,7 @@
           <icon name="chart-pie"></icon>
         </span>
         <div class="d-flex">
-          <span class="fs-xl text mx-2">Radar Chart</span>
+          <span class="fs-xl text mx-2">装机容量</span>
           <dv-decoration-1 style="width:1.25rem;height:.25rem; position:relative;top:-.0375rem;" />
         </div>
       </div>

+ 12 - 12
ui/src/views/monitor/elec/centerRight1.vue

@@ -6,7 +6,7 @@
           <icon name="chart-line"></icon>
         </span>
         <div class="d-flex">
-          <span class="fs-xl text mx-2">任务完成排行榜</span>
+          <span class="fs-xl text mx-2"> 计划完成排名 </span>
         </div>
       </div>
       <div class="d-flex jc-center body-box">
@@ -21,18 +21,18 @@ export default {
   data() {
     return {
       config: {
-        header: ["组", "分支", "覆盖率"],
+        header: ["组", "分支", "覆盖率"],
         data: [
-          ["组1", "dev-1", "<span  class='colorGrass'>↑75%</span>"],
-          ["组2", "dev-2", "<span  class='colorRed'>↓33%</span>"],
-          ["组3", "dev-3", "<span  class='colorGrass'>↑100%</span>"],
-          ["组4", "rea-1", "<span  class='colorGrass'>↑94%</span>"],
-          ["组5", "rea-2", "<span  class='colorGrass'>↑95%</span>"],
-          ["组6", "fix-2", "<span  class='colorGrass'>↑63%</span>"],
-          ["组7", "fix-4", "<span  class='colorGrass'>↑84%</span>"],
-          ["组8", "fix-7", "<span  class='colorRed'>↓46%</span>"],
-          ["组9", "dev-2", "<span  class='colorRed'>↓13%</span>"],
-          ["组10", "dev-9", "<span  class='colorGrass'>↑76%</span>"]
+          ["组1", "dev-1", "<span  class='colorGrass'>↑75%</span>"],
+          ["组2", "dev-2", "<span  class='colorRed'>↓33%</span>"],
+          ["组3", "dev-3", "<span  class='colorGrass'>↑100%</span>"],
+          ["组4", "rea-1", "<span  class='colorGrass'>↑94%</span>"],
+          ["组5", "rea-2", "<span  class='colorGrass'>↑95%</span>"],
+          ["组6", "fix-2", "<span  class='colorGrass'>↑63%</span>"],
+          ["组7", "fix-4", "<span  class='colorGrass'>↑84%</span>"],
+          ["组8", "fix-7", "<span  class='colorRed'>↓46%</span>"],
+          ["组9", "dev-2", "<span  class='colorRed'>↓13%</span>"],
+          ["组10", "dev-9", "<span  class='colorGrass'>↑76%</span>"]
         ],
         rowNum: 7, //表格行数
         headerHeight: 35,

+ 14 - 7
ui/src/views/monitor/elec/centerRight2.vue

@@ -5,11 +5,18 @@
         <span style="color:#5cd9e8">
           <icon name="align-left"></icon>
         </span>
-        <span class="fs-xl text mx-2">产能分析</span>
+        <span class="fs-xl text mx-2">容量分析</span>
       </div>
       <div class="d-flex jc-center body-box" style=" margin-top: 0;">
         <dv-capsule-chart :config="config" style="width: 100%;height:2rem" />
-        <!-- ---------------------------------------- -->
+      </div>
+      <div class="d-flex pt-2 pl-2">
+        <span style="color:#5cd9e8">
+          <icon name="align-left"></icon>
+        </span>
+        <span class="fs-xl text mx-2">气体分析</span>
+      </div>
+      <div class="d-flex jc-center body-box" style=" margin-top: 0;">
         <centreRight2Chart1></centreRight2Chart1>
       </div>
     </div>
@@ -25,23 +32,23 @@ export default {
       config: {
         data: [
           {
-            name: "南阳",
+            name: "BCC",
             value: 167
           },
           {
-            name: "周口",
+            name: "公应工程",
             value: 67
           },
           {
-            name: "漯河",
+            name: "电厂",
             value: 123
           },
           {
-            name: "郑州",
+            name: "苯乙烯",
             value: 55
           },
           {
-            name: "西峡",
+            name: "碳一",
             value: 98
           }
         ]

+ 1 - 0
ui/src/views/monitor/elec/echart/bottom/bottomLeftChart.vue

@@ -156,6 +156,7 @@ export default {
         },
         legend: {
           data: [this.$t('已排放'),this.$t('计划排放'),this.$t('排放率')],
+          // data: ['Discharged','Planned emission','Emission rate'],
           textStyle: {
             color: "#B4B4B4"
           },

+ 7 - 7
ui/src/views/monitor/elec/echart/centerLeft2/centreLeft1Chart.vue

@@ -47,7 +47,7 @@ export default {
           icon: "circle",
           bottom: 0,
           x: "center",
-          data: ["rose1", "rose2", "rose3", "rose4", "rose5", "rose6"],
+          data: ["天然气", "长焰煤", "不粘煤", "弱粘煤", "贫煤", "燃气"],
           textStyle: {
             color: "#fff"
           }
@@ -60,12 +60,12 @@ export default {
             roseType: "area",
             center: ["50%", "40%"],
             data: [
-              { value: 10, name: "rose1" },
-              { value: 5, name: "rose2" },
-              { value: 15, name: "rose3" },
-              { value: 25, name: "rose4" },
-              { value: 20, name: "rose5" },
-              { value: 35, name: "rose6" }
+              { value: 10, name: "天然气" },
+              { value: 5, name: "长焰煤" },
+              { value: 15, name: "不粘煤" },
+              { value: 25, name: "弱粘煤" },
+              { value: 20, name: "贫煤" },
+              { value: 35, name: "燃气" }
             ]
           }
         ]

+ 11 - 12
ui/src/views/monitor/elec/echart/centerLeft2/centreLeft2Chart.vue

@@ -28,16 +28,15 @@ export default {
           interval: 1,
           type: "category",
           data: [
-            "there1",
-            "there2",
-            "there3",
-            "there4",
-            "there5",
-            "there6",
-            "there7",
-            "there8",
-            "there9",
-            "there10 "
+            "核电",
+            "火电",
+            "机电",
+            "煤电",
+            "水电",
+            "风电",
+            "太阳能",
+            "光伏",
+            "其他 "
           ],
           z: 10,
           axisLine: {
@@ -177,14 +176,14 @@ export default {
                   }
                 }
               },
-              {
+              /*{
                 value: 33,
                 itemStyle: {
                   normal: {
                     color: "#ff62e8"
                   }
                 }
-              }
+              }*/
             ],
             coordinateSystem: "polar"
           }

+ 1 - 1
ui/src/views/monitor/elec/echart/centreRight2/centreRight2Chart1.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div id="centreRight2Chart1" style="width:3.25rem; height: 2.60rem;">123</div>
+    <div id="centreRight2Chart1" style="width:3.25rem; height: 2.60rem;" />
   </div>
 </template>
 

+ 299 - 0
ui/src/views/monitor/elec/elecindex.vue

@@ -0,0 +1,299 @@
+<template>
+  <div id="elec-index"  ref="appRef">
+    <dv-loading v-if="loading">Loading...</dv-loading>
+    <div v-else class="host-body">
+      <div class="d-flex jc-center">
+        <dv-decoration-10 style="width:33.3%;height:.0625rem;" />
+        <div class="d-flex jc-center">
+          <dv-decoration-8 :color="['#568aea', '#000000']" style="width:2.5rem;height:.625rem;" />
+          <div class="title">
+            <span class="title-text">电厂监控大屏</span>
+            <dv-decoration-6
+              class="title-bototm"
+              :reverse="true"
+              :color="['#50e3c2', '#67a1e5']"
+              style="width:3.125rem;height:.1rem;"
+            />
+          </div>
+          <dv-decoration-8
+            :reverse="true"
+            :color="['#568aea', '#000000']"
+            style="width:2.5rem;height:.625rem;"
+          />
+        </div>
+        <dv-decoration-10 style="width:33.3%;height:.0625rem; transform: rotateY(180deg);" />
+      </div>
+
+      <!-- 第二行 -->
+      <div class="d-flex jc-between px-2">
+        <div class="d-flex" style="width: 40%">
+          <div
+            class="react-right ml-4"
+            style="width: 6.25rem; text-align: left;background-color: #0f1325;"
+          >
+            <span class="react-before"></span>
+            <span class="text"></span>
+          </div>
+          <div class="react-right ml-3" style="background-color: #0f1325;">
+            <span class="text colorBlue"></span>
+          </div>
+        </div>
+        <div style="width: 40%" class="d-flex">
+          <div class="react-left bg-color-blue mr-3">
+            <span class="text fw-b">北京时间</span>
+          </div>
+          <div
+            class="react-left mr-4"
+            style="width: 6.25rem; background-color: #0f1325; text-align: right;"
+          >
+            <span class="react-after"></span>
+            <span class="text">{{dateYear}} {{dateWeek}} {{dateDay}}</span>
+          </div>
+        </div>
+      </div>
+
+      <div class="body-box">
+        <!-- 第三行数据 -->
+        <div class="content-box">
+          <div>
+            <dv-border-box-12>
+              <centerLeft1 />
+            </dv-border-box-12>
+          </div>
+          <div>
+            <dv-border-box-12>
+              <centerLeft2 />
+            </dv-border-box-12>
+          </div>
+          <!-- 中间 -->
+          <div>
+            <center />
+          </div>
+          <!-- 中间 -->
+          <div>
+            <centerRight2 />
+          </div>
+          <div>
+            <dv-border-box-13>
+              <centerRight1 />
+            </dv-border-box-13>
+          </div>
+        </div>
+
+        <!-- 第四行数据 -->
+        <div class="bototm-box">
+          <dv-border-box-13>
+            <bottomLeft />
+          </dv-border-box-13>
+          <dv-border-box-12>
+            <bottomRight />
+          </dv-border-box-12>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import centerLeft1 from "./centerLeft1";
+import centerLeft2 from "./centerLeft2";
+import centerRight1 from "./centerRight1";
+import centerRight2 from "./centerRight2";
+import center from "./center";
+import bottomLeft from "./bottomLeft";
+import bottomRight from "./bottomRight";
+import '@/assets/styles/index.scss' // global css
+import '@/common/flexible.js';
+import dayjs from "dayjs";
+
+export default {
+  data() {
+    return {
+      loading: true,
+      dashboard: 1,
+      dateDay: null,
+      dateYear: null,
+      dateWeek: null,
+      weekday: ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
+      timer:null
+    };
+  },
+  components: {
+    centerLeft1,
+    centerLeft2,
+    centerRight1,
+    centerRight2,
+    center,
+    bottomLeft,
+    bottomRight
+  },
+  mounted() {
+    this.timer = setInterval(()=>{
+      const date= dayjs(new Date());
+      this.dateDay = date.format('HH:mm:ss');
+      this.dateYear = date.format('YYYY年MM月DD日');
+      this.dateWeek = date.format(this.weekday[date.day()]);
+    },1000),
+      this.setScale();
+    window.addEventListener("resize", this.debounce(this.setScale, 100));
+    // * 适配处理
+    this.cancelLoading();
+  },
+  methods: {
+    cancelLoading() {
+      setTimeout(() => {
+        this.loading = false;
+      }, 500);
+    },
+
+    getScale() {
+      let { width, height } = this;
+      let wh = window.innerHeight / height;
+      let ww = window.innerWidth / width;
+      console.log(ww < wh ? ww : wh);
+      return ww < wh ? ww : wh;
+    },
+    setScale() {
+      if(window.innerHeight ==1080){
+        this.height = 1080
+      }else{
+        this.height = 937
+
+      }
+      this.scale = this.getScale();
+      if (this.$refs.ScaleBox) {
+        this.$refs.ScaleBox.style.setProperty("--scale", this.scale);
+      }
+    },
+    debounce(fn, delay) {
+      let delays = delay || 500;
+      let timer;
+      return function () {
+        let th = this;
+        let args = arguments;
+        if (timer) {
+          clearTimeout(timer);
+        }
+        timer = setTimeout(function () {
+          timer = null;
+          fn.apply(th, args);
+        }, delays);
+      };
+    },
+  }
+};
+</script>
+
+<style lang="scss">
+#elec-index {
+  color: #d3d6dd;
+  background-color: #000000;
+  width: 100%;
+  height: 100vh;
+  .bg {
+    padding: 0.2rem 0.2rem 0 0.2rem;
+    background-size: cover;
+    background-position: center center;
+    background-image: url("../../../assets/image/pageBg.png");
+  }
+
+  .host-body {
+    .title {
+      position: relative;
+      width: 6.25rem;
+      text-align: center;
+      background-size: cover;
+      background-repeat: no-repeat;
+
+      .title-text {
+        font-size: 0.4rem;
+        position: absolute;
+        bottom: 0;
+        left: 50%;
+        top: 30%;
+        transform: translate(-50%);
+        font-weight: 600;
+      }
+
+      .title-bototm {
+        position: absolute;
+        bottom: -0.375rem;
+        left: 50%;
+        transform: translate(-50%);
+      }
+    }
+
+    // 平行四边形
+    .react-left {
+      cursor: pointer;
+      font-size: 0.225rem;
+      width: 3.75rem;
+      height: 0.625rem;
+      line-height: 0.625rem;
+      text-align: center;
+      transform: skewX(-45deg);
+
+      .react-after {
+        position: absolute;
+        right: -0.3125rem;
+        top: 0;
+        height: 0.625rem;
+        width: 0.625rem;
+        background-color: #0f1325;
+        transform: skewX(45deg);
+      }
+
+      .text {
+        display: inline-block;
+        transform: skewX(45deg);
+      }
+    }
+
+    .react-right {
+      cursor: pointer;
+      font-size: 0.225rem;
+      width: 3.75rem;
+      height: 0.625rem;
+      line-height: 0.625rem;
+      text-align: center;
+      transform: skewX(45deg);
+
+      .react-before {
+        position: absolute;
+        left: -0.3125rem;
+        top: 0;
+        height: 0.625rem;
+        width: 0.625rem;
+        background-color: #0f1325;
+        transform: skewX(-45deg);
+      }
+
+      .text {
+        display: inline-block;
+        transform: skewX(-45deg);
+      }
+    }
+
+    .body-box {
+      margin-top: 0.2rem;
+      display: flex;
+      flex-direction: column;
+
+      //下方区域的布局
+      .content-box {
+        display: grid;
+        grid-template-columns: 2fr 3fr 5fr 3fr 2fr;
+      }
+      // 底部数据
+      .bototm-box {
+        margin-top: 0.125rem;
+        display: grid;
+        grid-template-columns: repeat(2, 50%);
+      }
+    }
+  }
+}
+.fs-xl {
+  font-size: 0.14rem;
+}
+</style>