From 16d7104f8bb00f2f7dcd518c1dd0f63d76072a98 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期五, 18 九月 2020 10:22:52 +0800
Subject: [PATCH] 修复卡片窗口缩放bug
---
src/pages/settings/components/BasicSetting.vue | 205 ++++++++++++++-------------------------------------
1 files changed, 56 insertions(+), 149 deletions(-)
diff --git a/src/pages/settings/components/BasicSetting.vue b/src/pages/settings/components/BasicSetting.vue
index 255e35d..34573a2 100644
--- a/src/pages/settings/components/BasicSetting.vue
+++ b/src/pages/settings/components/BasicSetting.vue
@@ -5,7 +5,7 @@
v-model="activeName"
v-loading="loading"
:element-loading-text="loadingText"
- type="card"
+ type="border-card"
>
<!-- 鏈満淇℃伅 -->
<el-tab-pane label="鏈満淇℃伅" name="first">
@@ -76,7 +76,7 @@
<template slot="title">
<b class="tree-font">璇︾粏淇℃伅</b>
</template>
- <el-menu-item-group class="item-group">
+ <el-menu-item-group class="item-group desc-info">
<el-row :gutter="gutter">
<el-col :span="12" class="flex-box">
<div class="xiangqin-label">ID</div>
@@ -160,101 +160,6 @@
</el-submenu>
<!-- 瀵瑰鏈嶅姟IP 鏀瑰悕涓哄閮ㄧ綉缁�(鏂皌ab)-->
- <!-- 鏂囦欢闊宠棰� -->
- <!-- <el-submenu index="4">
- <template slot="title">
- <b class="tree-font">鏂囦欢闊宠棰�</b>
- </template>
- <el-menu-item-group class="item-group">
- <el-row :gutter="20">
- <el-col :span="8">
- <div class="p5">
- <span class="iconfont iconpicture" style="margin-right: 5px;"></span>
- <span class="mr10">鍥剧墖绔彛</span>
- <el-input v-model="localFile.picPort" style="width:300px;" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
- </div>
- <div class="p5">
- <span class="iconfont iconshipin" style="margin-right: 5px;"></span>
- <span class="mr10">瑙嗛绔彛</span>
- <el-input v-model="localFile.videoPort" style="width:300px;" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
- </div>
- <div class="p5">
- <span class="iconfont iconyinpinx" style="margin-right: 5px;"></span>
- <span class="mr10">闊抽绔彛</span>
- <el-input v-model="localFile.audioPort" style="width:300px;" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
- </div>
- </el-col>
- <el-col :span="16">
- <el-table
- :data="localFile.fileTable"
- border
- style="width: 100%">
- <el-table-column
- type="index"
- label="搴忓彿"
- align="center"
- width="50">
- </el-table-column>
- <el-table-column
- prop="date"
- label="鍚嶇О"
- align="center"
- width="180">
- </el-table-column>
- <el-table-column
- prop="name"
- label="ID"
- align="center"
- width="180">
- </el-table-column>
- <el-table-column
- prop="name"
- label="IP"
- align="center"
- width="180">
- </el-table-column>
- <el-table-column
- prop="name"
- label="鍦ㄧ嚎鐘舵��"
- align="center"
- width="80">
- </el-table-column>
- <el-table-column
- label="绫诲埆"
- align="center"
- width="100">
- <template>
- <span class="iconfont iconpicture" style="margin-right: 5px;"></span>
- <span class="iconfont iconshipin" style="margin-right: 5px;"></span>
- <span class="iconfont iconyinpinx" style="margin-right: 5px;"></span>
- </template>
- </el-table-column>
- <el-table-column
- prop="address"
- align="center"
- label="澶囨敞">
- <template slot-scope="{row}">
- <div v-if="row.edit">
- <el-input :autofocus="row.edit" v-focus v-model="row.address" size="small" />
- <el-button size="mini" type="info" @click="handleCancel(row)">鍙栨秷</el-button>
- <el-button size="mini" type="primary" @click="handleSave(row)">淇濆瓨</el-button>
- </div>
- <div v-else>
- <span>{{ row.address }}</span>
- <el-button
- type="text"
- style="color: black;font-size:16px"
- @click="handleEdit(row)"
- icon="iconfont iconbianji"
- ></el-button>
- </div>
- </template>
- </el-table-column>
- </el-table>
- </el-col>
- </el-row>
- </el-menu-item-group>
- </el-submenu>-->
</el-menu>
</el-tab-pane>
@@ -351,34 +256,46 @@
<el-tab-pane label="闆嗙兢绠＄悊" name="third">
<cluster-management></cluster-management>
</el-tab-pane>
- <el-tab-pane label="澶栭儴缃戠粶" name="fourth">
- <div class="flex-box">
- <label>璁剧疆澶栭儴IP</label>
- <div style="width:300px;">
- <ip-input :ip="ipServer.ip" @on-blur="ipServer.ip = arguments[0]"></ip-input>
- </div>
- <el-checkbox label="閫夌敤鏈満IP" size="small" style="margin-left: 20px"></el-checkbox>
- </div>
- <div class="flex-box">
- <label>鍩熷悕</label>
- <el-input size="small" v-model="ipServer.localhost"></el-input>
- </div>
- <div class="flex-box">
- <label>鏈湴鏂囦欢绔彛</label>
- <el-input size="small" v-model="ipServer.localFilePort"></el-input>
- </div>
- <div class="mt15 save-btn" style="width:460px; margin-bottom:20px; float:left;">
- <el-button type="primary" @click="submitResource" size="small">淇濆瓨</el-button>
- </div>
- <div>
- <el-table :data="ipServer.fileTable" border fit style="width: 100%">
- <el-table-column type="index" label="搴忓彿" align="center" width="50"></el-table-column>
- <el-table-column prop="date" label="鍚嶇О" align="center"></el-table-column>
- <el-table-column prop="name" label="ID" align="center"></el-table-column>
- <el-table-column prop="name" label="IP" align="center"></el-table-column>
- <el-table-column prop="name" label="鍦ㄧ嚎鐘舵��" align="center"></el-table-column>
- </el-table>
- </div>
+ <el-tab-pane label="澶栭儴璁块棶" name="fourth">
+ <el-menu
+ :default-openeds="openeds"
+ background-color="#fff"
+ text-color="#303133"
+ active-text-color="#409EFF"
+ style="height: 100%;"
+ class="menu-css"
+ @open="menuOpen"
+ @close="menuClose"
+ >
+ <el-submenu index="0">
+ <template slot="title">
+ <b class="tree-font">澶栭儴璁块棶璁剧疆</b>
+ </template>
+ <el-menu-item-group class="item-group">
+ <el-form :model="sysinfo" :rules="rules" ref="sysinfo" label-width="100px">
+ <div class="flex-box">
+ <label>璁剧疆澶栭儴IP</label>
+ <div style="width:300px;">
+ <ip-input :ip="ipServer.ip" @on-blur="ipServer.ip = arguments[0]"></ip-input>
+ </div>
+ <el-checkbox label="閫夌敤鏈満IP" size="small" style="margin-left: 20px"></el-checkbox>
+ </div>
+ <div class="flex-box">
+ <label>鍩熷悕</label>
+ <el-input size="small" v-model="ipServer.localhost"></el-input>
+ </div>
+ <div class="flex-box">
+ <label>鏈湴鏂囦欢绔彛</label>
+ <el-input size="small" v-model="ipServer.localFilePort"></el-input>
+ </div>
+ <div class="mt15 mb10 save-btn">
+ <el-button type="primary" @click="submitSysinfo" size="small">淇濆瓨</el-button>
+ </div>
+ </el-form>
+ </el-menu-item-group>
+ </el-submenu>
+
+ </el-menu>
</el-tab-pane>
<el-tab-pane label="鏉冮檺绠＄悊" name="user">
<authority-management v-if="activeName === 'user'"></authority-management>
@@ -529,29 +446,6 @@
ip: "",
localhost: "",
localFilePort: "",
- fileTable: [
- {
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�',
- edit: false
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�',
- edit: false
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�',
- edit: false
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�',
- edit: false
- }
- ]
},
locationCity: {
province: '',
@@ -889,6 +783,9 @@
// margin-left: -80px;
.el-form-item {
text-align: left;
+ &.is-required:not(.is-no-asterisk)>.el-form-item__label:before{
+ margin-left:-8px;
+ }
.el-button {
float: right;
}
@@ -973,7 +870,7 @@
list-style: none;
position: relative;
margin: 0;
- padding-left: 0;
+ padding-left: 10px;
background-color: #ffffff;
.el-submenu__title {
height: 35px;
@@ -1036,6 +933,16 @@
width: 300px;
}
}
+.desc-info{
+ margin-bottom: 14px;
+ .flex-box{
+ height: 40px;
+ line-height: 40px;
+ .xiangqin-label{
+ width: 80px;
+ }
+ }
+}
.menu-css,
.el-menu {
border-right: none;
--
Gitblit v1.8.0