提交内容

whychdw

2021-01-09 8aaa1d4deb6f764f93a9ee49f9b4be7620e024e1

提交内容

 src/components/CalendarTime.vue

@@ -1,92 +1,42 @@
<template>
    <div class="time-wrapper" :class="{'mini-size':size=='mini'}">
        <div class="time-icon"><i class="iconfont el-icon-1rili_huaban12"></i></div>
        <div class="time-content">
            <div class="time-number-wrapper">
                <div class="time-number">2</div>
            </div>
        </div>
        <div class="time-content">
            <div class="time-number-wrapper">
                <div class="time-number">0</div>
            </div>
        </div>
        <div class="time-content">
            <div class="time-number-wrapper">
                <div class="time-number">2</div>
            </div>
        </div>
        <div class="time-content">
            <div class="time-number-wrapper">
                <div class="time-number">0</div>
            </div>
        </div>
    <time-number></time-number>
    <time-number></time-number>
    <time-number></time-number>
    <time-number></time-number>
        <span class="time-text">年</span>
        <div class="time-content">
            <div class="time-number-wrapper">
                <div class="time-number">1</div>
            </div>
        </div>
        <div class="time-content">
            <div class="time-number-wrapper">
                <div class="time-number">2</div>
            </div>
        </div>
    <time-number></time-number>
    <time-number></time-number>
        <span class="time-text">月</span>
        <div class="time-content">
            <div class="time-number-wrapper">
                <div class="time-number">1</div>
            </div>
        </div>
        <div class="time-content">
            <div class="time-number-wrapper">
                <div class="time-number">2</div>
            </div>
        </div>
    <time-number></time-number>
    <time-number></time-number>
        <span class="time-text">日</span>
        <div class="time-content time-division">
            <div class="time-number-wrapper">
                <div class="time-number">2</div>
            </div>
        </div>
        <div class="time-content">
            <div class="time-number-wrapper">
                <div class="time-number">2</div>
            </div>
        </div>
    <span class="time-division"></span>
    <time-number></time-number>
    <time-number></time-number>
        <span class="time-text">时</span>
        <div class="time-content">
            <div class="time-number-wrapper">
                <div class="time-number">2</div>
            </div>
        </div>
        <div class="time-content">
            <div class="time-number-wrapper">
                <div class="time-number">2</div>
            </div>
        </div>
    <time-number></time-number>
    <time-number></time-number>
        <span class="time-text">分</span>
        <div class="time-content">
            <div class="time-number-wrapper">
                <div class="time-number">2</div>
            </div>
        </div>
        <div class="time-content">
            <div class="time-number-wrapper">
                <div class="time-number">2</div>
            </div>
        </div>
    <time-number></time-number>
    <time-number></time-number>
        <span class="time-text">秒</span>
    </div>
</template>

<script>
import TimeNumber from "@/pages/dataMager/components/TimeNumber";

export default {
    name: "CalendarTime",
  components: {
    TimeNumber
  },
    props: {
        date: {
            type: String,
            default: ""
      default: "2021-01-01 00:00:00"
        },
        size: {
            type: String,
@@ -96,6 +46,21 @@
    data() {
        return {}
    },
  computed: {
    timerVals() {
      let sTimer = new Date(this.date).format("yyyy-MM-dd hh:mm:ss");
      let aTimer = sTimer.split(" ");
      console.log(aTimer);
      return {
        year: [],
        month: [],
        day: [],
        hour: [],
        minute: [],
        second: []
      }
    }
  }
}
</script>

@@ -103,6 +68,7 @@
.time-wrapper {
    white-space: nowrap;
}

.time-icon {
    display: inline-block;
    padding: 12px;
@@ -111,77 +77,30 @@
    margin-right: 8px;
    vertical-align: top;
}

.time-icon i {
    font-size: 28px;
    color: #041F6C;
}
.time-content {
    display: inline-block;
    margin-left: 8px;
}

.time-division {
    margin-left: 32px;
}
.time-wrapper {
    display: inline-block;
}

.time-number-wrapper {
    position: relative;
}

.time-number-wrapper:before,
.time-number-wrapper:after {
    content: "";
    position: absolute;
    display: block;
    width: 100%;
    height: 50%;
    box-sizing: border-box;
    z-index: 0;
}

.time-number-wrapper:before {
    top: 0;
    background-color: #29A0C5;
}

.time-number-wrapper:after {
    bottom: 0;
    background-color: #40C3F3;
}

.time-number {
    position: relative;
    padding: 4px 4px;
    font-size: 36px;
    color: #FFF100;
    font-weight: bold;
    text-align: center;
    z-index: 1;
}
.time-text {
    font-size: 14px;
    color: #00fefe;
    margin-left: 8px;
    vertical-align: middle;
}

/* mini-size */
.mini-size .time-icon {
    padding: 8px 8px 8px 8px;
    margin-right: 4px;
}

.mini-size .time-icon i {
    font-size: 24px;
}
.mini-size .time-content {
    margin-left: 6px;
}
.mini-size .time-number {
    padding: 3px 3px;
    font-size: 24px;
}
.mini-size .time-division {
    margin-left: 24px;
}
</style>

 src/components/chart/LineChart.vue

@@ -69,7 +69,6 @@
        },
        setOption(opt) {
            let option = this.getOption(opt);
            console.log(option);
            // 清理画布
            this.$G.chartManage.get(this.id).clear();
            // 设置配置项

 src/pages/dataMager/components/ChargerStatusTabPane.vue

@@ -99,6 +99,13 @@
      default: ""
    },
  },
  watch: {
    "$store.state.theme.collapse"() {
      this.$nextTick(() => {
        this.resize();
      });
    },
  },
  data() {
    return {
      chargerVol: {

 src/pages/dataMager/components/IsolatingDeviceTabPane.vue

@@ -182,6 +182,13 @@
            default: ""
        }
    },
    watch: {
      "$store.state.theme.collapse"() {
        this.$nextTick(() => {
          this.resize();
        });
      },
    },
    data() {
        let resLineConfig = {
            axisLineColor: "#125984",

 src/pages/dataMager/components/TimeNumber.vue

@@ -1,5 +1,9 @@
<template>
$END$
  <div class="time-content">
    <div class="time-number-wrapper">
      <div class="time-number">2</div>
    </div>
  </div>
</template>

<script>
@@ -9,5 +13,51 @@
</script>

<style scoped>
.time-content {
  display: inline-block;
  margin-left: 8px;
}

.time-number-wrapper {
  position: relative;
}

.time-number-wrapper:before,
.time-number-wrapper:after {
  content: "";
  position: absolute;
  display: block;
  width: 100%;
  height: 50%;
  box-sizing: border-box;
  z-index: 0;
}

.time-number-wrapper:before {
  top: 0;
  background-color: #29A0C5;
}

.time-number-wrapper:after {
  bottom: 0;
  background-color: #40C3F3;
}

.time-number {
  position: relative;
  padding: 4px 4px;
  font-size: 36px;
  color: #FFF100;
  font-weight: bold;
  text-align: center;
  z-index: 1;
}
.mini-size .time-content {
  margin-left: 6px;
}

.mini-size .time-number {
  padding: 3px 3px;
  font-size: 24px;
}
</style>

 src/pages/dataMager/components/paramModule.vue

@@ -38,8 +38,8 @@
    align-items: center;
}
.param-right {
    width: 72px;
    height: 72px;
    width: 100px;
    height: 100px;
    border: 2px solid #00fefe;
    border-radius: 50%;
    display: flex;
@@ -52,10 +52,12 @@
    position: absolute;
    content: "";
    display: block;
    width: 36px;
    height: 36px;
    left: 15px;
    top: 15px;
    width: 60px;
    height: 60px;
    left: 50%;
    top: 50%;
  margin-left: -30px;
  margin-top: -30px;
    border: 1px dashed #00fefe;
    border-radius: 50%;
}
@@ -65,18 +67,20 @@
    display: block;
    width: 26px;
    height: 26px;
    left: 20px;
    top: 20px;
  top: 50%;
  left: 50%;
  margin-top: -13px;
  margin-left: -13px;
    border: 1px solid #00fefe;
    border-radius: 50%;
}
.param-right .rotate {
    width: 60px;
    height: 60px;
    width: 50px;
    height: 50px;
    border: 6px solid #fa884c;
    position: absolute;
    left: 4px;
    top: 4px;
    left: 24px;
    top: 24px;
    -webkit-clip-path: circle(50% at 100% 0%);
    border-radius: 50%;
    /*-webkit-animation: rotate 2s infinite linear;*/
@@ -103,8 +107,8 @@
    }
}
.param-left {
    width: 140px;
    height: 62px;
    width: 160px;
    height: 70px;
    background-color: #00fefe;
    border-radius: 0 30px 30px 0;
    border: 1px solid #fa884c;
@@ -123,7 +127,7 @@
.param-left .dataCon {
  display: inline-block;
  min-width: 50px;
    font-size: 13px;
    font-size: 22px;
  text-align: center;
    color: #fa884c;
    padding: 4px;

 src/pages/dataMager/realTimeData.vue

@@ -67,6 +67,11 @@
                this.getPowerInfo(powerDeviceId);
            });
        },
    "$store.state.theme.collapse"() {
      this.$nextTick(() => {
        this.resize();
      });
    },
    },
    methods: {
        getPowerInfo(powerDeviceId) {
@@ -131,7 +136,6 @@
        },
        onMessage(res) {
            let rs = JSON.parse(res.data);
            console.log(rs);
            if (rs.code == 1 && rs.data.length != 0) {
                this.info = rs.data[0];
            } else {
@@ -193,6 +197,7 @@
.mgl8 {
    margin-left: 8px;
}

.flex-page-content {
    padding: 4px 4px 0 4px;
    box-sizing: border-box;

 src/pages/dataTest/movingRingSystem/HomeList.vue

@@ -92,6 +92,8 @@
            }
        },
        toggleChange() {
            // 触发折叠/展开
            this.$store.dispatch("theme/changeCollapse");
            this.$emit('toggleChange');
        },
        // 查询机房的信息

 src/pages/dataTest/movingRingSystem/chargerStatus.vue

@@ -55,9 +55,6 @@
            stationName5: "",
          };
        }
        // 初始化WebSocket
        this.close();
        this.initSocket();
      }).catch(error => {
        console.log(error);
      });

 src/pages/dataTest/movingRingSystem/isolatingDevice.vue

@@ -56,9 +56,6 @@
            stationName5: "",
          };
        }
        // 初始化WebSocket
        this.close();
        this.initSocket();
      }).catch(error => {
        console.log(error);
      });

 src/pages/dataTest/movingRingSystem/realTime.vue

@@ -387,6 +387,12 @@
                this.getBattGroupInfo(BattGroupId);
            });
        },
        "$store.state.theme.collapse"() {
          console.log(123);
          this.$nextTick(()=>{
            this.resize();
          });
        },
    },
    data() {
        let permits = this.$store.state.user.permits;

 src/pages/dataTest/realTime.vue

@@ -286,7 +286,12 @@
        if(!val && this.acTabs == "niBianInfoTab") {
          this.acTabs = "eleLine";
        }
      }
      },
      "$store.state.theme.collapse"() {
        this.$nextTick(()=>{
          this.resize();
        });
      },
        },
        data() {
            let permits = this.$store.state.user.permits;

 src/store/modules/theme.js

@@ -5,6 +5,7 @@
            themeName: "",
            fontTimes: 1,
            close: 0,
            collapse: 0,
        }
    },
    mutations: {
@@ -16,6 +17,9 @@
        },
        changeClose(state) {
            state.close = Math.random();
        },
        changeCollapse(state) {
            state.collapse = Math.random();
        }
    },
    actions: {
@@ -27,6 +31,9 @@
        },
        changeClose(context) {
            context.commit('changeClose');
        },
        changeCollapse(context) {
            context.commit("changeCollapse")
        }
    },
}