monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit cf8a5a019d33cc66251c63f2f81d23a8d050ef3d 2 parents ab913ab7 21a5ba95

Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev
Inline Side-by-side
Showing 46 changed files with 567 additions and 241 deletions
  1 +<title>忙时配置</title>
  2 +<iframe src="/vue3/index.html#/vue3/busyConfig" class="layadmin-iframe" style="height: 99.5%!important;"/>
@@ -119,6 +119,8 @@ @@ -119,6 +119,8 @@
119 letter-spacing: 3px; 119 letter-spacing: 3px;
120 cursor: pointer; 120 cursor: pointer;
121 font-size: 12px; 121 font-size: 12px;
  122 + display: flex;
  123 + align-items: center;
122 } 124 }
123 .pie-flex-end{ 125 .pie-flex-end{
124 display: flex; 126 display: flex;
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 margin-left:6px; 29 margin-left:6px;
30 width:200px; 30 width:200px;
31 } 31 }
32 -.upload-demo{ 32 +.upload-demo-logoConfig{
33 margin-left:20px; 33 margin-left:20px;
34 width:93px; 34 width:93px;
35 } 35 }
@@ -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,48 +37,48 @@ @@ -37,48 +37,48 @@
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 </el-button> 73 </el-button>
74 </div> 74 </div>
75 <div v-if="isCut" style="text-align: right;width: 150px"> 75 <div v-if="isCut" style="text-align: right;width: 150px">
76 <el-button-group> 76 <el-button-group>
77 - <el-button :size="$global.elementSize" :type="activeBtn == 'view' ? 'primary' : ''" 77 + <el-button :size="$global.elementConfig.size.button" :type="activeBtn == 'view' ? 'primary' : ''"
78 @click="activeModel('view')"> 78 @click="activeModel('view')">
79 <i class="iconfont icon-liebiaomoshi"></i> 79 <i class="iconfont icon-liebiaomoshi"></i>
80 </el-button> 80 </el-button>
81 - <el-button :size="$global.elementSize" :type="activeBtn == 'list' ? 'primary' : ''" 81 + <el-button :size="$global.elementConfig.size.button" :type="activeBtn == 'list' ? 'primary' : ''"
82 @click="activeModel('list')"> 82 @click="activeModel('list')">
83 <i class="iconfont icon-liebiao"></i> 83 <i class="iconfont icon-liebiao"></i>
84 </el-button> 84 </el-button>
@@ -138,7 +138,7 @@ @@ -138,7 +138,7 @@
138 </div> 138 </div>
139 <div v-if="activeBtn == 'view'" style="background-color: white" :style="{'height':(height -50) +'px','max-height':(height -50) + 'px','overflow':'auto'}"> 139 <div v-if="activeBtn == 'view'" style="background-color: white" :style="{'height':(height -50) +'px','max-height':(height -50) + 'px','overflow':'auto'}">
140 <div style="text-align: left;margin: 6px;border-bottom: solid 1px #F2F6FC;padding-bottom: 5px;"> 140 <div style="text-align: left;margin: 6px;border-bottom: solid 1px #F2F6FC;padding-bottom: 5px;">
141 - <el-tag v-for="(item,index) in historyNode" :size="$global.elementSize" :key="item.id" closable 141 + <el-tag v-for="(item,index) in historyNode" :size="$global.elementConfig.size.button" :key="item.id" closable
142 @close="tagHandleClose(index)" @click="clickTopNav(item,index)" 142 @close="tagHandleClose(index)" @click="clickTopNav(item,index)"
143 :type="item.id == currentNodeData.id ? 'success' :'info' " 143 :type="item.id == currentNodeData.id ? 'success' :'info' "
144 type="info" style="margin: 0px 3px"> 144 type="info" style="margin: 0px 3px">
@@ -148,7 +148,7 @@ @@ -148,7 +148,7 @@
148 <div style="display: flex;flex-wrap: wrap;"> 148 <div style="display: flex;flex-wrap: wrap;">
149 <div v-for="file in dataList" style="width: 120px;margin: 10px;position: relative"> 149 <div v-for="file in dataList" style="width: 120px;margin: 10px;position: relative">
150 <div style="position: absolute;right: 5px"> 150 <div style="position: absolute;right: 5px">
151 - <el-checkbox v-model="file.checked" label="" :size="$global.elementSize"></el-checkbox> 151 + <el-checkbox v-model="file.checked" label="" :size="$global.elementConfig.size.input"></el-checkbox>
152 </div> 152 </div>
153 <el-link type="primary" :underline="false" @click="getFile(file)"> 153 <el-link type="primary" :underline="false" @click="getFile(file)">
154 <i class="iconfont " 154 <i class="iconfont "
@@ -158,7 +158,7 @@ @@ -158,7 +158,7 @@
158 <br/> 158 <br/>
159 <el-link type="info" :underline="false" @click="reNameFile(file,false)" > 159 <el-link type="info" :underline="false" @click="reNameFile(file,false)" >
160 <div v-if="!reNameFileFlg[file.id]" style="width: 120px;overflow: hidden;text-overflow: ellipsis;text-align: center;">{{file.fileName}}</div> 160 <div v-if="!reNameFileFlg[file.id]" style="width: 120px;overflow: hidden;text-overflow: ellipsis;text-align: center;">{{file.fileName}}</div>
161 - <el-input :autofocus="true" v-if="reNameFileFlg[file.id]" placeholder="输入文件名" v-model="file.fileName" @blur="reNameFile(file,true)"></el-input> 161 + <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>
162 </el-link> 162 </el-link>
163 </div> 163 </div>
164 <div v-if="dataList.length == 0" style=" text-align: center; width: 100%;"> 164 <div v-if="dataList.length == 0" style=" text-align: center; width: 100%;">
@@ -181,27 +181,27 @@ @@ -181,27 +181,27 @@
181 label-width="120px"> 181 label-width="120px">
182 182
183 <el-form-item label="文档名称" prop="name"> 183 <el-form-item label="文档名称" prop="name">
184 - <el-input :size="$global.elementSize" v-model="docForm.name" clearable ></el-input> 184 + <el-input :size="$global.elementConfig.size.input" v-model="docForm.name" clearable ></el-input>
185 </el-form-item> 185 </el-form-item>
186 186
187 <!-- <div v-if="!isUserFolder"> 187 <!-- <div v-if="!isUserFolder">
188 <el-form-item label="文档编号" prop="docNo"> 188 <el-form-item label="文档编号" prop="docNo">
189 - <el-input :size="$global.elementSize" v-model="docForm.docNo" clearable></el-input> 189 + <el-input :size="$global.elementConfig.size.input" v-model="docForm.docNo" clearable></el-input>
190 </el-form-item> 190 </el-form-item>
191 191
192 <el-form-item label="文档类型" prop="type"> 192 <el-form-item label="文档类型" prop="type">
193 - <el-input :size="$global.elementSize" v-model="docForm.type" clearable></el-input> 193 + <el-input :size="$global.elementConfig.size.input" v-model="docForm.type" clearable></el-input>
194 </el-form-item> 194 </el-form-item>
195 </div>--> 195 </div>-->
196 196
197 197
198 <el-form-item label="排序" prop="sort"> 198 <el-form-item label="排序" prop="sort">
199 - <el-input :size="$global.elementSize" @input="inputMax" type="number" max="100000" maxlength="100000" v-model="docForm.sort" clearable></el-input> 199 + <el-input :size="$global.elementConfig.size.input" @input="inputMax" type="number" max="100000" maxlength="100000" v-model="docForm.sort" clearable></el-input>
200 </el-form-item> 200 </el-form-item>
201 201
202 <el-form-item> 202 <el-form-item>
203 - <el-button :size="$global.elementSize" type="primary" @click="addFolder('ruleForm')">保存</el-button>  
204 - <el-button :size="$global.elementSize" @click="showFolder(false)">取消</el-button> 203 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="addFolder('ruleForm')">保存</el-button>
  204 + <el-button :size="$global.elementConfig.size.button" @click="showFolder(false)">取消</el-button>
205 </el-form-item> 205 </el-form-item>
206 </el-form> 206 </el-form>
207 </template> 207 </template>
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 <div> 2 <div>
3 <!-- 人员信息总汇--> 3 <!-- 人员信息总汇-->
4 <el-divider content-position="left">人员信息汇总</el-divider> 4 <el-divider content-position="left">人员信息汇总</el-divider>
5 - <el-button @click="deleteUser()" style="float:right;margin-right: 6px;margin-bottom: 6px">删除</el-button>  
6 - <el-button @click="add" style="float:right;margin-right: 6px;margin-bottom: 6px">录入</el-button> 5 + <el-button @click="deleteUser()" :size="$global.elementConfig.size.button" style="float:right;margin-right: 6px;margin-bottom: 6px">删除</el-button>
  6 + <el-button @click="add" :size="$global.elementConfig.size.button" style="float:right;margin-right: 6px;margin-bottom: 6px">录入</el-button>
7 <cm-table-page :columns="columns" :dataList="dataList" @loaddata="getPage"@selectionChange="selectionChange" :showIndex="true" 7 <cm-table-page :columns="columns" :dataList="dataList" @loaddata="getPage"@selectionChange="selectionChange" :showIndex="true"
8 :showBorder="true" :currentPage="currentPage" :total="total" :loading="false" :showSelection="true" 8 :showBorder="true" :currentPage="currentPage" :total="total" :loading="false" :showSelection="true"
9 :showPage="true" :showTools="true" :height="height" :pageSize="pageSize"> 9 :showPage="true" :showTools="true" :height="height" :pageSize="pageSize">
@@ -194,7 +194,7 @@ export default { @@ -194,7 +194,7 @@ export default {
194 id.value = row.id 194 id.value = row.id
195 } 195 }
196 if (id.value == null || id.value ==undefined){ 196 if (id.value == null || id.value ==undefined){
197 - proxy.$global.showMsg("请选择用户！","error"); 197 + proxy.$global.showMsg("请选择需要操作的用户！",'warning');
198 return; 198 return;
199 } 199 }
200 let params={ 200 let params={
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <i class="iconfont icon-icon--yingbing" /> 人员基本信息 17 <i class="iconfont icon-icon--yingbing" /> 人员基本信息
18 </div> 18 </div>
19 <div style="padding-left: 40px;margin-bottom: 6px"> 19 <div style="padding-left: 40px;margin-bottom: 6px">
20 - <el-form :rules="rules" ref="rule" :model="ruleForm" label-width="120px" :size="$global.elementSize" label-position="top" > 20 + <el-form :rules="rules" ref="rule" :model="ruleForm" label-width="120px" :size="$global.elementConfig.size.input" label-position="top" >
21 <el-row :gutter="5"> 21 <el-row :gutter="5">
22 <el-col :span="8"> 22 <el-col :span="8">
23 <el-form-item label="姓名" prop="nickname" class="form-class"> 23 <el-form-item label="姓名" prop="nickname" class="form-class">
@@ -143,6 +143,12 @@ const routes = [{ @@ -143,6 +143,12 @@ const routes = [{
143 name: 'logoConfig', 143 name: 'logoConfig',
144 component: () => myImport('views/logoConfig/index') 144 component: () => myImport('views/logoConfig/index')
145 }, 145 },
  146 + //忙时配置
  147 + {
  148 + path: '/vue3/busyConfig',
  149 + name: 'busyConfig',
  150 + component: () => myImport('views/busyConfig/index')
  151 + },
146 ]; 152 ];
147 153
148 // hash模式： createWebHashHistory 154 // hash模式： createWebHashHistory
@@ -4,18 +4,18 @@ @@ -4,18 +4,18 @@
4 <div class="condition"> 4 <div class="condition">
5 <el-form-item> 5 <el-form-item>
6 <el-button-group class="ml-4"> 6 <el-button-group class="ml-4">
7 - <el-button :type="search.status == 1 ? 'primary' : ''" @click="getDataList(1)">审批中</el-button>  
8 - <el-button :type="search.status == 2 ? 'primary' : ''" @click="getDataList(2)">已审批</el-button>  
9 - <el-button :type="search.status == 3 ? 'primary' : ''" @click="getDataList(3)">驳回</el-button>  
10 - <el-button :type="search.status == 0 ? 'primary' : ''" @click="getDataList(0)">草稿</el-button> 7 + <el-button :size="$global.elementConfig.size.button" :type="search.status == 1 ? 'primary' : ''" @click="getDataList(1)">审批中</el-button>
  8 + <el-button :size="$global.elementConfig.size.button" :type="search.status == 2 ? 'primary' : ''" @click="getDataList(2)">已审批</el-button>
  9 + <el-button :size="$global.elementConfig.size.button" :type="search.status == 3 ? 'primary' : ''" @click="getDataList(3)">驳回</el-button>
  10 + <el-button :size="$global.elementConfig.size.button" :type="search.status == 0 ? 'primary' : ''" @click="getDataList(0)">草稿</el-button>
11 </el-button-group> 11 </el-button-group>
12 </el-form-item> 12 </el-form-item>
13 13
14 <el-form-item > 14 <el-form-item >
15 - <el-input v-else v-model="search.keyword" placeholder="请输入关键字"></el-input> 15 + <el-input :size="$global.elementConfig.size.input" v-else v-model="search.keyword" placeholder="请输入关键字" style="margin-top:5px;"></el-input>
16 </el-form-item> 16 </el-form-item>
17 <el-form-item > 17 <el-form-item >
18 - <el-button @click="getDataList(statusVal)">查询</el-button> 18 + <el-button :size="$global.elementConfig.size.button" @click="getDataList(statusVal)">查询</el-button>
19 </el-form-item> 19 </el-form-item>
20 </div> 20 </div>
21 </div> 21 </div>
@@ -3,10 +3,10 @@ @@ -3,10 +3,10 @@
3 <div class="search"> 3 <div class="search">
4 <div class="condition"> 4 <div class="condition">
5 <el-form-item > 5 <el-form-item >
6 - <el-input v-model="search.keyword" placeholder="请输入关键字"></el-input> 6 + <el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="请输入关键字" style="margin-top:5px;"></el-input>
7 </el-form-item> 7 </el-form-item>
8 <el-form-item > 8 <el-form-item >
9 - <el-button @click="getDataList">查询</el-button> 9 + <el-button :size="$global.elementConfig.size.button" @click="getDataList">查询</el-button>
10 </el-form-item> 10 </el-form-item>
11 </div> 11 </div>
12 </div> 12 </div>
@@ -2,13 +2,13 @@ @@ -2,13 +2,13 @@
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"> 3 <div class="search">
4 <el-form-item> 4 <el-form-item>
5 - <el-input v-model="searchForm.keyword" placeholder="输入关键字" 5 + <el-input :size="$global.elementConfig.size.input" v-model="searchForm.keyword" placeholder="输入关键字"
6 @keydown.enter.native="getPage"></el-input> 6 @keydown.enter.native="getPage"></el-input>
7 </el-form-item> 7 </el-form-item>
8 <el-form-item style="margin-left: 10px"> 8 <el-form-item style="margin-left: 10px">
9 - <el-button type="primary" @click="getPage"><i class="iconfont icon-sousuo"></i>搜索</el-button>  
10 - <el-button @click="showExcludeKpi(true)">指标过滤</el-button>  
11 - <el-button @click="showResDialog(true)">资源过滤</el-button> 9 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="getPage"><i class="iconfont icon-sousuo"></i>搜索</el-button>
  10 + <el-button :size="$global.elementConfig.size.button" @click="showExcludeKpi(true)">指标过滤</el-button>
  11 + <el-button :size="$global.elementConfig.size.button" @click="showResDialog(true)">资源过滤</el-button>
12 </el-form-item> 12 </el-form-item>
13 </div> 13 </div>
14 14
@@ -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,23 +3,13 @@ @@ -3,23 +3,13 @@
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()" >变更</el-button>
23 </el-form-item> 13 </el-form-item>
24 </el-form> 14 </el-form>
25 </div> 15 </div>
@@ -28,7 +18,7 @@ @@ -28,7 +18,7 @@
28 <!--<el-row style="margin-bottom: 10px;"> 18 <!--<el-row style="margin-bottom: 10px;">
29 <div class="flex-div-start"> 19 <div class="flex-div-start">
30 &lt;!&ndash; <el-button type="primary" @click="changeCancel()" size="small">取消</el-button>&ndash;&gt; 20 &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> 21 + <el-button type="primary" @click="changeAdmin()" size="small" >变更</el-button>
32 </div> 22 </div>
33 </el-row>--> 23 </el-row>-->
34 <el-row style="font-size: 12px;color: grey;padding: 6px;"> 24 <el-row style="font-size: 12px;color: grey;padding: 6px;">
@@ -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,17 +2,17 @@ @@ -2,17 +2,17 @@
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 :size="$global.elementConfig.size.button" style="margin-right: 6px;margin-bottom: 10px;">
16 <el-button type="primary" @click="changeUser">变更</el-button> 16 <el-button type="primary" @click="changeUser">变更</el-button>
17 </el-form-item> 17 </el-form-item>
18 18
@@ -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,15 +16,15 @@ @@ -16,15 +16,15 @@
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()" >变更</el-button>
28 </el-form-item> 28 </el-form-item>
29 </el-form> 29 </el-form>
30 </div> 30 </div>
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 <!--<el-row style="margin-bottom: 10px;"> 33 <!--<el-row style="margin-bottom: 10px;">
34 <div class="flex-div-start"> 34 <div class="flex-div-start">
35 <el-button type="primary" @click="changeCancel()" size="small">取消</el-button> 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> 36 + <el-button type="primary" @click="changeAdmin()" size="small" >变更</el-button>
37 </div> 37 </div>
38 </el-row>--> 38 </el-row>-->
39 <el-row style="font-size: 12px;color: grey;padding: 6px;"> 39 <el-row style="font-size: 12px;color: grey;padding: 6px;">
@@ -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,13 +16,13 @@ @@ -16,13 +16,13 @@
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()" >变更</el-button>
26 </el-form-item> 26 </el-form-item>
27 </el-form> 27 </el-form>
28 </div> 28 </div>
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 <!--<el-row style="margin-bottom: 10px;"> 31 <!--<el-row style="margin-bottom: 10px;">
32 <div class="flex-div-start"> 32 <div class="flex-div-start">
33 <el-button type="primary" @click="changeCancel()" size="small">取消</el-button> 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> 34 + <el-button type="primary" @click="changeAdmin()" size="small" >变更</el-button>
35 </div> 35 </div>
36 </el-row>--> 36 </el-row>-->
37 <el-row style="font-size: 12px;color: grey;padding: 6px;"> 37 <el-row style="font-size: 12px;color: grey;padding: 6px;">
@@ -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()" >变更</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,13 +3,13 @@ @@ -3,13 +3,13 @@
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>
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <!--<el-row style="margin-bottom: 10px;"> 18 <!--<el-row style="margin-bottom: 10px;">
19 <div class="flex-div-start"> 19 <div class="flex-div-start">
20 <el-button type="primary" @click="changeCancel()" size="small">取消</el-button> 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; 21 +&lt;!&ndash; <el-button type="primary" @click="changeAdmin()" size="small" >变更</el-button>&ndash;&gt;
22 </div> 22 </div>
23 </el-row>--> 23 </el-row>-->
24 <el-row style="font-size: 12px;color: grey;padding: 6px;"> 24 <el-row style="font-size: 12px;color: grey;padding: 6px;">
@@ -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>
  1 +<div class="container" :style="{'height':height+'px','max-height':height+'px'}">
  2 + <div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}">
  3 + <div class="search" style="margin:6px 0;">
  4 + <div class="condition">
  5 + <el-input :size="$global.elementConfig.size.input" style="width:180px;" 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>
  10 +
  11 + </div>
  12 +
  13 + <div class="search-table">
  14 + <cm-table-page :columns="tableData.columns" :dataList="tableData.dataList"
  15 + :showIndex="true"
  16 + :total="tableData.count"
  17 + @loaddata = "loaddata"
  18 + :showSelection="true"
  19 + @selectionChange="selectionChange"
  20 + :showBorder="true"
  21 + :loading="false"
  22 + :pageSize="pageSize"
  23 + :showPage="true"
  24 + :showTools="true"
  25 + :height="height - 110">
  26 + <template #default="{row,prop,column}">
  27 + <div>
  28 + <el-tag style="margin:5px;" v-if="prop=='years'" v-for="(item,index) in row.years">{{item}}</el-tag>
  29 + <el-tag style="margin:5px;" v-if="prop=='months'" type="success" v-for="(item,index) in row.months">{{item}}</el-tag>
  30 + <el-tag style="margin:5px;" v-if="prop=='days'" type="info" v-for="(item,index) in row.days">{{item}}</el-tag>
  31 + <el-tag style="margin:5px;" v-if="prop=='hours'" type="warning" v-for="(item,index) in row.hours">{{item}}</el-tag>
  32 + </div>
  33 + </template>
  34 + <template #tools="{scope}">
  35 + <div class="list-handle">
  36 + <i class="el-icon-delete" title="删除" style="cursor: pointer;" @click="handleDelete(scope.row)"></i>
  37 + <i style="margin-left:6px;cursor: pointer;" class="el-icon-edit" title="修改" @click="handleEdit(scope.row)"></i>
  38 + </div>
  39 + </template>
  40 + </cm-table-page>
  41 + </div>
  42 + </div>
  43 +</div>
  44 +
  45 +<!--弹框-->
  46 +<cm-dialog :title="dialog.title" width="60%" :showDialogVisible="dialog.show" @okfunc="saveConfig" @hidedialog="hideDialog" :showFooter="true">
  47 + <template v-slot>
  48 + <div class="add-container" style="height:500px;padding:0 10px;">
  49 + <el-row>
  50 + <el-col :span="24" style="display: flex;align-items: center;
  51 + border-bottom:1px solid #1e9fff;padding:10px;margin-bottom: 10px;">
  52 + <span style="margin-right: 10px;display: flex;align-items: center;"><i style="display:inline-block;padding:5px;"></i>年：</span>
  53 + <el-checkbox-group style="display: flex;flex-wrap: wrap;" v-model="yearCheckList">
  54 + <el-checkbox v-for="(item,index) in yearData" :label="item+''" >{{item}}年</el-checkbox>
  55 + </el-checkbox-group>
  56 + </el-col>
  57 + </el-row>
  58 + <el-row>
  59 + <el-col :span="24" style="display: flex;align-items: center;
  60 + border-bottom:1px solid #1e9fff;padding:10px;margin-bottom: 10px;">
  61 + <span style="margin-right: 10px;display: flex;align-items: center;"><i style="display:inline-block;padding:5px;"></i>月：</span>
  62 + <el-checkbox-group style="display: flex;flex-wrap: wrap;" v-model="monthCheckList">
  63 + <el-checkbox v-for="(item,index) in 12" :label="item+''" >{{item}}月</el-checkbox>
  64 + </el-checkbox-group>
  65 + </el-col>
  66 + </el-row>
  67 + <el-row>
  68 + <el-col :span="24" style="display: flex;align-items: center;
  69 + border-bottom:1px solid #1e9fff;padding:10px;margin-bottom: 10px;">
  70 + <span style="margin-right: 10px;display: flex;align-items: center;"><i style="display:inline-block;padding:5px;"></i>日：</span>
  71 + <el-checkbox-group style="display: flex;flex-wrap: wrap;" v-model="dayCheckList">
  72 + <el-checkbox v-for="(item,index) in 31" :label="item+''" >{{item}}日</el-checkbox>
  73 + </el-checkbox-group>
  74 + </el-col>
  75 + </el-row>
  76 + <el-row>
  77 + <el-col :span="24" style="display: flex;align-items: center;
  78 + border-bottom:1px solid #1e9fff;padding:10px;margin-bottom: 10px;">
  79 + <span style="margin-right: 10px;display: flex;align-items: center;"><i style="color:#ff0000;padding:5px;">*</i>时：</span>
  80 + <el-checkbox-group style="display: flex;flex-wrap: wrap;" v-model="hourCheckList">
  81 + <el-checkbox v-for="(item,index) in 24" :label="item+''" >{{item}}时</el-checkbox>
  82 + </el-checkbox-group>
  83 + </el-col>
  84 + </el-row>
  85 + </div>
  86 +
  87 + </template>
  88 +</cm-dialog>
  89 +
  1 +export default {
  2 + name: 'busyConfig',
  3 + template: '',
  4 + components: {
  5 + },
  6 + props: [],
  7 + setup(props, {attrs, slots, emit}) {
  8 + const {proxy} = Vue.getCurrentInstance();
  9 + let height = Vue.ref(window.innerHeight);
  10 + let yearCheckList=Vue.ref([]);//年选择数据
  11 + let monthCheckList=Vue.ref([]);//月选择数据
  12 + let dayCheckList=Vue.ref([]);//日选择数据
  13 + let hourCheckList=Vue.ref([]);//时选择数据
  14 + let dialog=Vue.ref({
  15 + title:'忙时配置',
  16 + show:false,
  17 + id:''
  18 + });
  19 + let search = Vue.ref({
  20 + status: 0,
  21 + keyWords: '',
  22 + page: 1,
  23 + limit: 50,
  24 + });
  25 +
  26 + //表格字段
  27 + let tableData = Vue.ref({
  28 + count:0,
  29 + dataList: [],
  30 + columns: [
  31 + {
  32 + prop: 'years',
  33 + label: '年',
  34 + sortable: true,
  35 + align: 'center',
  36 + width: '200',
  37 + },
  38 + {
  39 + prop: 'months',
  40 + label: '月',
  41 + sortable: true,
  42 + align: '200',
  43 + },
  44 + {
  45 + prop: 'days',
  46 + label: '日',
  47 + sortable: true,
  48 + align: 'center',
  49 + }, {
  50 + prop: 'hours',
  51 + label: '时',
  52 + sortable: true,
  53 + align: 'center',
  54 + width: '200'
  55 + }
  56 + ]
  57 + })
  58 + // 表格全选事件
  59 + let checkData=Vue.ref([]);
  60 + let selectionChange = (val) => {
  61 + let checkArr = [];
  62 + val.map(item => {
  63 + checkArr.push(item.id)
  64 + })
  65 + checkData.value = checkArr;
  66 +
  67 + }
  68 + // 获取列表
  69 + let getDataList = () => {
  70 + proxy.$http.get(`/api-analysis/busyAnalysis/getList?keyWords=`+search.value.keyWords, {
  71 + page: search.value.page,
  72 + limit: search.value.limit,
  73 + }, function (res) {
  74 + if (res && res.data) {
  75 + tableData.value.dataList = res.data;
  76 + tableData.value.count = res.count;
  77 + tableData.value.dataList.map(item=>{
  78 + if(item.year){
  79 + item.years=item.year.split(",");
  80 + }
  81 + if(item.month){
  82 + item.months=item.month.split(",");
  83 + }
  84 + if(item.day){
  85 + item.days=item.day.split(",");
  86 + }
  87 + if(item.hour){
  88 + item.hours=item.hour.split(",");
  89 + }
  90 +
  91 + })
  92 + } else {
  93 + tableData.value.dataList = [];
  94 + tableData.value.count = 0;
  95 + }
  96 + });
  97 +
  98 + }
  99 +
  100 + let loaddata = ({page, limit}) => {
  101 + search.value.page = page;
  102 + search.value.limit = limit;
  103 + }
  104 +
  105 + let hideDialog = (flg) => {
  106 + dialog.value.show = flg;
  107 + if(!flg){
  108 + dialog.value.id='';
  109 + yearCheckList.value=[];
  110 + monthCheckList.value=[];
  111 + dayCheckList.value=[];
  112 + hourCheckList.value=[];
  113 + }
  114 + }
  115 +
  116 + // 处理弹框
  117 + let handle = (row) =>{
  118 + dialog.value.id = row.id;
  119 + yearCheckList.value=row.years?row.years:[];
  120 + monthCheckList.value=row.months?row.months:[];
  121 + dayCheckList.value=row.days?row.days:[];
  122 + hourCheckList.value=row.hours?row.hours:[];
  123 + console.log("////",yearCheckList.value,monthCheckList.value,dayCheckList.value,hourCheckList.value)
  124 + hideDialog(true);
  125 + }
  126 +
  127 + //修改详情
  128 + let handleEdit = (row) =>{
  129 + handle(row);
  130 + }
  131 + //删除数据
  132 + let handleDelete=(row)=>{
  133 + deletData(row);
  134 + }
  135 + //获取当前年的前后三年
  136 + let yearData=Vue.ref([])
  137 + let getYearData=()=>{
  138 + let date=new Date();
  139 + let arr=[];
  140 + for(let i=0;i<=3;i++){
  141 + arr.push(date.getFullYear()-i);
  142 + if(i!=0){
  143 + arr.push(date.getFullYear()+i)
  144 + }
  145 + }
  146 + arr.sort((a, b) => {
  147 + return a - b
  148 + });
  149 + yearData.value=arr;
  150 + }
  151 + //新增配置
  152 + let addConfig=()=>{
  153 + hideDialog(true);
  154 + }
  155 + //批量删除配置
  156 + let delConfig=()=>{
  157 + if(checkData.value.length<1){
  158 + proxy.$global.showMsg('请至少选择一项','warning');
  159 + return;
  160 + }
  161 + deletData();
  162 + }
  163 + //删除操作
  164 + let deletData=(row)=>{
  165 + let idList='';
  166 + if(row){
  167 + idList=row.id;
  168 + }else{
  169 + if(checkData.value.length>0){
  170 + idList=checkData.value.join(',')
  171 + }
  172 + }
  173 +
  174 + proxy.$global.confirm("确认删除数据吗？", function () {
  175 + proxy.$http.get(`/api-analysis/busyAnalysis/remove`, {
  176 + idList: idList
  177 + }, function (res) {
  178 + if(res && res.success){
  179 + proxy.$global.showMsg('删除成功');
  180 + }else{
  181 + proxy.$global.showMsg('删除失败','error');
  182 + }
  183 + getDataList();
  184 + })
  185 + })
  186 + }
  187 + //保存配置
  188 + let saveConfig=()=>{
  189 + if(hourCheckList.value.length<1){
  190 + proxy.$global.showMsg('请至少选择一个时间','warning');
  191 + return;
  192 + }
  193 + let year='';
  194 + if(yearCheckList.value.length>0){
  195 + year=yearCheckList.value.join(",");
  196 + }
  197 + let month='';
  198 + if(monthCheckList.value.length>0){
  199 + month=monthCheckList.value.join(",");
  200 + }
  201 + let day='';
  202 + if(dayCheckList.value.length>0){
  203 + day=dayCheckList.value.join(",");
  204 + }
  205 + let hour='';
  206 + if(hourCheckList.value.length>0){
  207 + hour=hourCheckList.value.join(",");
  208 + }
  209 + if(dialog.value.id){
  210 + proxy.$http.post(`/api-analysis/busyAnalysis/update`, {
  211 + year: year,
  212 + month: month,
  213 + day: day,
  214 + hour: hour,
  215 + id:dialog.value.id
  216 + }, function (res) {
  217 + if(res && res.success){
  218 + proxy.$global.showMsg('修改成功');
  219 + }else{
  220 + proxy.$global.showMsg('修改失败','error');
  221 + }
  222 + hideDialog(false);
  223 + getDataList();
  224 + })
  225 + }else{
  226 + proxy.$http.post(`/api-analysis/busyAnalysis/add`, {
  227 + year: year,
  228 + month: month,
  229 + day: day,
  230 + hour: hour
  231 + }, function (res) {
  232 + if(res && res.success){
  233 + proxy.$global.showMsg('保存成功');
  234 + }else{
  235 + proxy.$global.showMsg('保存失败','error');
  236 + }
  237 + hideDialog(false);
  238 + getDataList();
  239 + })
  240 + }
  241 +
  242 +
  243 +
  244 + }
  245 + // 挂载完
  246 + Vue.onMounted(() => {
  247 + getYearData();
  248 + getDataList();
  249 + })
  250 +
  251 +
  252 + return {
  253 + saveConfig,
  254 + delConfig,
  255 + addConfig,
  256 + selectionChange,
  257 + handleDelete,
  258 + checkData,
  259 + yearData,
  260 + dialog,
  261 + getYearData,
  262 + height,
  263 + search,
  264 + hideDialog,
  265 + handle,
  266 + loaddata,
  267 + tableData,
  268 + getDataList,
  269 + handleEdit,
  270 + yearCheckList,
  271 + monthCheckList,
  272 + dayCheckList,
  273 + hourCheckList
  274 + }
  275 + }
  276 +
  277 +}
@@ -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>
@@ -6,12 +6,12 @@ @@ -6,12 +6,12 @@
6 </div> 6 </div>
7 <div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%','padding-top':'3px','flex':'1'}"> 7 <div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%','padding-top':'3px','flex':'1'}">
8 <div class="search"> 8 <div class="search">
9 - <div class="condition"> 9 + <div class="condition" style="width:100%;">
10 <el-form-item > 10 <el-form-item >
11 - <el-input style="width:160px;" v-model="search.keyword" placeholder="请输入关键字"></el-input> 11 + <el-input :size="$global.elementConfig.size.input" style="width:160px;margin-top:5px;" v-model="search.keyword" placeholder="请输入关键字"></el-input>
12 </el-form-item> 12 </el-form-item>
13 <el-form-item > 13 <el-form-item >
14 - <el-select style="width:160px;" v-model="search.provider" class="m-2" placeholder="请选择厂商" clearable> 14 + <el-select :size="$global.elementConfig.size.input" style="width:160px;margin-top:8px;" v-model="search.provider" class="m-2" placeholder="请选择厂商" clearable>
15 <el-option 15 <el-option
16 v-for="item in providerData" 16 v-for="item in providerData"
17 :key="item.ddicCode" 17 :key="item.ddicCode"
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 </el-select> 21 </el-select>
22 </el-form-item> 22 </el-form-item>
23 <el-form-item > 23 <el-form-item >
24 - <el-select style="width:160px;" v-model="search.system" class="m-2" placeholder="请选择系统" clearable> 24 + <el-select :size="$global.elementConfig.size.input" style="width:160px;margin-top:8px;" v-model="search.system" class="m-2" placeholder="请选择系统" clearable>
25 <el-option 25 <el-option
26 v-for="item in systemData" 26 v-for="item in systemData"
27 :key="item.ddicCode" 27 :key="item.ddicCode"
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 </el-select> 31 </el-select>
32 </el-form-item> 32 </el-form-item>
33 <el-form-item > 33 <el-form-item >
34 - <el-select style="width:160px;" v-model="search.resSyncState" class="m-2" placeholder="请选择同步状态" clearable> 34 + <el-select :size="$global.elementConfig.size.input" style="width:160px;margin-top:8px;" v-model="search.resSyncState" class="m-2" placeholder="请选择同步状态" clearable>
35 <el-option 35 <el-option
36 v-for="item in resSyncStateData" 36 v-for="item in resSyncStateData"
37 :key="item.ddicCode" 37 :key="item.ddicCode"
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 </el-select> 41 </el-select>
42 </el-form-item> 42 </el-form-item>
43 <el-form-item > 43 <el-form-item >
44 - <el-select style="width:160px;" v-model="search.disposeState" class="m-2" placeholder="请选择资源处理状态" clearable> 44 + <el-select :size="$global.elementConfig.size.input" style="width:160px;margin-top:8px;" v-model="search.disposeState" class="m-2" placeholder="请选择资源处理状态" clearable>
45 <el-option 45 <el-option
46 v-for="item in resDisposeStateData" 46 v-for="item in resDisposeStateData"
47 :key="item.ddicCode" 47 :key="item.ddicCode"
@@ -51,16 +51,16 @@ @@ -51,16 +51,16 @@
51 </el-select> 51 </el-select>
52 </el-form-item> 52 </el-form-item>
53 <el-form-item > 53 <el-form-item >
54 - <el-button @click="getDataList" type="primary">查询</el-button> 54 + <el-button :size="$global.elementConfig.size.button" @click="getDataList" type="primary">查询</el-button>
55 </el-form-item> 55 </el-form-item>
56 <el-form-item > 56 <el-form-item >
57 - <el-button @click="handleEdit" type="primary">纳入监控</el-button> 57 + <el-button :size="$global.elementConfig.size.button" @click="handleEdit" type="primary">纳入监控</el-button>
58 </el-form-item> 58 </el-form-item>
59 <el-form-item > 59 <el-form-item >
60 - <el-button @click="handleIgnore" >忽略</el-button> 60 + <el-button :size="$global.elementConfig.size.button" @click="handleIgnore" >忽略</el-button>
61 </el-form-item> 61 </el-form-item>
62 <el-form-item > 62 <el-form-item >
63 - <el-button @click="handleRefresh">同步</el-button> 63 + <el-button :size="$global.elementConfig.size.button" @click="handleRefresh">同步</el-button>
64 </el-form-item> 64 </el-form-item>
65 </div> 65 </div>
66 </div> 66 </div>
@@ -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.button" @click="search"> 查询</el-button>
31 </div> 31 </div>
32 </div> 32 </div>
33 </el-col> 33 </el-col>
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div class="search"> 3 <div class="search">
4 <div class="condition"> 4 <div class="condition">
5 <el-form-item > 5 <el-form-item >
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 > 8 <el-form-item >
9 <el-dropdown> 9 <el-dropdown>
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 </el-dropdown> 11 </el-dropdown>
12 </el-form-item> 12 </el-form-item>
13 <el-form-item > 13 <el-form-item >
14 - <el-select v-model="search.program" class="m-2" placeholder="日志类型" clearable> 14 + <el-select :size="$global.elementConfig.size.input" v-model="search.program" class="m-2" placeholder="日志类型" clearable>
15 <el-option 15 <el-option
16 v-for="item in logTypeData" 16 v-for="item in logTypeData"
17 :key="item.ddicCode" 17 :key="item.ddicCode"
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 /> 33 />
34 </el-form-item> 34 </el-form-item>
35 <el-form-item > 35 <el-form-item >
36 - <el-button @click="getDataList">查询</el-button> 36 + <el-button :size="$global.elementConfig.size.button" @click="getDataList">查询</el-button>
37 </el-form-item> 37 </el-form-item>
38 </div> 38 </div>
39 </div> 39 </div>
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 </dev> 25 </dev>
26 </template> 26 </template>
27 <el-upload 27 <el-upload
28 - class="upload-demo" 28 + class="upload-demo-logoConfig"
29 :show-file-list="false" 29 :show-file-list="false"
30 :before-upload="beforeAvatarUpload" 30 :before-upload="beforeAvatarUpload"
31 :data="item.imageUrl" 31 :data="item.imageUrl"
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 </dev> 57 </dev>
58 </template> 58 </template>
59 <el-upload 59 <el-upload
60 - class="upload-demo" 60 + class="upload-demo-logoConfig"
61 :show-file-list="false" 61 :show-file-list="false"
62 :before-upload="beforeAvatarUpload" 62 :before-upload="beforeAvatarUpload"
63 :data="item.imageUrlBg" 63 :data="item.imageUrlBg"
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 </dev> 88 </dev>
89 </template> 89 </template>
90 <el-upload 90 <el-upload
91 - class="upload-demo" 91 + class="upload-demo-logoConfig"
92 :show-file-list="false" 92 :show-file-list="false"
93 :before-upload="beforeAvatarUpload" 93 :before-upload="beforeAvatarUpload"
94 :data="item.imageUrlSkin" 94 :data="item.imageUrlSkin"
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 </dev> 119 </dev>
120 </template> 120 </template>
121 <el-upload 121 <el-upload
122 - class="upload-demo" 122 + class="upload-demo-logoConfig"
123 :show-file-list="false" 123 :show-file-list="false"
124 :before-upload="beforeAvatarUpload" 124 :before-upload="beforeAvatarUpload"
125 :data="item.imageUrlIndex" 125 :data="item.imageUrlIndex"
@@ -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 style="width:160px" 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" style="width:160px" 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 </div> 10 </div>
11 <div class="search-table"> 11 <div class="search-table">
@@ -45,10 +45,10 @@ @@ -45,10 +45,10 @@
45 <div class="search"> 45 <div class="search">
46 <div class="condition"> 46 <div class="condition">
47 <el-form-item > 47 <el-form-item >
48 - <el-input v-model="search.keyword" placeholder="=关键字="></el-input> 48 + <el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="=关键字="></el-input>
49 </el-form-item> 49 </el-form-item>
50 <el-form-item > 50 <el-form-item >
51 - <el-select v-model="search.kpiId" class="m-2" placeholder="指标" clearable @change="kpiChange"> 51 + <el-select :size="$global.elementConfig.size.input" v-model="search.kpiId" class="m-2" placeholder="指标" clearable @change="kpiChange">
52 <el-option 52 <el-option
53 v-for="item in kpiData" 53 v-for="item in kpiData"
54 :key="item.kpiId" 54 :key="item.kpiId"
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 </el-select> 59 </el-select>
60 </el-form-item> 60 </el-form-item>
61 <el-form-item > 61 <el-form-item >
62 - <el-select v-model="search.flag" class="m-2" placeholder="flag" clearable> 62 + <el-select :size="$global.elementConfig.size.input" v-model="search.flag" class="m-2" placeholder="flag" clearable>
63 <el-option 63 <el-option
64 v-for="item in flagData" 64 v-for="item in flagData"
65 :key="item.flag" 65 :key="item.flag"
@@ -76,11 +76,12 @@ @@ -76,11 +76,12 @@
76 placeholder="日期" 76 placeholder="日期"
77 end-placeholder="结束时间" 77 end-placeholder="结束时间"
78 value-format="YYYY-MM-DD HH:mm:ss" 78 value-format="YYYY-MM-DD HH:mm:ss"
  79 + :size="$global.elementConfig.size.input"
79 /> 80 />
80 81
81 </el-form-item> 82 </el-form-item>
82 <el-form-item > 83 <el-form-item >
83 - <el-button @click="getDataList">查询</el-button> 84 + <el-button :size="$global.elementConfig.size.button" @click="getDataList">查询</el-button>
84 </el-form-item> 85 </el-form-item>
85 </div> 86 </div>
86 </div> 87 </div>
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 .fault-book-input-text{ 28 .fault-book-input-text{
29 /* width: 25%; 29 /* width: 25%;
30 text-align: center;*/ 30 text-align: center;*/
31 - margin-right: 27px; 31 + margin-right: 6px;
32 } 32 }
33 .fault-card{ 33 .fault-card{
34 background: #fff; 34 background: #fff;
@@ -238,6 +238,12 @@ const routes = [{ @@ -238,6 +238,12 @@ const routes = [{
238 name: 'logoConfig', 238 name: 'logoConfig',
239 component: () => myImport('views/logoConfig/index') 239 component: () => myImport('views/logoConfig/index')
240 }, 240 },
  241 + //忙时配置
  242 + {
  243 + path: '/vue3/busyConfig',
  244 + name: 'busyConfig',
  245 + component: () => myImport('views/busyConfig/index')
  246 + },
241 ]; 247 ];
242 248
243 // hash模式： createWebHashHistory 249 // hash模式： createWebHashHistory
@@ -2,14 +2,14 @@ @@ -2,14 +2,14 @@
2 <div class="cm-card" :style="{'min-height':height+'px','height':'100%'}"> 2 <div class="cm-card" :style="{'min-height':height+'px','height':'100%'}">
3 <analysis-line :legend="lineChart.legend" :xAxis="lineChart.xAxis" :series="lineChart.series"> 3 <analysis-line :legend="lineChart.legend" :xAxis="lineChart.xAxis" :series="lineChart.series">
4 <template #lineName="scope"> 4 <template #lineName="scope">
5 - <el-input v-model="form.scene.name" placeholder="请输入场景名称"/> 5 + <el-input :size="$global.elementConfig.size.input" v-model="form.scene.name" placeholder="请输入场景名称"/>
6 </template> 6 </template>
7 <template #tools="scope"> 7 <template #tools="scope">
8 - <el-button type="primary" style="margin-left: 10px" @click="showDialogForm(true)">保存</el-button> 8 + <el-button :size="$global.elementConfig.size.button" type="primary" style="margin-left: 10px" @click="showDialogForm(true)">保存</el-button>
9 </template> 9 </template>
10 <template #timeRange="scope"> 10 <template #timeRange="scope">
11 <el-dropdown style="margin-left: 100px"> 11 <el-dropdown style="margin-left: 100px">
12 - <el-button> 12 + <el-button :size="$global.elementConfig.size.button">
13 时间范围 <i class="el-icon el-icon-arrow-down"></i> 13 时间范围 <i class="el-icon el-icon-arrow-down"></i>
14 </el-button> 14 </el-button>
15 <template #dropdown> 15 <template #dropdown>
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 </template> 26 </template>
27 <template #frequency="scope"> 27 <template #frequency="scope">
28 <el-dropdown style="margin-left: 10px"> 28 <el-dropdown style="margin-left: 10px">
29 - <el-button style="display: none !important;"> 29 + <el-button :size="$global.elementConfig.size.button" style="display: none !important;">
30 聚合频率 <i class="el-icon el-icon-arrow-down"></i> 30 聚合频率 <i class="el-icon el-icon-arrow-down"></i>
31 </el-button> 31 </el-button>
32 <template #dropdown> 32 <template #dropdown>
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 <div style="width: calc(100% - 12px);padding: 0px 6px"> 51 <div style="width: calc(100% - 12px);padding: 0px 6px">
52 <el-row :gutter="5"> 52 <el-row :gutter="5">
53 <el-col :span="4"> 53 <el-col :span="4">
54 - <div style="display: flex;flex-wrap: wrap;width: 100%;padding-left: 15px;"> 54 + <div style="display: flex;flex-wrap: wrap;width: 100%;padding-left: 15px;padding-right:15px;box-sizing: border-box;">
55 <!--<el-dropdown> 55 <!--<el-dropdown>
56 <el-icon class="el-icon&#45;&#45;right"> 56 <el-icon class="el-icon&#45;&#45;right">
57 <arrow-down/> 57 <arrow-down/>
@@ -59,13 +59,13 @@ @@ -59,13 +59,13 @@
59 <cm-biz-type-tree-input multiple clearable collapseTags @callback="getBizType"/> 59 <cm-biz-type-tree-input multiple clearable collapseTags @callback="getBizType"/>
60 </el-dropdown>--> 60 </el-dropdown>-->
61 61
62 - <el-select v-model="busTypeArr" multiple filterable clearable collapse-tags placeholder="请选择业务" style="margin-top: 10px"> 62 + <el-select :size="$global.elementConfig.size.input" v-model="busTypeArr" multiple filterable clearable collapse-tags placeholder="请选择业务" style="margin-top: 10px">
63 <el-option 63 <el-option
64 v-for="item in busTypeList" 64 v-for="item in busTypeList"
65 :label="item.busTypeName" :value="item.busId"></el-option> 65 :label="item.busTypeName" :value="item.busId"></el-option>
66 </el-select> 66 </el-select>
67 67
68 - <el-dropdown> 68 + <el-dropdown :size="$global.elementConfig.size.input">
69 <el-icon class="el-icon--right"> 69 <el-icon class="el-icon--right">
70 <arrow-down/> 70 <arrow-down/>
71 </el-icon> 71 </el-icon>
@@ -79,17 +79,17 @@ @@ -79,17 +79,17 @@
79 <cm-kpi-type-tree-input multiple clearable collapseTags @callback="getKpiType"/> 79 <cm-kpi-type-tree-input multiple clearable collapseTags @callback="getKpiType"/>
80 </el-dropdown>--> 80 </el-dropdown>-->
81 81
82 - <el-select v-model="kpiTypeArr" multiple filterable clearable collapse-tags placeholder="请选择指标" style="margin-top: 10px"> 82 + <el-select :size="$global.elementConfig.size.input" v-model="kpiTypeArr" multiple filterable clearable collapse-tags placeholder="请选择指标" style="margin-top: 10px">
83 <el-option 83 <el-option
84 v-for="item in kpiList" 84 v-for="item in kpiList"
85 :label="item.kpiName" :value="item.kpiId"></el-option> 85 :label="item.kpiName" :value="item.kpiId"></el-option>
86 </el-select> 86 </el-select>
87 87
88 - <el-input v-model="keyWords" placeholder="输入关键字" style="margin-top: 15px;width: 225px;"/> 88 + <el-input :size="$global.elementConfig.size.input" v-model="keyWords" placeholder="输入关键字" style="margin-top: 15px;width: 225px;"/>
89 89
90 <div style="margin-top: 10px;text-align: center"> 90 <div style="margin-top: 10px;text-align: center">
91 - <el-button type="primary" @click="onReset()">重置</el-button>  
92 - <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> 91 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button>
  92 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
93 </div> 93 </div>
94 </div> 94 </div>
95 </el-col> 95 </el-col>
@@ -144,23 +144,23 @@ @@ -144,23 +144,23 @@
144 </div> 144 </div>
145 <div v-if="!isAdd " style="padding: 3px 10px 3px 39px"> 145 <div v-if="!isAdd " style="padding: 3px 10px 3px 39px">
146 <span class="saab"> 菜单：</span> 146 <span class="saab"> 菜单：</span>
147 - <el-select style="width: 80%" v-model="form.addFirstPId" placeholder="请选择菜单" filterable @change="dataFilter"> 147 + <el-select :size="$global.elementConfig.size.input" style="width: 80%" v-model="form.addFirstPId" placeholder="请选择菜单" filterable @change="dataFilter">
148 <el-option v-for="item in firstMenu" :key="item.id" :label="item.name" :value="item.id" /> 148 <el-option v-for="item in firstMenu" :key="item.id" :label="item.name" :value="item.id" />
149 </el-select> 149 </el-select>
150 </div> 150 </div>
151 <div v-if="!isAdd " style="padding: 3px 10px;"> 151 <div v-if="!isAdd " style="padding: 3px 10px;">
152 <span class="saab"> 场景分类：</span> 152 <span class="saab"> 场景分类：</span>
153 - <el-input style="width: 75%" v-model="form.parentName" placeholder="请输入场景分类"/> 153 + <el-input :size="$global.elementConfig.size.input" style="width: 75%" v-model="form.parentName" placeholder="请输入场景分类"/>
154 </div> 154 </div>
155 155
156 <div v-if="!isAdd " style="padding: 3px 10px;"> 156 <div v-if="!isAdd " style="padding: 3px 10px;">
157 <span class="saab"> 分类描述：</span> 157 <span class="saab"> 分类描述：</span>
158 - <el-input style="width: 75%" v-model="form.desc" placeholder="请输入场景分类描述"/> 158 + <el-input :size="$global.elementConfig.size.input" style="width: 75%" v-model="form.desc" placeholder="请输入场景分类描述"/>
159 </div> 159 </div>
160 160
161 <div v-else style="padding: 3px 10px;"> 161 <div v-else style="padding: 3px 10px;">
162 <span class="saab"> 场景分类：</span> 162 <span class="saab"> 场景分类：</span>
163 - <el-select style="width: 75%" v-model="form.parentId" placeholder="请选择场景分类" > 163 + <el-select :size="$global.elementConfig.size.input" style="width: 75%" v-model="form.parentId" placeholder="请选择场景分类" >
164 <el-option 164 <el-option
165 v-for="item in parentList" 165 v-for="item in parentList"
166 :key="item.id" 166 :key="item.id"
@@ -175,16 +175,16 @@ @@ -175,16 +175,16 @@
175 <!-- </div>--> 175 <!-- </div>-->
176 <div style="padding: 3px 10px;"> 176 <div style="padding: 3px 10px;">
177 <span class="saab"> 场景名称：</span> 177 <span class="saab"> 场景名称：</span>
178 - <el-input style="width: 75%" v-model="form.scene.name" placeholder="请输入场景名称"/> 178 + <el-input :size="$global.elementConfig.size.input" style="width: 75%" v-model="form.scene.name" placeholder="请输入场景名称"/>
179 </div> 179 </div>
180 <div style="padding: 3px 10px;"> 180 <div style="padding: 3px 10px;">
181 <span class="saab"> 场景描述：</span> 181 <span class="saab"> 场景描述：</span>
182 182
183 - <el-input style="width: 75%" v-model="form.scene.desc" placeholder="请输入场景描述"/> 183 + <el-input :size="$global.elementConfig.size.input" style="width: 75%" v-model="form.scene.desc" placeholder="请输入场景描述"/>
184 </div> 184 </div>
185 <div style="padding: 3px 10px 3px 39px"> 185 <div style="padding: 3px 10px 3px 39px">
186 <span class="saab"> 排序：</span> 186 <span class="saab"> 排序：</span>
187 - <el-input style="width: 80%" v-model="form.scene.sort" type="number" :maxlength="10" placeholder="请输入排序"/> 187 + <el-input :size="$global.elementConfig.size.input" style="width: 80%" v-model="form.scene.sort" type="number" :maxlength="10" placeholder="请输入排序"/>
188 </div> 188 </div>
189 </template> 189 </template>
190 </cm-dialog> 190 </cm-dialog>
@@ -15,9 +15,9 @@ @@ -15,9 +15,9 @@
15 <el-row class="list-search"> 15 <el-row class="list-search">
16 <el-col :span="6"> 16 <el-col :span="6">
17 <div class="search-input flex-div-start"> 17 <div class="search-input flex-div-start">
18 - <el-input v-model="inputSearch" placeholder="请输入查询内容" /> 18 + <el-input :size="$global.elementConfig.size.input" v-model="inputSearch" placeholder="请输入查询内容" />
19 <!-- <span class="search-text" >搜索</span>--> 19 <!-- <span class="search-text" >搜索</span>-->
20 - <el-button type="primary" @click="searchData" class="search-text button-flex-div-center">搜索</el-button> 20 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="searchData" class="search-text button-flex-div-center">搜索</el-button>
21 21
22 </div> 22 </div>
23 23
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <el-row class="list-title"> 26 <el-row class="list-title">
27 <el-col :span="24" class="text-left"> 27 <el-col :span="24" class="text-left">
28 <router-link :to="'/analysis/add'" class="analysis link-type"> 28 <router-link :to="'/analysis/add'" class="analysis link-type">
29 - <el-button type="primary" class="button-flex-div-center"><i class="el-icon-plus"></i>新增</el-button> 29 + <el-button :size="$global.elementConfig.size.button" type="primary" class="button-flex-div-center"><i class="el-icon-plus"></i>新增</el-button>
30 </router-link> 30 </router-link>
31 31
32 <!-- <el-button type="primary" class="button-flex-div-center"><i class="icon-list icon-list-delete"></i>删除</el-button>--> 32 <!-- <el-button type="primary" class="button-flex-div-center"><i class="icon-list icon-list-delete"></i>删除</el-button>-->
@@ -81,11 +81,11 @@ @@ -81,11 +81,11 @@
81 <el-dialog v-model="addVisible" :title="添加配置" width="50%" @close="closeDialog" top="15vh"> 81 <el-dialog v-model="addVisible" :title="添加配置" width="50%" @close="closeDialog" top="15vh">
82 <el-form ref="addHandleForm" :model="addHandleForm" label-width="120px"> 82 <el-form ref="addHandleForm" :model="addHandleForm" label-width="120px">
83 <el-form-item label="名称"> 83 <el-form-item label="名称">
84 - <el-input v-model="addHandleForm.parentName"></el-input> 84 + <el-input :size="$global.elementConfig.size.input" v-model="addHandleForm.parentName"></el-input>
85 </el-form-item> 85 </el-form-item>
86 86
87 <el-form-item label="描述"> 87 <el-form-item label="描述">
88 - <el-input v-model="addHandleForm.desc"></el-input> 88 + <el-input :size="$global.elementConfig.size.input" v-model="addHandleForm.desc"></el-input>
89 </el-form-item> 89 </el-form-item>
90 </el-form> 90 </el-form>
91 </el-dialog> 91 </el-dialog>
@@ -32,11 +32,11 @@ export default { @@ -32,11 +32,11 @@ export default {
32 32
33 parentInfo.value = parentList; 33 parentInfo.value = parentList;
34 childArr.value =child; 34 childArr.value =child;
35 - 35 + if(child){
36 child.forEach(function (v){ 36 child.forEach(function (v){
37 getChartData(v); 37 getChartData(v);
38 }) 38 })
39 - 39 + }
40 } 40 }
41 }); 41 });
42 } 42 }
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 <el-col :span="24"> 8 <el-col :span="24">
9 <div class="flex-div-start margin-top-bottom-10"> 9 <div class="flex-div-start margin-top-bottom-10">
10 10
11 - <el-select class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源"> 11 + <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源">
12 <el-option 12 <el-option
13 v-for="item in resTypeList" 13 v-for="item in resTypeList"
14 :label="item.resName" :value="item.resId"></el-option> 14 :label="item.resName" :value="item.resId"></el-option>
@@ -19,19 +19,19 @@ @@ -19,19 +19,19 @@
19 </el-dropdown>--> 19 </el-dropdown>-->
20 20
21 21
22 - <el-select class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标"> 22 + <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标">
23 <el-option 23 <el-option
24 v-for="item in kpiList" 24 v-for="item in kpiList"
25 :label="item.kpiName" :value="item.kpiId"></el-option> 25 :label="item.kpiName" :value="item.kpiId"></el-option>
26 </el-select> 26 </el-select>
27 27
28 - <el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" /> 28 + <el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
29 29
30 <div class="flex-div-start"> 30 <div class="flex-div-start">
31 - <el-button type="primary" @click="onReset()">重置</el-button>  
32 - <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>  
33 - <el-button type="primary" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>  
34 - <el-button type="primary" @click="saveAllData()" style="margin-left: 10px">全部添加</el-button> 31 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button>
  32 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
  33 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
  34 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="saveAllData()" style="margin-left: 10px">全部添加</el-button>
35 </div> 35 </div>
36 36
37 </div> 37 </div>
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="apmMonitorListChecked" 42 <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="apmMonitorListChecked"
43 :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" 43 :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange"
44 :showBorder="true" :loading="false" :pageSize="pageSize" 44 :showBorder="true" :loading="false" :pageSize="pageSize"
45 - :showPage="true" :showTools="true" :height="(height - 500)"> 45 + :showPage="true" :showTools="true" :height="(height - 300)">
46 <template #tools="{scope}"> 46 <template #tools="{scope}">
47 <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)"> 47 <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)">
48 <i class="el-icon-plus"/> 添加 48 <i class="el-icon-plus"/> 添加
@@ -47,6 +47,7 @@ export default { @@ -47,6 +47,7 @@ export default {
47 setup(props){ 47 setup(props){
48 const {proxy} = Vue.getCurrentInstance(); 48 const {proxy} = Vue.getCurrentInstance();
49 let id = proxy.$global.getQueryVariable('configId') ; 49 let id = proxy.$global.getQueryVariable('configId') ;
  50 + let height=Vue.ref(window.innerHeight);
50 let config = Vue.ref(id == false ? null : id); 51 let config = Vue.ref(id == false ? null : id);
51 let count=Vue.ref(0); 52 let count=Vue.ref(0);
52 let tableDataList = Vue.ref([]); 53 let tableDataList = Vue.ref([]);
@@ -301,7 +302,8 @@ export default { @@ -301,7 +302,8 @@ export default {
301 resTypeList, 302 resTypeList,
302 init, 303 init,
303 onReset, 304 onReset,
304 - onBtnSearch 305 + onBtnSearch,
  306 + height
305 } 307 }
306 308
307 }, 309 },
@@ -8,30 +8,13 @@ @@ -8,30 +8,13 @@
8 <el-col :span="24"> 8 <el-col :span="24">
9 <div class="flex-div-start margin-top-bottom-10"> 9 <div class="flex-div-start margin-top-bottom-10">
10 10
11 - <!-- <el-select class="margin-right-10" v-model="busTypeArr" filterable clearable collapse-tags placeholder="请选择业务">  
12 - <el-option  
13 - v-for="item in busTypeList"  
14 - :label="item.busTypeName" :value="item.busId"></el-option>  
15 - </el-select>  
16 - -->  
17 - <!-- <el-dropdown class="margin-right-10">  
18 - <cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/>  
19 - </el-dropdown>  
20 -  
21 -  
22 - <el-select class="margin-right-10" v-model="kpiTypeArr" multiple filterable clearable collapse-tags placeholder="请选择指标">  
23 - <el-option  
24 - v-for="item in kpiList"  
25 - :label="item.kpiName" :value="item.kpiId"></el-option>  
26 - </el-select>-->  
27 -  
28 - <el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" /> 11 + <el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
29 12
30 <div class="flex-div-start"> 13 <div class="flex-div-start">
31 - <el-button type="primary" @click="onReset()">重置</el-button>  
32 - <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>  
33 - <el-button type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>  
34 - <el-button type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button> 14 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button>
  15 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
  16 + <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
  17 + <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>
35 </div> 18 </div>
36 </div> 19 </div>
37 </el-col> 20 </el-col>
@@ -41,7 +24,7 @@ @@ -41,7 +24,7 @@
41 <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="applicationMonitorListChecked" 24 <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="applicationMonitorListChecked"
42 :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" 25 :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange"
43 :showBorder="true" :loading="false" :pageSize="pageSize" 26 :showBorder="true" :loading="false" :pageSize="pageSize"
44 - :showPage="true" :showTools="true" :height="(height - 500)"> 27 + :showPage="true" :showTools="true" :height="(height - 300)">
45 <template #default="{row,prop,column}"> 28 <template #default="{row,prop,column}">
46 <div v-if="prop == 'url'" class="text-overflow" :title="row.url"> 29 <div v-if="prop == 'url'" class="text-overflow" :title="row.url">
47 <span class="">{{row.url }}</span> 30 <span class="">{{row.url }}</span>
@@ -28,6 +28,7 @@ export default { @@ -28,6 +28,7 @@ export default {
28 setup(props){ 28 setup(props){
29 const {proxy} = Vue.getCurrentInstance(); 29 const {proxy} = Vue.getCurrentInstance();
30 let id = proxy.$global.getQueryVariable('configId') ; 30 let id = proxy.$global.getQueryVariable('configId') ;
  31 + let height=Vue.ref(window.innerHeight);
31 let config = Vue.ref(id == false ? null : id); 32 let config = Vue.ref(id == false ? null : id);
32 let count=Vue.ref(0); 33 let count=Vue.ref(0);
33 let tableDataList = Vue.ref([]); 34 let tableDataList = Vue.ref([]);
@@ -305,7 +306,8 @@ export default { @@ -305,7 +306,8 @@ export default {
305 targetId, 306 targetId,
306 init, 307 init,
307 onReset, 308 onReset,
308 - onBtnSearch 309 + onBtnSearch,
  310 + height
309 } 311 }
310 312
311 }, 313 },
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <el-row> 2 <el-row>
3 <el-col :span="6"> 3 <el-col :span="6">
4 <div class="search-input margin-30 flex-div-start"> 4 <div class="search-input margin-30 flex-div-start">
5 - <el-input v-model="name" placeholder="故障诊断" class="fault-book-input-text" /> 5 + <el-input :size="$global.elementConfig.size.input" v-model="name" placeholder="故障诊断" class="fault-book-input-text" />
6 <span class="search-text" style="border-radius: 4px" @click="searchList">搜索</span> 6 <span class="search-text" style="border-radius: 4px" @click="searchList">搜索</span>
7 </div> 7 </div>
8 8
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 </div> 33 </div>
34 <el-row v-if="!addSetLIstVisible" class="flex-div-start" style="margin: 20px 0 10px 4%;" > 34 <el-row v-if="!addSetLIstVisible" class="flex-div-start" style="margin: 20px 0 10px 4%;" >
35 <span>配置链路名称</span> 35 <span>配置链路名称</span>
36 - <el-input style="flex:1;margin-left:10px;" maxlength="50" class="margin-right-10" v-model="linkName" placeholder="输入链路名称" /> 36 + <el-input :size="$global.elementConfig.size.input" style="flex:1;margin-left:10px;" maxlength="50" class="margin-right-10" v-model="linkName" placeholder="输入链路名称" />
37 37
38 </el-row> 38 </el-row>
39 <div class="context-body"> 39 <div class="context-body">
@@ -102,12 +102,10 @@ @@ -102,12 +102,10 @@
102 </el-row> 102 </el-row>
103 103
104 <div v-if="!addSetLIstVisible" class="margin-top flex-center position-bottom"> 104 <div v-if="!addSetLIstVisible" class="margin-top flex-center position-bottom">
105 - <el-button @click="saveLinkAndNodeInfo" type="primary">保存</el-button> 105 + <el-button :size="$global.elementConfig.size.button" @click="saveLinkAndNodeInfo" type="primary">保存</el-button>
106 </div> 106 </div>
107 -  
108 </div> 107 </div>
109 </div> 108 </div>
110 -  
111 </div> 109 </div>
112 </el-col> 110 </el-col>
113 </el-row> 111 </el-row>
@@ -118,41 +116,28 @@ @@ -118,41 +116,28 @@
118 <el-row> 116 <el-row>
119 <el-col :span="24"> 117 <el-col :span="24">
120 <div class="flex-div-start margin-top-bottom-10"> 118 <div class="flex-div-start margin-top-bottom-10">
121 -  
122 - <!--<el-select class="margin-right-10" v-model="busTypeArr" multiple filterable clearable collapse-tags placeholder="请选择业务">  
123 - <el-option  
124 - v-for="item in busTypeList"  
125 - :label="item.busTypeName" :value="item.busId"></el-option>  
126 - </el-select>-->  
127 - <el-select class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源"> 119 + <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源">
128 <el-option 120 <el-option
129 v-for="item in resTypeList" 121 v-for="item in resTypeList"
130 :label="item.resName" :value="item.resId"></el-option> 122 :label="item.resName" :value="item.resId"></el-option>
131 </el-select> 123 </el-select>
132 124
133 - <!-- <el-dropdown class="margin-right-10">  
134 - <cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/>  
135 - </el-dropdown>-->  
136 -  
137 -  
138 - <el-select class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标"> 125 + <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标">
139 <el-option 126 <el-option
140 v-for="item in kpiList" 127 v-for="item in kpiList"
141 :label="item.kpiName" :value="item.kpiId"></el-option> 128 :label="item.kpiName" :value="item.kpiId"></el-option>
142 </el-select> 129 </el-select>
143 130
144 - <!-- <el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />-->  
145 -  
146 <div class="flex-div-start"> 131 <div class="flex-div-start">
147 - <el-button type="primary" @click="onReset()">重置</el-button>  
148 - <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> 132 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button>
  133 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
149 </div> 134 </div>
150 </div> 135 </div>
151 </el-col> 136 </el-col>
152 </el-row> 137 </el-row>
153 <el-row v-if="flag" class="flex-div-start" style="margin-bottom: 10px;margin-top: 10px;padding-top:10px;border-top:1px solid #ebeef5" > 138 <el-row v-if="flag" class="flex-div-start" style="margin-bottom: 10px;margin-top: 10px;padding-top:10px;border-top:1px solid #ebeef5" >
154 <span>节点名称</span> 139 <span>节点名称</span>
155 - <el-input style="flex:1;margin-left:10px;" class="margin-right-10" maxlength="50" v-model.trim="nodeName" placeholder="输入节点名称" /> 140 + <el-input :size="$global.elementConfig.size.input" style="flex:1;margin-left:10px;" class="margin-right-10" maxlength="50" v-model.trim="nodeName" placeholder="输入节点名称" />
156 </el-row> 141 </el-row>
157 <el-row class="margin-bottom-50"> 142 <el-row class="margin-bottom-50">
158 <el-col :span="24" :class="[{'table-height':!flag},{'table-height-45':flag}]"> 143 <el-col :span="24" :class="[{'table-height':!flag},{'table-height-45':flag}]">
@@ -179,7 +164,7 @@ @@ -179,7 +164,7 @@
179 164
180 </el-row> 165 </el-row>
181 <div v-if="tableVisible" class="margin-top btn-faultDiagnosis flex-center position-bottom"> 166 <div v-if="tableVisible" class="margin-top btn-faultDiagnosis flex-center position-bottom">
182 - <el-button @click="cancleList">取消</el-button> 167 + <el-button :size="$global.elementConfig.size.button" @click="cancleList">取消</el-button>
183 <!-- <el-button @click="saveList" type="primary">保存</el-button>--> 168 <!-- <el-button @click="saveList" type="primary">保存</el-button>-->
184 </div> 169 </div>
185 </template> 170 </template>
@@ -7,13 +7,13 @@ @@ -7,13 +7,13 @@
7 <el-row> 7 <el-row>
8 <el-col :span="24"> 8 <el-col :span="24">
9 <div class="flex-div-start margin-top-bottom-10"> 9 <div class="flex-div-start margin-top-bottom-10">
10 - <el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" /> 10 + <el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
11 11
12 <div class="flex-div-start"> 12 <div class="flex-div-start">
13 - <el-button type="primary" @click="onReset()">重置</el-button>  
14 - <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>  
15 - <el-button type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>  
16 - <el-button type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button> 13 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button>
  14 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
  15 + <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
  16 + <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>
17 </div> 17 </div>
18 </div> 18 </div>
19 </el-col> 19 </el-col>
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="dialtestMonitorListChecked" 23 <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="dialtestMonitorListChecked"
24 :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" 24 :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange"
25 :showBorder="true" :loading="false" :pageSize="pageSize" 25 :showBorder="true" :loading="false" :pageSize="pageSize"
26 - :showPage="true" :showTools="true" :height="(height - 500)"> 26 + :showPage="true" :showTools="true" :height="(height - 300)">
27 <template #default="{row,prop,column}"> 27 <template #default="{row,prop,column}">
28 <div v-if="prop == 'url'" class="text-overflow" :title="row.url"> 28 <div v-if="prop == 'url'" class="text-overflow" :title="row.url">
29 <span class="">{{row.url }}</span> 29 <span class="">{{row.url }}</span>
@@ -28,6 +28,7 @@ export default { @@ -28,6 +28,7 @@ export default {
28 setup(props){ 28 setup(props){
29 const {proxy} = Vue.getCurrentInstance(); 29 const {proxy} = Vue.getCurrentInstance();
30 let id = proxy.$global.getQueryVariable('configId') ; 30 let id = proxy.$global.getQueryVariable('configId') ;
  31 + let height=Vue.ref(window.innerHeight);
31 let config = Vue.ref(id == false ? null : id); 32 let config = Vue.ref(id == false ? null : id);
32 let count=Vue.ref(0); 33 let count=Vue.ref(0);
33 let tableDataList = Vue.ref([]); 34 let tableDataList = Vue.ref([]);
@@ -302,7 +303,8 @@ export default { @@ -302,7 +303,8 @@ export default {
302 targetId, 303 targetId,
303 init, 304 init,
304 onReset, 305 onReset,
305 - onBtnSearch 306 + onBtnSearch,
  307 + height
306 } 308 }
307 309
308 }, 310 },
1 <div class="container" :style="{'height':height+'px','max-height':height+'px'}"> 1 <div class="container" :style="{'height':height+'px','max-height':height+'px'}">
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"> 3 <div class="search">
4 - <div class="condition fault-book-input-text" style="width: 250px"> 4 + <div class="condition fault-book-input-text" >
5 <el-form-item> 5 <el-form-item>
6 - <el-input v-model="searchForm.keyword" placeholder="输入关键字"  
7 - @keydown.enter.native="getPage" class="fault-book-input-text"></el-input> 6 + <el-input :size="$global.elementConfig.size.input" v-model="searchForm.keyword" placeholder="输入关键字"
  7 + @keydown.enter.native="getPage" style="margin-top:5px;" class="fault-book-input-text"></el-input>
8 </el-form-item> 8 </el-form-item>
9 - <!--<el-form-item>  
10 - <el-select v-model="searchForm.category" placeholder="故障分类">  
11 - <el-option label="Zone one" value="shanghai"></el-option>  
12 - <el-option label="Zone two" value="beijing"></el-option>  
13 - </el-select>  
14 - </el-form-item>-->  
15 - </div>  
16 - <div class="btns" style="justify-content: left;padding-left: 0px">  
17 <el-form-item> 9 <el-form-item>
18 - <el-button type="primary" @click="getPage"> 10 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="getPage">
19 搜索 11 搜索
20 </el-button> 12 </el-button>
21 </el-form-item> 13 </el-form-item>
22 </div> 14 </div>
  15 + <div class="btns" style="justify-content: left;padding-left: 0px">
  16 +
  17 + </div>
23 </div> 18 </div>
24 19
25 <div class="search-table"> 20 <div class="search-table">