monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit debfb38b24fe424a0d35e949f8be21def98fbc9e 1 parent 673a1f39

elementui升级影响到页面输入框和button的样式调整-人员批量更改，缓存数据查看、性能指标下探 、性能曲线、文档管理/文档回收站、乙方运维 #1

Inline Side-by-side
Showing 17 changed files with 75 additions and 123 deletions
@@ -118,6 +118,8 @@ @@ -118,6 +118,8 @@
118 letter-spacing: 3px; 118 letter-spacing: 3px;
119 cursor: pointer; 119 cursor: pointer;
120 font-size: 12px; 120 font-size: 12px;
  121 + display: flex;
  122 + align-items: center;
121 } 123 }
122 .pie-flex-end{ 124 .pie-flex-end{
123 display: flex; 125 display: flex;
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 value-format="YYYY-MM-DD HH:mm:ss" 13 value-format="YYYY-MM-DD HH:mm:ss"
14 :shortcuts="shortcuts" 14 :shortcuts="shortcuts"
15 @change="changeDate" 15 @change="changeDate"
16 - size="small" 16 + :size="$global.elementConfig.size.input"
17 > 17 >
18 </el-date-picker> 18 </el-date-picker>
19 </el-col> 19 </el-col>
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 value-format="YYYY-MM-DD HH:mm:ss" 13 value-format="YYYY-MM-DD HH:mm:ss"
14 :shortcuts="shortcuts" 14 :shortcuts="shortcuts"
15 @change="changeDate" 15 @change="changeDate"
16 - size="small" 16 + :size="$global.elementConfig.size.input"
17 > 17 >
18 </el-date-picker> 18 </el-date-picker>
19 </el-col> 19 </el-col>
@@ -37,38 +37,38 @@ @@ -37,38 +37,38 @@
37 :style="{'height':height+'px','max-height':height + 'px','overflow':'hidden'}"> 37 :style="{'height':height+'px','max-height':height + 'px','overflow':'hidden'}">
38 <div style="display: flex;flex-direction: row;padding: 3px;background-color: white;padding-bottom: 5px;height:45px;border-bottom: solid 1px #EBEEF5"> 38 <div style="display: flex;flex-direction: row;padding: 3px;background-color: white;padding-bottom: 5px;height:45px;border-bottom: solid 1px #EBEEF5">
39 <div style="width: calc(100% - 150px);padding-left: 6px;text-align: left;"> 39 <div style="width: calc(100% - 150px);padding-left: 6px;text-align: left;">
40 - <el-input v-model="keyWord" placeholder="请输入关键字" :size="$global.elementSize" @keydown.enter.native="searchFile" 40 + <el-input v-model="keyWord" placeholder="请输入关键字" :size="$global.elementConfig.size.input" @keydown.enter.native="searchFile"
41 style="width: 220px;margin-right:10px" clearable /> 41 style="width: 220px;margin-right:10px" clearable />
42 - <el-button :size="$global.elementSize" @click="searchFile"> 42 + <el-button :size="$global.elementConfig.size.button" @click="searchFile">
43 <i class="iconfont icon-sousuo"></i>搜索</el-button> 43 <i class="iconfont icon-sousuo"></i>搜索</el-button>
44 - <el-button :size="$global.elementSize" @click="showUserDialog(true)" v-if="!isView && !isRecycle"> 44 + <el-button :size="$global.elementConfig.size.button" @click="showUserDialog(true)" v-if="!isView && !isRecycle">
45 <i class="iconfont icon-icon--quanxian"></i> 45 <i class="iconfont icon-icon--quanxian"></i>
46 授权 46 授权
47 </el-button> 47 </el-button>
48 - <el-button :size="$global.elementSize" @click="downloadFile"> 48 + <el-button :size="$global.elementConfig.size.button" @click="downloadFile">
49 <i class="iconfont icon-icon--download"></i> 49 <i class="iconfont icon-icon--download"></i>
50 下载 50 下载
51 </el-button> 51 </el-button>
52 - <el-button :size="$global.elementSize" @click="showFolder(true,true)" v-if="!isView & canAddFolder && !isRecycle"> 52 + <el-button :size="$global.elementConfig.size.button" @click="showFolder(true,true)" v-if="!isView & canAddFolder && !isRecycle">
53 <i class="iconfont icon-weidaqiadewenjianjia"></i> 53 <i class="iconfont icon-weidaqiadewenjianjia"></i>
54 新增文件夹 54 新增文件夹
55 </el-button> 55 </el-button>
56 - <el-button type="primary" :size="$global.elementSize" @click="showUploadFile(true)" v-if=" !isRecycle"> 56 + <el-button type="primary" :size="$global.elementConfig.size.button" @click="showUploadFile(true)" v-if=" !isRecycle">
57 <i class="iconfont icon-icon--shangchuan"></i> 57 <i class="iconfont icon-icon--shangchuan"></i>
58 上传 58 上传
59 </el-button> 59 </el-button>
60 - <el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')"> 60 + <el-button type="danger" :size="$global.elementConfig.size.button" @click="deleteDocument('','file')">
61 <i class="iconfont icon-shanchuwenjianjia"></i> 61 <i class="iconfont icon-shanchuwenjianjia"></i>
62 删除 62 删除
63 </el-button> 63 </el-button>
64 - <el-button :size="$global.elementSize" @click="restore()" v-if="isRecycle"> 64 + <el-button :size="$global.elementConfig.size.button" @click="restore()" v-if="isRecycle">
65 <i class="iconfont icon-lunxun"></i> 65 <i class="iconfont icon-lunxun"></i>
66 还原 66 还原
67 </el-button> 67 </el-button>
68 68
69 </div> 69 </div>
70 <div class="select-all" v-if="isSelect"> 70 <div class="select-all" v-if="isSelect">
71 - <el-button type="primary" :size="$global.elementSize" @click="selectAll()" v-if="activeBtn == 'view'" > 71 + <el-button type="primary" :size="$global.elementConfig.size.button" @click="selectAll()" v-if="activeBtn == 'view'" >
72 {{selectText}} 72 {{selectText}}
73 73
74 </el-button> 74 </el-button>
@@ -78,11 +78,11 @@ @@ -78,11 +78,11 @@
78 <div style="text-align: right;width: 150px"> 78 <div style="text-align: right;width: 150px">
79 79
80 <el-button-group> 80 <el-button-group>
81 - <el-button :size="$global.elementSize" :type="activeBtn == 'view' ? 'primary' : ''" 81 + <el-button :size="$global.elementConfig.size.button" :type="activeBtn == 'view' ? 'primary' : ''"
82 @click="activeModel('view')"> 82 @click="activeModel('view')">
83 <i class="iconfont icon-liebiaomoshi"></i> 83 <i class="iconfont icon-liebiaomoshi"></i>
84 </el-button> 84 </el-button>
85 - <el-button :size="$global.elementSize" :type="activeBtn == 'list' ? 'primary' : ''" 85 + <el-button :size="$global.elementConfig.size.button" :type="activeBtn == 'list' ? 'primary' : ''"
86 @click="activeModel('list')"> 86 @click="activeModel('list')">
87 <i class="iconfont icon-liebiao"></i> 87 <i class="iconfont icon-liebiao"></i>
88 </el-button> 88 </el-button>
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
142 </div> 142 </div>
143 <div v-if="activeBtn == 'view'" style="background-color: white" :style="{'height':(height -50) +'px','max-height':(height -50) + 'px','overflow':'auto'}"> 143 <div v-if="activeBtn == 'view'" style="background-color: white" :style="{'height':(height -50) +'px','max-height':(height -50) + 'px','overflow':'auto'}">
144 <div style="text-align: left;margin: 6px;border-bottom: solid 1px #F2F6FC;padding-bottom: 5px;"> 144 <div style="text-align: left;margin: 6px;border-bottom: solid 1px #F2F6FC;padding-bottom: 5px;">
145 - <el-tag v-for="(item,index) in historyNode" :size="$global.elementSize" :key="item.id" closable 145 + <el-tag v-for="(item,index) in historyNode" :size="$global.elementConfig.size.button" :key="item.id" closable
146 @close="tagHandleClose(index)" @click="clickTopNav(item,index)" 146 @close="tagHandleClose(index)" @click="clickTopNav(item,index)"
147 :type="item.id == currentNodeData.id ? 'success' :'info' " 147 :type="item.id == currentNodeData.id ? 'success' :'info' "
148 type="info" style="margin: 0px 3px"> 148 type="info" style="margin: 0px 3px">
@@ -152,7 +152,7 @@ @@ -152,7 +152,7 @@
152 <div style="display: flex;flex-wrap: wrap;"> 152 <div style="display: flex;flex-wrap: wrap;">
153 <div v-for="file in dataList" style="width: 120px;margin: 10px;position: relative"> 153 <div v-for="file in dataList" style="width: 120px;margin: 10px;position: relative">
154 <div style="position: absolute;right: 5px"> 154 <div style="position: absolute;right: 5px">
155 - <el-checkbox v-model="file.checked" label="" :size="$global.elementSize"></el-checkbox> 155 + <el-checkbox v-model="file.checked" label="" :size="$global.elementConfig.size.button"></el-checkbox>
156 </div> 156 </div>
157 <el-link type="primary" :underline="false" @click="getFile(file)"> 157 <el-link type="primary" :underline="false" @click="getFile(file)">
158 <i class="iconfont " 158 <i class="iconfont "
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
162 <br/> 162 <br/>
163 <el-link type="info" :underline="false" @click="reNameFile(file,false)" > 163 <el-link type="info" :underline="false" @click="reNameFile(file,false)" >
164 <div v-if="!reNameFileFlg[file.id]" style="width: 120px;overflow: hidden;text-overflow: ellipsis;text-align: center;">{{file.fileName}}</div> 164 <div v-if="!reNameFileFlg[file.id]" style="width: 120px;overflow: hidden;text-overflow: ellipsis;text-align: center;">{{file.fileName}}</div>
165 - <el-input :autofocus="true" v-if="reNameFileFlg[file.id]" placeholder="输入文件名" v-model="file.fileName" @blur="reNameFile(file,true)"></el-input> 165 + <el-input :size="$global.elementConfig.size.input" :autofocus="true" v-if="reNameFileFlg[file.id]" placeholder="输入文件名" v-model="file.fileName" @blur="reNameFile(file,true)"></el-input>
166 </el-link> 166 </el-link>
167 </div> 167 </div>
168 <div v-if="dataList.length == 0" style=" text-align: center; width: 100%;"> 168 <div v-if="dataList.length == 0" style=" text-align: center; width: 100%;">
@@ -185,27 +185,27 @@ @@ -185,27 +185,27 @@
185 label-width="120px"> 185 label-width="120px">
186 186
187 <el-form-item label="文档名称" prop="name"> 187 <el-form-item label="文档名称" prop="name">
188 - <el-input :size="$global.elementSize" v-model="docForm.name" clearable ></el-input> 188 + <el-input :size="$global.elementConfig.size.input" v-model="docForm.name" clearable ></el-input>
189 </el-form-item> 189 </el-form-item>
190 190
191 <!-- <div v-if="!isUserFolder"> 191 <!-- <div v-if="!isUserFolder">
192 <el-form-item label="文档编号" prop="docNo"> 192 <el-form-item label="文档编号" prop="docNo">
193 - <el-input :size="$global.elementSize" v-model="docForm.docNo" clearable></el-input> 193 + <el-input :size="$global.elementConfig.size.input" v-model="docForm.docNo" clearable></el-input>
194 </el-form-item> 194 </el-form-item>
195 195
196 <el-form-item label="文档类型" prop="type"> 196 <el-form-item label="文档类型" prop="type">
197 - <el-input :size="$global.elementSize" v-model="docForm.type" clearable></el-input> 197 + <el-input :size="$global.elementConfig.size.input" v-model="docForm.type" clearable></el-input>
198 </el-form-item> 198 </el-form-item>
199 </div>--> 199 </div>-->
200 200
201 201
202 <el-form-item label="排序" prop="sort"> 202 <el-form-item label="排序" prop="sort">
203 - <el-input :size="$global.elementSize" type="number" v-model="docForm.sort" clearable></el-input> 203 + <el-input :size="$global.elementConfig.size.input" type="number" v-model="docForm.sort" clearable></el-input>
204 </el-form-item> 204 </el-form-item>
205 205
206 <el-form-item> 206 <el-form-item>
207 - <el-button :size="$global.elementSize" type="primary" @click="addFolder('ruleForm')">保存</el-button>  
208 - <el-button :size="$global.elementSize" @click="showFolder(false)">取消</el-button> 207 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="addFolder('ruleForm')">保存</el-button>
  208 + <el-button :size="$global.elementConfig.size.button" @click="showFolder(false)">取消</el-button>
209 </el-form-item> 209 </el-form-item>
210 </el-form> 210 </el-form>
211 </template> 211 </template>
@@ -2,18 +2,18 @@ @@ -2,18 +2,18 @@
2 <el-col :span="24" class="search"> 2 <el-col :span="24" class="search">
3 <div class="condition" style="display: flex;"> 3 <div class="condition" style="display: flex;">
4 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px"> 4 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
5 - <el-input v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input> 5 + <el-input :size="$global.elementConfig.size.input" v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input>
6 </el-form-item> 6 </el-form-item>
7 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 7 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
8 - <el-button @click="getList">查询</el-button> 8 + <el-button :size="$global.elementConfig.size.button" @click="getList">查询</el-button>
9 </el-form-item> 9 </el-form-item>
10 10
11 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 11 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
12 - <el-button type="primary" @click="removeRel">取消</el-button> 12 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="removeRel">取消</el-button>
13 </el-form-item> 13 </el-form-item>
14 14
15 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 15 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
16 - <el-button type="primary" @click="changeUser">变更</el-button> 16 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="changeUser">变更</el-button>
17 </el-form-item> 17 </el-form-item>
18 18
19 </div> 19 </div>
@@ -2,18 +2,18 @@ @@ -2,18 +2,18 @@
2 <el-col :span="24" class="search"> 2 <el-col :span="24" class="search">
3 <div class="condition" style="display: flex;"> 3 <div class="condition" style="display: flex;">
4 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px"> 4 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
5 - <el-input v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input> 5 + <el-input :size="$global.elementConfig.size.input" v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input>
6 </el-form-item> 6 </el-form-item>
7 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 7 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
8 - <el-button @click="getList">查询</el-button> 8 + <el-button :size="$global.elementConfig.size.button" @click="getList">查询</el-button>
9 </el-form-item> 9 </el-form-item>
10 10
11 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 11 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
12 - <el-button type="primary" @click="removeRel">取消</el-button> 12 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="removeRel">取消</el-button>
13 </el-form-item> 13 </el-form-item>
14 14
15 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 15 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
16 - <el-button type="primary" @click="changeUser">变更</el-button> 16 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="changeUser">变更</el-button>
17 </el-form-item> 17 </el-form-item>
18 18
19 </div> 19 </div>
@@ -3,34 +3,18 @@ @@ -3,34 +3,18 @@
3 <div class="condition" > 3 <div class="condition" >
4 <el-form ref=“form” style="display: flex;"> 4 <el-form ref=“form” style="display: flex;">
5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px"> 5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
6 - <el-input v-model="search.keyword" placeholder="关键字支持：业务名称"></el-input> 6 + <el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="关键字支持：业务名称"></el-input>
7 </el-form-item> 7 </el-form-item>
8 - <!--<el-form-item style="margin-right: 6px;margin-bottom: 10px;">  
9 - <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型">  
10 - <el-option  
11 - v-for="item in resTypeOptions"  
12 - :key="item.resTypeCode"  
13 - :label="item.resTypeName"  
14 - :value="item.resTypeCode">  
15 - </el-option>  
16 - </el-select>  
17 - </el-form-item>-->  
18 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
19 - <el-button @click="getListData" >查询</el-button> 9 + <el-button :size="$global.elementConfig.size.button" @click="getListData" >查询</el-button>
20 </el-form-item> 10 </el-form-item>
21 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 11 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
22 - <el-button type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button> 12 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button>
23 </el-form-item> 13 </el-form-item>
24 </el-form> 14 </el-form>
25 </div> 15 </div>
26 </el-col> 16 </el-col>
27 </el-row> 17 </el-row>
28 -<!--<el-row style="margin-bottom: 10px;">  
29 - <div class="flex-div-start">  
30 -&lt;!&ndash; <el-button type="primary" @click="changeCancel()" size="small">取消</el-button>&ndash;&gt;  
31 - <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>  
32 - </div>  
33 -</el-row>-->  
34 <el-row style="font-size: 12px;color: grey;padding: 6px;"> 18 <el-row style="font-size: 12px;color: grey;padding: 6px;">
35 {{item.ddicDesc}} 19 {{item.ddicDesc}}
36 </el-row> 20 </el-row>
@@ -2,18 +2,18 @@ @@ -2,18 +2,18 @@
2 <el-col :span="24" class="search"> 2 <el-col :span="24" class="search">
3 <div class="condition" style="display: flex;"> 3 <div class="condition" style="display: flex;">
4 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px"> 4 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
5 - <el-input v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input> 5 + <el-input :size="$global.elementConfig.size.input" v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input>
6 </el-form-item> 6 </el-form-item>
7 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 7 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
8 - <el-button @click="getList">查询</el-button> 8 + <el-button :size="$global.elementConfig.size.button" @click="getList">查询</el-button>
9 </el-form-item> 9 </el-form-item>
10 10
11 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 11 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
12 - <el-button type="primary" @click="removeRel">取消</el-button> 12 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="removeRel">取消</el-button>
13 </el-form-item> 13 </el-form-item>
14 14
15 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 15 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
16 - <el-button type="primary" @click="changeUser">变更</el-button> 16 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="changeUser">变更</el-button>
17 </el-form-item> 17 </el-form-item>
18 18
19 </div> 19 </div>
@@ -2,18 +2,18 @@ @@ -2,18 +2,18 @@
2 <el-col :span="24" class="search"> 2 <el-col :span="24" class="search">
3 <div class="condition" style="display: flex;"> 3 <div class="condition" style="display: flex;">
4 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px"> 4 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
5 - <el-input v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input> 5 + <el-input :size="$global.elementConfig.size.input" v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input>
6 </el-form-item> 6 </el-form-item>
7 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 7 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
8 - <el-button @click="getList">查询</el-button> 8 + <el-button :size="$global.elementConfig.size.button" @click="getList">查询</el-button>
9 </el-form-item> 9 </el-form-item>
10 10
11 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 11 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
12 - <el-button type="primary" @click="removeRel">取消</el-button> 12 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="removeRel">取消</el-button>
13 </el-form-item> 13 </el-form-item>
14 14
15 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 15 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
16 - <el-button type="primary" @click="changeUser">变更</el-button> 16 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="changeUser">变更</el-button>
17 </el-form-item> 17 </el-form-item>
18 18
19 </div> 19 </div>
@@ -3,10 +3,10 @@ @@ -3,10 +3,10 @@
3 <div class="condition" > 3 <div class="condition" >
4 <el-form ref=“form” style="display: flex;"> 4 <el-form ref=“form” style="display: flex;">
5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px"> 5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
6 - <el-input v-model="search.keyword" placeholder="关键字支持：资源名称、IP"></el-input> 6 + <el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="关键字支持：资源名称、IP"></el-input>
7 </el-form-item> 7 </el-form-item>
8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
9 - <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型"> 9 + <el-select :size="$global.elementConfig.size.input" filterable clearable v-model="search.resType" placeholder="请选择资源类型">
10 <el-option 10 <el-option
11 v-for="item in resTypeOptions" 11 v-for="item in resTypeOptions"
12 :key="item.resTypeCode" 12 :key="item.resTypeCode"
@@ -16,26 +16,20 @@ @@ -16,26 +16,20 @@
16 </el-select> 16 </el-select>
17 </el-form-item> 17 </el-form-item>
18 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 18 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
19 - <el-button @click="getListData">查询</el-button> 19 + <el-button :size="$global.elementConfig.size.button" @click="getListData">查询</el-button>
20 </el-form-item> 20 </el-form-item>
21 21
22 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 22 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
23 - <el-button type="primary" @click="changeCancel()" >取消</el-button> 23 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="changeCancel()" >取消</el-button>
24 </el-form-item> 24 </el-form-item>
25 25
26 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 26 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
27 - <el-button type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button> 27 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button>
28 </el-form-item> 28 </el-form-item>
29 </el-form> 29 </el-form>
30 </div> 30 </div>
31 </el-col> 31 </el-col>
32 </el-row> 32 </el-row>
33 -<!--<el-row style="margin-bottom: 10px;">  
34 - <div class="flex-div-start">  
35 - <el-button type="primary" @click="changeCancel()" size="small">取消</el-button>  
36 - <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>  
37 - </div>  
38 -</el-row>-->  
39 <el-row style="font-size: 12px;color: grey;padding: 6px;"> 33 <el-row style="font-size: 12px;color: grey;padding: 6px;">
40 {{item.ddicDesc}} 34 {{item.ddicDesc}}
41 </el-row> 35 </el-row>
@@ -3,10 +3,10 @@ @@ -3,10 +3,10 @@
3 <div class="condition" > 3 <div class="condition" >
4 <el-form ref=“form” style="display: flex;"> 4 <el-form ref=“form” style="display: flex;">
5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px"> 5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
6 - <el-input v-model="search.keyword" placeholder="关键字支持：资源名称、IP"></el-input> 6 + <el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="关键字支持：资源名称、IP"></el-input>
7 </el-form-item> 7 </el-form-item>
8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
9 - <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型"> 9 + <el-select :size="$global.elementConfig.size.input" filterable clearable v-model="search.resType" placeholder="请选择资源类型">
10 <el-option 10 <el-option
11 v-for="item in resTypeOptions" 11 v-for="item in resTypeOptions"
12 :key="item.resTypeCode" 12 :key="item.resTypeCode"
@@ -16,24 +16,18 @@ @@ -16,24 +16,18 @@
16 </el-select> 16 </el-select>
17 </el-form-item> 17 </el-form-item>
18 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 18 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
19 - <el-button @click="getListData" >查询</el-button> 19 + <el-button :size="$global.elementConfig.size.button" @click="getListData" >查询</el-button>
20 </el-form-item> 20 </el-form-item>
21 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 21 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
22 - <el-button type="primary" @click="changeCancel()">取消</el-button> 22 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="changeCancel()">取消</el-button>
23 </el-form-item> 23 </el-form-item>
24 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 24 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
25 - <el-button type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button> 25 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button>
26 </el-form-item> 26 </el-form-item>
27 </el-form> 27 </el-form>
28 </div> 28 </div>
29 </el-col> 29 </el-col>
30 </el-row> 30 </el-row>
31 -<!--<el-row style="margin-bottom: 10px;">  
32 - <div class="flex-div-start">  
33 - <el-button type="primary" @click="changeCancel()" size="small">取消</el-button>  
34 - <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>  
35 - </div>  
36 -</el-row>-->  
37 <el-row style="font-size: 12px;color: grey;padding: 6px;"> 31 <el-row style="font-size: 12px;color: grey;padding: 6px;">
38 {{item.ddicDesc}} 32 {{item.ddicDesc}}
39 </el-row> 33 </el-row>
@@ -3,37 +3,21 @@ @@ -3,37 +3,21 @@
3 <div class="condition" > 3 <div class="condition" >
4 <el-form ref=“form” style="display: flex;"> 4 <el-form ref=“form” style="display: flex;">
5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px"> 5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
6 - <el-input v-model="search.keyword" placeholder="关键字支持：资源类型名称"></el-input> 6 + <el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="关键字支持：资源类型名称"></el-input>
7 </el-form-item> 7 </el-form-item>
8 - <!-- <el-form-item style="margin-right: 6px;margin-bottom: 10px;">  
9 - <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型">  
10 - <el-option  
11 - v-for="item in resTypeOptions"  
12 - :key="item.resTypeCode"  
13 - :label="item.resTypeName"  
14 - :value="item.resTypeCode">  
15 - </el-option>  
16 - </el-select>  
17 - </el-form-item>-->  
18 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
19 - <el-button @click="getListData">查询</el-button> 9 + <el-button :size="$global.elementConfig.size.button" @click="getListData">查询</el-button>
20 </el-form-item> 10 </el-form-item>
21 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 11 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
22 - <el-button type="primary" @click="changeCancel()" >取消</el-button> 12 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="changeCancel()" >取消</el-button>
23 </el-form-item> 13 </el-form-item>
24 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 14 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
25 - <el-button type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button> 15 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button>
26 </el-form-item> 16 </el-form-item>
27 </el-form> 17 </el-form>
28 </div> 18 </div>
29 </el-col> 19 </el-col>
30 </el-row> 20 </el-row>
31 -<!--<el-row style="margin-bottom: 10px;">  
32 - <div class="flex-div-start">  
33 - <el-button type="primary" @click="changeCancel()" size="small">取消</el-button>  
34 - <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>  
35 - </div>  
36 -</el-row>-->  
37 <el-row style="font-size: 12px;color: grey;padding: 6px;"> 21 <el-row style="font-size: 12px;color: grey;padding: 6px;">
38 {{item.ddicDesc}} 22 {{item.ddicDesc}}
39 </el-row> 23 </el-row>
@@ -3,24 +3,18 @@ @@ -3,24 +3,18 @@
3 <div class="condition" > 3 <div class="condition" >
4 <el-form ref=“form” style="display: flex;"> 4 <el-form ref=“form” style="display: flex;">
5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px"> 5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
6 - <el-input v-model="search.keyword" placeholder="关键字支持：角色名称"></el-input> 6 + <el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="关键字支持：角色名称"></el-input>
7 </el-form-item> 7 </el-form-item>
8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
9 - <el-button @click="getListData" >查询</el-button> 9 + <el-button :size="$global.elementConfig.size.button" @click="getListData" >查询</el-button>
10 </el-form-item> 10 </el-form-item>
11 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 11 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
12 - <el-button type="primary" @click="changeCancel()" >取消</el-button> 12 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="changeCancel()" >取消</el-button>
13 </el-form-item> 13 </el-form-item>
14 </el-form> 14 </el-form>
15 </div> 15 </div>
16 </el-col> 16 </el-col>
17 </el-row> 17 </el-row>
18 -<!--<el-row style="margin-bottom: 10px;">  
19 - <div class="flex-div-start">  
20 - <el-button type="primary" @click="changeCancel()" size="small">取消</el-button>  
21 -&lt;!&ndash; <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>&ndash;&gt;  
22 - </div>  
23 -</el-row>-->  
24 <el-row style="font-size: 12px;color: grey;padding: 6px;"> 18 <el-row style="font-size: 12px;color: grey;padding: 6px;">
25 {{item.ddicDesc}} 19 {{item.ddicDesc}}
26 </el-row> 20 </el-row>
@@ -2,18 +2,18 @@ @@ -2,18 +2,18 @@
2 <el-col :span="24" class="search"> 2 <el-col :span="24" class="search">
3 <div class="condition" style="display: flex;"> 3 <div class="condition" style="display: flex;">
4 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px"> 4 <el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
5 - <el-input v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input> 5 + <el-input :size="$global.elementConfig.size.input" v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input>
6 </el-form-item> 6 </el-form-item>
7 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 7 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
8 - <el-button @click="getList">查询</el-button> 8 + <el-button :size="$global.elementConfig.size.button" @click="getList">查询</el-button>
9 </el-form-item> 9 </el-form-item>
10 10
11 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 11 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
12 - <el-button type="primary" @click="removeRel">取消</el-button> 12 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="removeRel">取消</el-button>
13 </el-form-item> 13 </el-form-item>
14 14
15 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 15 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
16 - <el-button type="primary" @click="changeUser">变更</el-button> 16 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="changeUser">变更</el-button>
17 </el-form-item> 17 </el-form-item>
18 18
19 </div> 19 </div>
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
2 <div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}"> 2 <div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}">
3 <div class="search" style="margin:6px 0;"> 3 <div class="search" style="margin:6px 0;">
4 <div class="condition"> 4 <div class="condition">
5 - <el-input v-model="search.keyWords" placeholder="请输入关键字"></el-input>  
6 - <el-button size="small" type="primary" style="margin-left: 6px;" @click="getDataList">查询</el-button>  
7 - <el-button size="small" type="primary" @click="addConfig">新增</el-button>  
8 - <el-button size="small" type="primary" @click="delConfig">删除</el-button> 5 + <el-input :size="$global.elementConfig.size.input" v-model="search.keyWords" placeholder="请输入关键字"></el-input>
  6 + <el-button :size="$global.elementConfig.size.button" type="primary" style="margin-left: 6px;" @click="getDataList">查询</el-button>
  7 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="addConfig">新增</el-button>
  8 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="delConfig">删除</el-button>
9 </div> 9 </div>
10 10
11 </div> 11 </div>
@@ -2,11 +2,11 @@ @@ -2,11 +2,11 @@
2 <el-row> 2 <el-row>
3 <el-col :span="24"> 3 <el-col :span="24">
4 <div class="flex-div-start margin-top-bottom-10"> 4 <div class="flex-div-start margin-top-bottom-10">
5 - <el-input class="margin-right-10" @keydown.enter.native="onBtnSearch()" v-model="keyword" placeholder="输入关键字" /> 5 + <el-input :size="$global.elementConfig.size.input" class="margin-right-10" @keydown.enter.native="onBtnSearch()" v-model="keyword" placeholder="输入关键字" />
6 6
7 <div class="flex-div-start"> 7 <div class="flex-div-start">
8 8
9 - <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">搜索</el-button> 9 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">搜索</el-button>
10 10
11 </div> 11 </div>
12 </div> 12 </div>
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 :showBorder="true" :loading="false" :pageSize="pageSize" 37 :showBorder="true" :loading="false" :pageSize="pageSize"
38 :showPage="true" :showTools="true" :height="(height - 300)"> 38 :showPage="true" :showTools="true" :height="(height - 300)">
39 <template #tools="{scope}"> 39 <template #tools="{scope}">
40 - <el-button type="text" size="small" @click.prevent="handleView(scope.row,scope.$index)"> 40 + <el-button :size="$global.elementConfig.size.button" type="text" size="small" @click.prevent="handleView(scope.row,scope.$index)">
41 查看 41 查看
42 </el-button> 42 </el-button>
43 </template> 43 </template>
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 61
62 </div> 62 </div>
63 <div class="margin-top flex-center "> 63 <div class="margin-top flex-center ">
64 - <el-button @click="cancelBtn">取消</el-button> 64 + <el-button :size="$global.elementConfig.size.button" @click="cancelBtn">取消</el-button>
65 </div> 65 </div>
66 </template> 66 </template>
67 </cm-dialog> 67 </cm-dialog>
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 v-model="customDate" 11 v-model="customDate"
12 type="date" 12 type="date"
13 placeholder="请选择日期" 13 placeholder="请选择日期"
14 - size="small" 14 + :size="$global.elementConfig.size.input"
15 format="YYYY-MM-DD" 15 format="YYYY-MM-DD"
16 value-format="YYYY-MM-DD" 16 value-format="YYYY-MM-DD"
17 style="margin-left:6px;" 17 style="margin-left:6px;"
@@ -22,12 +22,12 @@ @@ -22,12 +22,12 @@
22 range-separator="-" 22 range-separator="-"
23 start-placeholder="开始时间" 23 start-placeholder="开始时间"
24 end-placeholder="结束时间" 24 end-placeholder="结束时间"
25 - size="small" 25 + :size="$global.elementConfig.size.input"
26 format="HH:mm:ss" 26 format="HH:mm:ss"
27 value-format="HH:mm:ss" 27 value-format="HH:mm:ss"
28 style="margin-left:6px;" 28 style="margin-left:6px;"
29 /> 29 />
30 - <el-button style="margin-left:6px;" type="primary" size="small" @click="search"> 查询</el-button> 30 + <el-button style="margin-left:6px;" type="primary" :size="$global.elementConfig.size.input" @click="search"> 查询</el-button>
31 </div> 31 </div>
32 </div> 32 </div>
33 </el-col> 33 </el-col>