修改内容

whychdw

2020-07-13 d58a3c637b84d8aa33268c85033055eb38e5fe18

修改内容

 src/components/PageHeader.vue

@@ -5,7 +5,7 @@
        </div>
        <div class="page-right">
            <span>{{$store.state.login.username}} </span>|
            <span>修改密码 </span>| 
            <!-- <span>修改密码 </span>|  -->
            <router-link tag="span" to="/login">退出登录</router-link>
        </div>
    </div>

 src/components/chart/LineChart.vue

@@ -1,6 +1,9 @@
<template>
    <div class="chart-container" :style="getStyle">
        <div class="chart-content-container" :class="{'chart-content-fixed':isFull}">
    <div class="chart-container" :style="getStyle" >
        <div class="chart-content-container" 
        @mouseenter="mouseEnter"
        @mouseleave="mouseLeave"
        :class="{'chart-content-fixed':isFull}">
            <div class="chart-content" :id="id"></div>
            <!-- <div class="chart-tools">
                <i class="iconfont icon-biaoge"></i>
@@ -203,7 +206,13 @@
            this.$nextTick(()=>{
                this.chart.resize();
            });
        }
        },
        mouseEnter() {
            console.log(123);
        },
        mouseLeave() {
            console.log(456);
        },
    },
    computed: {
        getStyle(){

 src/pages/batt-list/history-page.vue

@@ -81,7 +81,7 @@
            <input type="hidden" name="PageName" value="history"/>
            <input type="hidden" name="echart" v-model="base64" />
            <input type="hidden" name="dev_name" v-model="dev_name" />
            <input type="hidden" name="table_name" v-model="table_name">
            <input type="hidden" name="table_name" v-model="getTableName">
            <input type="hidden" name="state" v-model="getState" />
            <input type="hidden" name="dis" v-model="allData">
        </form>
@@ -134,7 +134,6 @@
            },
            base64: '',
            dev_name: '',
            table_name: '',
            allData: [],
            action: action,
        }
@@ -405,7 +404,6 @@
            let checkFormResult = this.checkFromData();
            if(checkFormResult.code == 1) {
                let chart = '';
                this.table_name = checkFormResult.data.table_name;
                // 设置配置项
                for(let key in this.options) {
                    if(this.options[key].show) {
@@ -479,6 +477,10 @@
        getState() {
            return this.showChartTitle.join(',');
        },
        getTableName() {
            return new Date(this.record_time).format("yyyy-MM-dd")+'-'
            +new Date(this.record_time1).format("yyyy-MM-dd");
        },
    },
    mounted() {
        let self = this;

 src/pages/batt-list/index.vue

@@ -70,7 +70,6 @@
                    result[index].children.push(_data);
                }
            }
            console.log(result[0].children);
            this.treeData = result;
        },
        checkDataInTree(list, data) {

 src/pages/login.vue

@@ -15,16 +15,17 @@
                                @focus="focus">
                                </el-input>
                            </div>
                            <div class="input-item">
                            <!-- <div class="input-item">
                                <el-input
                                v-model="user.password"
                                type="password"
                                placeholder="请输入密码"
                                prefix-icon="el-icon-lock"
                                clearable
                                :disabled="true"
                                @focus="focus">
                                </el-input>
                            </div>
                            </div> -->
                            <!-- <div class="flex-row">
                                <div class="input-item">
                                    <el-input