equip_system_web.git

parent: d33a2e65 | 补丁 | 提交 | ignore whitespace

whychdw

2020-07-23 b0312118bfe3e400f243cdbe5578ae8be5930ba6

内容提交

6个文件已修改

	public/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/assets/js/config.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/PageNav.vue	44 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/pages/batt-list/history-page.vue	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/pages/file/index.vue	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/pages/login.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 public/index.html

@@ -5,7 +5,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
    <title>FMDS设备数据记录平台</title>
    <title>系统运行记录软件</title>
  </head>
  <body>
    <noscript>

 src/assets/js/config.js

@@ -3,4 +3,6 @@
        'http://localhost:8919/Equip_System/':'',
    url:process.env.NODE_ENV == 'dev'?
    'http://localhost:8919/Equip_System/':'',
    root: process.env.NODE_ENV == 'dev'?
    'http://localhost:8919/':'../',
};

 src/components/PageNav.vue

@@ -4,11 +4,13 @@
            <ul>
                <li 
                v-for="(nav, key) in navs" :key="key"
                :class="{'active-nav': checkName(nav)}"
                :class="{'active-nav': nav.name==getActiveName}"
                @click="navClick(nav)">
                    <div class="parent-menu">
                        <router-link :to="nav.router">{{nav.txt}}</router-link>
                        <div class="child-menu" v-if="nav.childrens">
                        <div class="child-menu" 
                        :class="{'hide': hide}"
                        v-if="nav.childrens">
                            <ul>
                                <li
                                v-for="children in nav.childrens" :key="children.txt">
@@ -27,6 +29,7 @@
    name: 'PageNav',
    data() {
        return  {
            hide: false,
            navs: [
                {
                    txt: '实时数据',
@@ -52,12 +55,7 @@
                            txt: '用户信息管理',
                            name: 'PagesUser',
                            router: '/user/info',
                        },
                        // {
                        //     txt: '用户权限管理',
                        //     name: 'PagesUser',
                        //     router: '/user/power', 
                        // }
                        }
                    ],
                },
                {
@@ -70,8 +68,14 @@
    },
    methods: {
        navClick: function(data) {
            // 关闭子菜单
            this.hide = true;
            setTimeout(()=>{
                this.hide = false;
            }, 0);
            
            // 已经激活
            if(data.active) {
            if(data.active || data.childrens) {
                return;
            }
            // 导航激活状态
@@ -82,19 +86,13 @@
                index: 0,
                cutOut: false,
            });
        },
        childNavClick: function(data) {
            console.log(data);
        },
        checkName: function(nav) {
            var name = nav.name;
            var router = nav.router;
            if(name && router) {
                var navName = this.$store.state.navName;
                return navName.indexOf(name) == -1?false:true;
            }
            return false;
            
            
        },
    },
    computed: {
        getActiveName() {
            return this.$store.state.navName;
        }
    }
}
@@ -185,6 +183,10 @@
.parent-menu:hover .child-menu {
    display: block;
}
/* 关闭下来框 */
.parent-menu:hover .child-menu.hide {
    display: none;
}
</style>



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

@@ -94,7 +94,9 @@
            <input type="hidden" name="dev_name" v-model="dev_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">
            <input type="hidden" name="record_time" v-model="searchTime.record_time">
            <input type="hidden" name="record_time1" v-model="searchTime.record_time1">
            <input type="hidden" name="list" v-model="showChartState">
        </form>
        <progress-load 
        :show="progress.show"
@@ -149,8 +151,13 @@
            sliderOptions: {},
            drawer: false,
            showChartTitle: [],
            showChartState: [],
            record_time: new Date(record_time),
            record_time1: new Date(record_time1),
            searchTime: {
                record_time: '',
                record_time1: '',
            },
            pickerRange: {
                start: '2019-01-01 00:00:00',
                end: new Date().format('yyyy-MM-dd hh:mm:ss'),
@@ -464,6 +471,11 @@
                record_time1: this.record_time1.format("yyyy-MM-dd hh:mm:ss"),
                list: list
            };

            // 存储查询时间
            this.searchTime.record_time = this.record_time.format("yyyy-MM-dd hh:mm:ss");
            this.searchTime.record_time1 = this.record_time1.format("yyyy-MM-dd hh:mm:ss");

            return result;
        },
        initOptions() {
@@ -715,10 +727,13 @@
        setShowChartTille: function() {
            var options = this.options;
            this.showChartTitle = [];
            this.showChartState = [];
            for(let key in options) {
                var option = options[key];
                if(option.show) {
                    this.showChartTitle.push(option.title);
                    let state = 'state'+(Number(key.replace('chart', ''))+1);
                    this.showChartState.push(state);
                }
            }
        },
@@ -738,7 +753,9 @@
                            dev_name: this.dev_name,
                            table_name: this.getTableName,
                            states: this.getState,
                            dis: this.allData,
                            list: this.showChartState,
                            record_time: this.searchTime.record_time,
                            record_time1: this.searchTime.record_time1,
                        };
                        // 请求后台获取数据
                        this.$api.file.download(searchParams)

 src/pages/file/index.vue

@@ -303,31 +303,7 @@
        },
        // 查看文件
        viewFolder () {
            this.$api.file.getParams().then((res) => {
                var re = JSON.parse(res.data.result);
                // console.log(re, '====re');
                if (re.code == 1) {
                    this.$api.file.viewFolder(re.data[0].backup_path).then((res) => {
                        let data = JSON.parse(res.data.result);
                        if (data.code) {
                            this.$message({
                                type: 'success',
                                message: data.msg
                            });
                        } else {
                            this.$message({
                                type: 'warning',
                                message: data.msg
                            });
                        }
                    });
                } else {
                    this.$message({
                        type: 'warning',
                        message: re.msg
                    });
                }
            });
            window.open(this.$config.root+'ftpbackup', 'ftpbackup');
        },
        // 查询配置
        getParams () {

 src/pages/login.vue

@@ -12,7 +12,9 @@
                                placeholder="请输入用户名"
                                prefix-icon="el-icon-user-solid"
                                clearable
                                @focus="focus">
                                :autofocus="true"
                                @focus="focus"
                                @keyup.enter.native="login">
                                </el-input>
                            </div>
                            <!-- <div class="input-item">
@@ -87,7 +89,7 @@
       return {
           loading: false,
           user: {
               name: 'superuser',
               name: '',
               password: '123456',
               identify: ''
           },

			@@ -5,7 +5,7 @@
			<meta http-equiv="X-UA-Compatible" content="IE=edge">
			<meta name="viewport" content="width=device-width,initial-scale=1.0">
			<link rel="icon" href="<%= BASE_URL %>favicon.ico">
			<title>FMDS设备数据记录平台</title>
			<title>系统运行记录软件</title>
			</head>
			<body>
			<noscript>

			@@ -3,4 +3,6 @@
			'http://localhost:8919/Equip_System/':'',
			url:process.env.NODE_ENV == 'dev'?
			'http://localhost:8919/Equip_System/':'',
			root: process.env.NODE_ENV == 'dev'?
			'http://localhost:8919/':'../',
			};

			@@ -4,11 +4,13 @@
			<ul>
			<li
			v-for="(nav, key) in navs" :key="key"
			:class="{'active-nav': checkName(nav)}"
			:class="{'active-nav': nav.name==getActiveName}"
			@click="navClick(nav)">
			<div class="parent-menu">
			<router-link :to="nav.router">{{nav.txt}}</router-link>
			<div class="child-menu" v-if="nav.childrens">
			<div class="child-menu"
			:class="{'hide': hide}"
			v-if="nav.childrens">
			<ul>
			<li
			v-for="children in nav.childrens" :key="children.txt">
			@@ -27,6 +29,7 @@
			name: 'PageNav',
			data() {
			return {
			hide: false,
			navs: [
			{
			txt: '实时数据',
			@@ -52,12 +55,7 @@
			txt: '用户信息管理',
			name: 'PagesUser',
			router: '/user/info',
			},
			// {
			// txt: '用户权限管理',
			// name: 'PagesUser',
			// router: '/user/power',
			// }
			}
			],
			},
			{
			@@ -70,8 +68,14 @@
			},
			methods: {
			navClick: function(data) {
			// 关闭子菜单
			this.hide = true;
			setTimeout(()=>{
			this.hide = false;
			}, 0);

			// 已经激活
			if(data.active) {
			if(data.active \|\| data.childrens) {
			return;
			}
			// 导航激活状态
			@@ -82,19 +86,13 @@
			index: 0,
			cutOut: false,
			});
			},
			childNavClick: function(data) {
			console.log(data);
			},
			checkName: function(nav) {
			var name = nav.name;
			var router = nav.router;
			if(name && router) {
			var navName = this.$store.state.navName;
			return navName.indexOf(name) == -1?false:true;
			}
			return false;


			},
			},
			computed: {
			getActiveName() {
			return this.$store.state.navName;
			}
			}
			}
			@@ -185,6 +183,10 @@
			.parent-menu:hover .child-menu {
			display: block;
			}
			/* 关闭下来框 */
			.parent-menu:hover .child-menu.hide {
			display: none;
			}
			</style>

			@@ -94,7 +94,9 @@
			<input type="hidden" name="dev_name" v-model="dev_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">
			<input type="hidden" name="record_time" v-model="searchTime.record_time">
			<input type="hidden" name="record_time1" v-model="searchTime.record_time1">
			<input type="hidden" name="list" v-model="showChartState">
			</form>
			<progress-load
			:show="progress.show"
			@@ -149,8 +151,13 @@
			sliderOptions: {},
			drawer: false,
			showChartTitle: [],
			showChartState: [],
			record_time: new Date(record_time),
			record_time1: new Date(record_time1),
			searchTime: {
			record_time: '',
			record_time1: '',
			},
			pickerRange: {
			start: '2019-01-01 00:00:00',
			end: new Date().format('yyyy-MM-dd hh:mm:ss'),
			@@ -464,6 +471,11 @@
			record_time1: this.record_time1.format("yyyy-MM-dd hh:mm:ss"),
			list: list
			};

			// 存储查询时间
			this.searchTime.record_time = this.record_time.format("yyyy-MM-dd hh:mm:ss");
			this.searchTime.record_time1 = this.record_time1.format("yyyy-MM-dd hh:mm:ss");

			return result;
			},
			initOptions() {
			@@ -715,10 +727,13 @@
			setShowChartTille: function() {
			var options = this.options;
			this.showChartTitle = [];
			this.showChartState = [];
			for(let key in options) {
			var option = options[key];
			if(option.show) {
			this.showChartTitle.push(option.title);
			let state = 'state'+(Number(key.replace('chart', ''))+1);
			this.showChartState.push(state);
			}
			}
			},
			@@ -738,7 +753,9 @@
			dev_name: this.dev_name,
			table_name: this.getTableName,
			states: this.getState,
			dis: this.allData,
			list: this.showChartState,
			record_time: this.searchTime.record_time,
			record_time1: this.searchTime.record_time1,
			};
			// 请求后台获取数据
			this.$api.file.download(searchParams)

			@@ -303,31 +303,7 @@
			},
			// 查看文件
			viewFolder () {
			this.$api.file.getParams().then((res) => {
			var re = JSON.parse(res.data.result);
			// console.log(re, '====re');
			if (re.code == 1) {
			this.$api.file.viewFolder(re.data[0].backup_path).then((res) => {
			let data = JSON.parse(res.data.result);
			if (data.code) {
			this.$message({
			type: 'success',
			message: data.msg
			});
			} else {
			this.$message({
			type: 'warning',
			message: data.msg
			});
			}
			});
			} else {
			this.$message({
			type: 'warning',
			message: re.msg
			});
			}
			});
			window.open(this.$config.root+'ftpbackup', 'ftpbackup');
			},
			// 查询配置
			getParams () {

			@@ -12,7 +12,9 @@
			placeholder="请输入用户名"
			prefix-icon="el-icon-user-solid"
			clearable
			@focus="focus">
			:autofocus="true"
			@focus="focus"
			@keyup.enter.native="login">
			</el-input>
			</div>
			<!-- <div class="input-item">
			@@ -87,7 +89,7 @@
			return {
			loading: false,
			user: {
			name: 'superuser',
			name: '',
			password: '123456',
			identify: ''
			},