monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit cf8a5a019d33cc66251c63f2f81d23a8d050ef3d 2 parents ab913ab7 21a5ba95 wangfeng-mj ... master-500-dev master-500-dev-0327 master-500-dev-joke master-500-dev-lushangqing master-500-dev-lzc master-500-dev-xwx master-500-dev-yuanjinpeng master-500-dev-ztq master-500-dev-ztq1 master-500-prod master-500-prod-joke-new master-500-prod-lushangqing master-mj master-mj-610 master-mj-joke master-mj-yuanjinpeng master-mj-ztq master-prod-500-lushangqing wangfeng-500-dev

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
<title>忙时配置</title>
<iframe src="/vue3/index.html#/vue3/busyConfig" class="layadmin-iframe" style="height: 99.5%!important;"/>
... ...
... ... @@ -119,6 +119,8 @@
letter-spacing: 3px;
cursor: pointer;
font-size: 12px;
display: flex;
align-items: center;
}
.pie-flex-end{
display: flex;
... ...
... ... @@ -29,7 +29,7 @@
margin-left:6px;
width:200px;
}
.upload-demo{
.upload-demo-logoConfig{
margin-left:20px;
width:93px;
}
... ...
... ... @@ -13,7 +13,7 @@
value-format="YYYY-MM-DD HH:mm:ss"
:shortcuts="shortcuts"
@change="changeDate"
size="small"
:size="$global.elementConfig.size.input"
>
</el-date-picker>
</el-col>
... ...
... ... @@ -13,7 +13,7 @@
value-format="YYYY-MM-DD HH:mm:ss"
:shortcuts="shortcuts"
@change="changeDate"
size="small"
:size="$global.elementConfig.size.input"
>
</el-date-picker>
</el-col>
... ...
... ... @@ -37,48 +37,48 @@
:style="{'height':height+'px','max-height':height + 'px','overflow':'hidden'}">
<div style="display: flex;flex-direction: row;padding: 3px;background-color: white;padding-bottom: 5px;height:45px;border-bottom: solid 1px #EBEEF5">
<div style="width: calc(100% - 150px);padding-left: 6px;text-align: left;">
<el-input v-model="keyWord" placeholder="请输入关键字" :size="$global.elementSize" @keydown.enter.native="searchFile"
<el-input v-model="keyWord" placeholder="请输入关键字" :size="$global.elementConfig.size.input" @keydown.enter.native="searchFile"
style="width: 220px;margin-right:10px" clearable />
<el-button :size="$global.elementSize" @click="searchFile">
<el-button :size="$global.elementConfig.size.button" @click="searchFile">
<i class="iconfont icon-sousuo"></i>搜索</el-button>
<el-button :size="$global.elementSize" @click="showUserDialog(true)" v-if="!isView && !isRecycle">
<el-button :size="$global.elementConfig.size.button" @click="showUserDialog(true)" v-if="!isView && !isRecycle">
<i class="iconfont icon-icon--quanxian"></i>
授权
</el-button>
<el-button :size="$global.elementSize" @click="downloadFile">
<el-button :size="$global.elementConfig.size.button" @click="downloadFile">
<i class="iconfont icon-icon--download"></i>
下载
</el-button>
<el-button :size="$global.elementSize" @click="showFolder(true,true)" v-if="!isView & canAddFolder && !isRecycle">
<el-button :size="$global.elementConfig.size.button" @click="showFolder(true,true)" v-if="!isView & canAddFolder && !isRecycle">
<i class="iconfont icon-weidaqiadewenjianjia"></i>
新增文件夹
</el-button>
<el-button type="primary" :size="$global.elementSize" @click="showUploadFile(true)" v-if=" !isRecycle">
<el-button type="primary" :size="$global.elementConfig.size.button" @click="showUploadFile(true)" v-if=" !isRecycle">
<i class="iconfont icon-icon--shangchuan"></i>
上传
</el-button>
<el-button type="danger" :size="$global.elementSize" @click="deleteDocument('','file')">
<el-button type="danger" :size="$global.elementConfig.size.button" @click="deleteDocument('','file')">
<i class="iconfont icon-shanchuwenjianjia"></i>
删除
</el-button>
<el-button :size="$global.elementSize" @click="restore()" v-if="isRecycle">
<el-button :size="$global.elementConfig.size.button" @click="restore()" v-if="isRecycle">
<i class="iconfont icon-lunxun"></i>
还原
</el-button>
</div>
<div class="select-all" v-if="isSelect">
<el-button type="primary" :size="$global.elementSize" @click="selectAll()" v-if="activeBtn == 'view'" >
<el-button type="primary" :size="$global.elementConfig.size.button" @click="selectAll()" v-if="activeBtn == 'view'" >
{{selectText}}
</el-button>
</div>
<div v-if="isCut" style="text-align: right;width: 150px">
<el-button-group>
<el-button :size="$global.elementSize" :type="activeBtn == 'view' ? 'primary' : ''"
<el-button :size="$global.elementConfig.size.button" :type="activeBtn == 'view' ? 'primary' : ''"
@click="activeModel('view')">
<i class="iconfont icon-liebiaomoshi"></i>
</el-button>
<el-button :size="$global.elementSize" :type="activeBtn == 'list' ? 'primary' : ''"
<el-button :size="$global.elementConfig.size.button" :type="activeBtn == 'list' ? 'primary' : ''"
@click="activeModel('list')">
<i class="iconfont icon-liebiao"></i>
</el-button>
... ... @@ -138,7 +138,7 @@
</div>
<div v-if="activeBtn == 'view'" style="background-color: white" :style="{'height':(height -50) +'px','max-height':(height -50) + 'px','overflow':'auto'}">
<div style="text-align: left;margin: 6px;border-bottom: solid 1px #F2F6FC;padding-bottom: 5px;">
<el-tag v-for="(item,index) in historyNode" :size="$global.elementSize" :key="item.id" closable
<el-tag v-for="(item,index) in historyNode" :size="$global.elementConfig.size.button" :key="item.id" closable
@close="tagHandleClose(index)" @click="clickTopNav(item,index)"
:type="item.id == currentNodeData.id ? 'success' :'info' "
type="info" style="margin: 0px 3px">
... ... @@ -148,7 +148,7 @@
<div style="display: flex;flex-wrap: wrap;">
<div v-for="file in dataList" style="width: 120px;margin: 10px;position: relative">
<div style="position: absolute;right: 5px">
<el-checkbox v-model="file.checked" label="" :size="$global.elementSize"></el-checkbox>
<el-checkbox v-model="file.checked" label="" :size="$global.elementConfig.size.input"></el-checkbox>
</div>
<el-link type="primary" :underline="false" @click="getFile(file)">
<i class="iconfont "
... ... @@ -158,7 +158,7 @@
<br/>
<el-link type="info" :underline="false" @click="reNameFile(file,false)" >
<div v-if="!reNameFileFlg[file.id]" style="width: 120px;overflow: hidden;text-overflow: ellipsis;text-align: center;">{{file.fileName}}</div>
<el-input :autofocus="true" v-if="reNameFileFlg[file.id]" placeholder="输入文件名" v-model="file.fileName" @blur="reNameFile(file,true)"></el-input>
<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>
</el-link>
</div>
<div v-if="dataList.length == 0" style=" text-align: center; width: 100%;">
... ... @@ -181,27 +181,27 @@
label-width="120px">
<el-form-item label="文档名称" prop="name">
<el-input :size="$global.elementSize" v-model="docForm.name" clearable ></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="docForm.name" clearable ></el-input>
</el-form-item>
<!-- <div v-if="!isUserFolder">
<el-form-item label="文档编号" prop="docNo">
<el-input :size="$global.elementSize" v-model="docForm.docNo" clearable></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="docForm.docNo" clearable></el-input>
</el-form-item>
<el-form-item label="文档类型" prop="type">
<el-input :size="$global.elementSize" v-model="docForm.type" clearable></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="docForm.type" clearable></el-input>
</el-form-item>
</div>-->
<el-form-item label="排序" prop="sort">
<el-input :size="$global.elementSize" @input="inputMax" type="number" max="100000" maxlength="100000" v-model="docForm.sort" clearable></el-input>
<el-input :size="$global.elementConfig.size.input" @input="inputMax" type="number" max="100000" maxlength="100000" v-model="docForm.sort" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button :size="$global.elementSize" type="primary" @click="addFolder('ruleForm')">保存</el-button>
<el-button :size="$global.elementSize" @click="showFolder(false)">取消</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="addFolder('ruleForm')">保存</el-button>
<el-button :size="$global.elementConfig.size.button" @click="showFolder(false)">取消</el-button>
</el-form-item>
</el-form>
</template>
... ...
... ... @@ -2,8 +2,8 @@
<div>
<!-- 人员信息总汇-->
<el-divider content-position="left">人员信息汇总</el-divider>
<el-button @click="deleteUser()" style="float:right;margin-right: 6px;margin-bottom: 6px">删除</el-button>
<el-button @click="add" style="float:right;margin-right: 6px;margin-bottom: 6px">录入</el-button>
<el-button @click="deleteUser()" :size="$global.elementConfig.size.button" style="float:right;margin-right: 6px;margin-bottom: 6px">删除</el-button>
<el-button @click="add" :size="$global.elementConfig.size.button" style="float:right;margin-right: 6px;margin-bottom: 6px">录入</el-button>
<cm-table-page :columns="columns" :dataList="dataList" @loaddata="getPage"@selectionChange="selectionChange" :showIndex="true"
:showBorder="true" :currentPage="currentPage" :total="total" :loading="false" :showSelection="true"
:showPage="true" :showTools="true" :height="height" :pageSize="pageSize">
... ...
... ... @@ -194,7 +194,7 @@ export default {
id.value = row.id
}
if (id.value == null || id.value ==undefined){
proxy.$global.showMsg("请选择用户！","error");
proxy.$global.showMsg("请选择需要操作的用户！",'warning');
return;
}
let params={
... ...
... ... @@ -17,7 +17,7 @@
<i class="iconfont icon-icon--yingbing" /> 人员基本信息
</div>
<div style="padding-left: 40px;margin-bottom: 6px">
<el-form :rules="rules" ref="rule" :model="ruleForm" label-width="120px" :size="$global.elementSize" label-position="top" >
<el-form :rules="rules" ref="rule" :model="ruleForm" label-width="120px" :size="$global.elementConfig.size.input" label-position="top" >
<el-row :gutter="5">
<el-col :span="8">
<el-form-item label="姓名" prop="nickname" class="form-class">
... ...
... ... @@ -143,6 +143,12 @@ const routes = [{
name: 'logoConfig',
component: () => myImport('views/logoConfig/index')
},
//忙时配置
{
path: '/vue3/busyConfig',
name: 'busyConfig',
component: () => myImport('views/busyConfig/index')
},
];
// hash模式： createWebHashHistory
... ...
... ... @@ -4,18 +4,18 @@
<div class="condition">
<el-form-item>
<el-button-group class="ml-4">
<el-button :type="search.status == 1 ? 'primary' : ''" @click="getDataList(1)">审批中</el-button>
<el-button :type="search.status == 2 ? 'primary' : ''" @click="getDataList(2)">已审批</el-button>
<el-button :type="search.status == 3 ? 'primary' : ''" @click="getDataList(3)">驳回</el-button>
<el-button :type="search.status == 0 ? 'primary' : ''" @click="getDataList(0)">草稿</el-button>
<el-button :size="$global.elementConfig.size.button" :type="search.status == 1 ? 'primary' : ''" @click="getDataList(1)">审批中</el-button>
<el-button :size="$global.elementConfig.size.button" :type="search.status == 2 ? 'primary' : ''" @click="getDataList(2)">已审批</el-button>
<el-button :size="$global.elementConfig.size.button" :type="search.status == 3 ? 'primary' : ''" @click="getDataList(3)">驳回</el-button>
<el-button :size="$global.elementConfig.size.button" :type="search.status == 0 ? 'primary' : ''" @click="getDataList(0)">草稿</el-button>
</el-button-group>
</el-form-item>
<el-form-item >
<el-input v-else v-model="search.keyword" placeholder="请输入关键字"></el-input>
<el-input :size="$global.elementConfig.size.input" v-else v-model="search.keyword" placeholder="请输入关键字" style="margin-top:5px;"></el-input>
</el-form-item>
<el-form-item >
<el-button @click="getDataList(statusVal)">查询</el-button>
<el-button :size="$global.elementConfig.size.button" @click="getDataList(statusVal)">查询</el-button>
</el-form-item>
</div>
</div>
... ...
... ... @@ -3,10 +3,10 @@
<div class="search">
<div class="condition">
<el-form-item >
<el-input v-model="search.keyword" placeholder="请输入关键字"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="请输入关键字" style="margin-top:5px;"></el-input>
</el-form-item>
<el-form-item >
<el-button @click="getDataList">查询</el-button>
<el-button :size="$global.elementConfig.size.button" @click="getDataList">查询</el-button>
</el-form-item>
</div>
</div>
... ...
... ... @@ -2,13 +2,13 @@
<div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}">
<div class="search">
<el-form-item>
<el-input v-model="searchForm.keyword" placeholder="输入关键字"
<el-input :size="$global.elementConfig.size.input" v-model="searchForm.keyword" placeholder="输入关键字"
@keydown.enter.native="getPage"></el-input>
</el-form-item>
<el-form-item style="margin-left: 10px">
<el-button type="primary" @click="getPage"><i class="iconfont icon-sousuo"></i>搜索</el-button>
<el-button @click="showExcludeKpi(true)">指标过滤</el-button>
<el-button @click="showResDialog(true)">资源过滤</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="getPage"><i class="iconfont icon-sousuo"></i>搜索</el-button>
<el-button :size="$global.elementConfig.size.button" @click="showExcludeKpi(true)">指标过滤</el-button>
<el-button :size="$global.elementConfig.size.button" @click="showResDialog(true)">资源过滤</el-button>
</el-form-item>
</div>
... ...
... ... @@ -2,18 +2,18 @@
<el-col :span="24" class="search">
<div class="condition" style="display: flex;">
<el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
<el-input v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button @click="getList">查询</el-button>
<el-button :size="$global.elementConfig.size.button" @click="getList">查询</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="removeRel">取消</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="removeRel">取消</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="changeUser">变更</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="changeUser">变更</el-button>
</el-form-item>
</div>
... ...
... ... @@ -2,18 +2,18 @@
<el-col :span="24" class="search">
<div class="condition" style="display: flex;">
<el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
<el-input v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button @click="getList">查询</el-button>
<el-button :size="$global.elementConfig.size.button" @click="getList">查询</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="removeRel">取消</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="removeRel">取消</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="changeUser">变更</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="changeUser">变更</el-button>
</el-form-item>
</div>
... ...
... ... @@ -3,23 +3,13 @@
<div class="condition" >
<el-form ref=“form” style="display: flex;">
<el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
<el-input v-model="search.keyword" placeholder="关键字支持：业务名称"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="关键字支持：业务名称"></el-input>
</el-form-item>
<!--<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型">
<el-option
v-for="item in resTypeOptions"
:key="item.resTypeCode"
:label="item.resTypeName"
:value="item.resTypeCode">
</el-option>
</el-select>
</el-form-item>-->
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button @click="getListData" >查询</el-button>
<el-button :size="$global.elementConfig.size.button" @click="getListData" >查询</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="changeAdmin()" >变更</el-button>
</el-form-item>
</el-form>
</div>
... ... @@ -28,7 +18,7 @@
<!--<el-row style="margin-bottom: 10px;">
<div class="flex-div-start">
&lt;!&ndash; <el-button type="primary" @click="changeCancel()" size="small">取消</el-button>&ndash;&gt;
<el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>
<el-button type="primary" @click="changeAdmin()" size="small" >变更</el-button>
</div>
</el-row>-->
<el-row style="font-size: 12px;color: grey;padding: 6px;">
... ...
... ... @@ -2,18 +2,18 @@
<el-col :span="24" class="search">
<div class="condition" style="display: flex;">
<el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
<el-input v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button @click="getList">查询</el-button>
<el-button :size="$global.elementConfig.size.button" @click="getList">查询</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="removeRel">取消</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="removeRel">取消</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="changeUser">变更</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="changeUser">变更</el-button>
</el-form-item>
</div>
... ...
... ... @@ -2,17 +2,17 @@
<el-col :span="24" class="search">
<div class="condition" style="display: flex;">
<el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
<el-input v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button @click="getList">查询</el-button>
<el-button :size="$global.elementConfig.size.button" @click="getList">查询</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="removeRel">取消</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="removeRel">取消</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-form-item :size="$global.elementConfig.size.button" style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="changeUser">变更</el-button>
</el-form-item>
... ...
... ... @@ -3,10 +3,10 @@
<div class="condition" >
<el-form ref=“form” style="display: flex;">
<el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
<el-input v-model="search.keyword" placeholder="关键字支持：资源名称、IP"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="关键字支持：资源名称、IP"></el-input>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型">
<el-select :size="$global.elementConfig.size.input" filterable clearable v-model="search.resType" placeholder="请选择资源类型">
<el-option
v-for="item in resTypeOptions"
:key="item.resTypeCode"
... ... @@ -16,15 +16,15 @@
</el-select>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button @click="getListData">查询</el-button>
<el-button :size="$global.elementConfig.size.button" @click="getListData">查询</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="changeCancel()" >取消</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="changeCancel()" >取消</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="changeAdmin()" >变更</el-button>
</el-form-item>
</el-form>
</div>
... ... @@ -33,7 +33,7 @@
<!--<el-row style="margin-bottom: 10px;">
<div class="flex-div-start">
<el-button type="primary" @click="changeCancel()" size="small">取消</el-button>
<el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>
<el-button type="primary" @click="changeAdmin()" size="small" >变更</el-button>
</div>
</el-row>-->
<el-row style="font-size: 12px;color: grey;padding: 6px;">
... ...
... ... @@ -3,10 +3,10 @@
<div class="condition" >
<el-form ref=“form” style="display: flex;">
<el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
<el-input v-model="search.keyword" placeholder="关键字支持：资源名称、IP"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="关键字支持：资源名称、IP"></el-input>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型">
<el-select :size="$global.elementConfig.size.input" filterable clearable v-model="search.resType" placeholder="请选择资源类型">
<el-option
v-for="item in resTypeOptions"
:key="item.resTypeCode"
... ... @@ -16,13 +16,13 @@
</el-select>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button @click="getListData" >查询</el-button>
<el-button :size="$global.elementConfig.size.button" @click="getListData" >查询</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="changeCancel()">取消</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="changeCancel()">取消</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="changeAdmin()" >变更</el-button>
</el-form-item>
</el-form>
</div>
... ... @@ -31,7 +31,7 @@
<!--<el-row style="margin-bottom: 10px;">
<div class="flex-div-start">
<el-button type="primary" @click="changeCancel()" size="small">取消</el-button>
<el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>
<el-button type="primary" @click="changeAdmin()" size="small" >变更</el-button>
</div>
</el-row>-->
<el-row style="font-size: 12px;color: grey;padding: 6px;">
... ...
... ... @@ -3,37 +3,21 @@
<div class="condition" >
<el-form ref=“form” style="display: flex;">
<el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
<el-input v-model="search.keyword" placeholder="关键字支持：资源类型名称"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="关键字支持：资源类型名称"></el-input>
</el-form-item>
<!-- <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型">
<el-option
v-for="item in resTypeOptions"
:key="item.resTypeCode"
:label="item.resTypeName"
:value="item.resTypeCode">
</el-option>
</el-select>
</el-form-item>-->
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button @click="getListData">查询</el-button>
<el-button :size="$global.elementConfig.size.button" @click="getListData">查询</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="changeCancel()" >取消</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="changeCancel()" >取消</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="changeAdmin()" style="margin-left: 6px">变更</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="changeAdmin()" >变更</el-button>
</el-form-item>
</el-form>
</div>
</el-col>
</el-row>
<!--<el-row style="margin-bottom: 10px;">
<div class="flex-div-start">
<el-button type="primary" @click="changeCancel()" size="small">取消</el-button>
<el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>
</div>
</el-row>-->
<el-row style="font-size: 12px;color: grey;padding: 6px;">
{{item.ddicDesc}}
</el-row>
... ...
... ... @@ -3,13 +3,13 @@
<div class="condition" >
<el-form ref=“form” style="display: flex;">
<el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
<el-input v-model="search.keyword" placeholder="关键字支持：角色名称"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="关键字支持：角色名称"></el-input>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button @click="getListData" >查询</el-button>
<el-button :size="$global.elementConfig.size.button" @click="getListData" >查询</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="changeCancel()" >取消</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="changeCancel()" >取消</el-button>
</el-form-item>
</el-form>
</div>
... ... @@ -18,7 +18,7 @@
<!--<el-row style="margin-bottom: 10px;">
<div class="flex-div-start">
<el-button type="primary" @click="changeCancel()" size="small">取消</el-button>
&lt;!&ndash; <el-button type="primary" @click="changeAdmin()" size="small" style="margin-left: 6px">变更</el-button>&ndash;&gt;
&lt;!&ndash; <el-button type="primary" @click="changeAdmin()" size="small" >变更</el-button>&ndash;&gt;
</div>
</el-row>-->
<el-row style="font-size: 12px;color: grey;padding: 6px;">
... ...
... ... @@ -2,18 +2,18 @@
<el-col :span="24" class="search">
<div class="condition" style="display: flex;">
<el-form-item style="margin-right: 6px;margin-bottom: 10px;width: 300px">
<el-input v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="data.searchParams.keywords" placeholder="关键字支持：名称、负责人、业务描述"></el-input>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button @click="getList">查询</el-button>
<el-button :size="$global.elementConfig.size.button" @click="getList">查询</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="removeRel">取消</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="removeRel">取消</el-button>
</el-form-item>
<el-form-item style="margin-right: 6px;margin-bottom: 10px;">
<el-button type="primary" @click="changeUser">变更</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="changeUser">变更</el-button>
</el-form-item>
</div>
... ...
<div class="container" :style="{'height':height+'px','max-height':height+'px'}">
<div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}">
<div class="search" style="margin:6px 0;">
<div class="condition">
<el-input :size="$global.elementConfig.size.input" style="width:180px;" v-model="search.keyWords" placeholder="请输入关键字"></el-input>
<el-button :size="$global.elementConfig.size.button" type="primary" style="margin-left: 6px;" @click="getDataList">查询</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="addConfig">新增</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="delConfig">删除</el-button>
</div>
</div>
<div class="search-table">
<cm-table-page :columns="tableData.columns" :dataList="tableData.dataList"
:showIndex="true"
:total="tableData.count"
@loaddata = "loaddata"
:showSelection="true"
@selectionChange="selectionChange"
:showBorder="true"
:loading="false"
:pageSize="pageSize"
:showPage="true"
:showTools="true"
:height="height - 110">
<template #default="{row,prop,column}">
<div>
<el-tag style="margin:5px;" v-if="prop=='years'" v-for="(item,index) in row.years">{{item}}</el-tag>
<el-tag style="margin:5px;" v-if="prop=='months'" type="success" v-for="(item,index) in row.months">{{item}}</el-tag>
<el-tag style="margin:5px;" v-if="prop=='days'" type="info" v-for="(item,index) in row.days">{{item}}</el-tag>
<el-tag style="margin:5px;" v-if="prop=='hours'" type="warning" v-for="(item,index) in row.hours">{{item}}</el-tag>
</div>
</template>
<template #tools="{scope}">
<div class="list-handle">
<i class="el-icon-delete" title="删除" style="cursor: pointer;" @click="handleDelete(scope.row)"></i>
<i style="margin-left:6px;cursor: pointer;" class="el-icon-edit" title="修改" @click="handleEdit(scope.row)"></i>
</div>
</template>
</cm-table-page>
</div>
</div>
</div>
<!--弹框-->
<cm-dialog :title="dialog.title" width="60%" :showDialogVisible="dialog.show" @okfunc="saveConfig" @hidedialog="hideDialog" :showFooter="true">
<template v-slot>
<div class="add-container" style="height:500px;padding:0 10px;">
<el-row>
<el-col :span="24" style="display: flex;align-items: center;
border-bottom:1px solid #1e9fff;padding:10px;margin-bottom: 10px;">
<span style="margin-right: 10px;display: flex;align-items: center;"><i style="display:inline-block;padding:5px;"></i>年：</span>
<el-checkbox-group style="display: flex;flex-wrap: wrap;" v-model="yearCheckList">
<el-checkbox v-for="(item,index) in yearData" :label="item+''" >{{item}}年</el-checkbox>
</el-checkbox-group>
</el-col>
</el-row>
<el-row>
<el-col :span="24" style="display: flex;align-items: center;
border-bottom:1px solid #1e9fff;padding:10px;margin-bottom: 10px;">
<span style="margin-right: 10px;display: flex;align-items: center;"><i style="display:inline-block;padding:5px;"></i>月：</span>
<el-checkbox-group style="display: flex;flex-wrap: wrap;" v-model="monthCheckList">
<el-checkbox v-for="(item,index) in 12" :label="item+''" >{{item}}月</el-checkbox>
</el-checkbox-group>
</el-col>
</el-row>
<el-row>
<el-col :span="24" style="display: flex;align-items: center;
border-bottom:1px solid #1e9fff;padding:10px;margin-bottom: 10px;">
<span style="margin-right: 10px;display: flex;align-items: center;"><i style="display:inline-block;padding:5px;"></i>日：</span>
<el-checkbox-group style="display: flex;flex-wrap: wrap;" v-model="dayCheckList">
<el-checkbox v-for="(item,index) in 31" :label="item+''" >{{item}}日</el-checkbox>
</el-checkbox-group>
</el-col>
</el-row>
<el-row>
<el-col :span="24" style="display: flex;align-items: center;
border-bottom:1px solid #1e9fff;padding:10px;margin-bottom: 10px;">
<span style="margin-right: 10px;display: flex;align-items: center;"><i style="color:#ff0000;padding:5px;">*</i>时：</span>
<el-checkbox-group style="display: flex;flex-wrap: wrap;" v-model="hourCheckList">
<el-checkbox v-for="(item,index) in 24" :label="item+''" >{{item}}时</el-checkbox>
</el-checkbox-group>
</el-col>
</el-row>
</div>
</template>
</cm-dialog>
... ...
export default {
name: 'busyConfig',
template: '',
components: {
},
props: [],
setup(props, {attrs, slots, emit}) {
const {proxy} = Vue.getCurrentInstance();
let height = Vue.ref(window.innerHeight);
let yearCheckList=Vue.ref([]);//年选择数据
let monthCheckList=Vue.ref([]);//月选择数据
let dayCheckList=Vue.ref([]);//日选择数据
let hourCheckList=Vue.ref([]);//时选择数据
let dialog=Vue.ref({
title:'忙时配置',
show:false,
id:''
});
let search = Vue.ref({
status: 0,
keyWords: '',
page: 1,
limit: 50,
});
//表格字段
let tableData = Vue.ref({
count:0,
dataList: [],
columns: [
{
prop: 'years',
label: '年',
sortable: true,
align: 'center',
width: '200',
},
{
prop: 'months',
label: '月',
sortable: true,
align: '200',
},
{
prop: 'days',
label: '日',
sortable: true,
align: 'center',
}, {
prop: 'hours',
label: '时',
sortable: true,
align: 'center',
width: '200'
}
]
})
// 表格全选事件
let checkData=Vue.ref([]);
let selectionChange = (val) => {
let checkArr = [];
val.map(item => {
checkArr.push(item.id)
})
checkData.value = checkArr;
}
// 获取列表
let getDataList = () => {
proxy.$http.get(`/api-analysis/busyAnalysis/getList?keyWords=`+search.value.keyWords, {
page: search.value.page,
limit: search.value.limit,
}, function (res) {
if (res && res.data) {
tableData.value.dataList = res.data;
tableData.value.count = res.count;
tableData.value.dataList.map(item=>{
if(item.year){
item.years=item.year.split(",");
}
if(item.month){
item.months=item.month.split(",");
}
if(item.day){
item.days=item.day.split(",");
}
if(item.hour){
item.hours=item.hour.split(",");
}
})
} else {
tableData.value.dataList = [];
tableData.value.count = 0;
}
});
}
let loaddata = ({page, limit}) => {
search.value.page = page;
search.value.limit = limit;
}
let hideDialog = (flg) => {
dialog.value.show = flg;
if(!flg){
dialog.value.id='';
yearCheckList.value=[];
monthCheckList.value=[];
dayCheckList.value=[];
hourCheckList.value=[];
}
}
// 处理弹框
let handle = (row) =>{
dialog.value.id = row.id;
yearCheckList.value=row.years?row.years:[];
monthCheckList.value=row.months?row.months:[];
dayCheckList.value=row.days?row.days:[];
hourCheckList.value=row.hours?row.hours:[];
console.log("////",yearCheckList.value,monthCheckList.value,dayCheckList.value,hourCheckList.value)
hideDialog(true);
}
//修改详情
let handleEdit = (row) =>{
handle(row);
}
//删除数据
let handleDelete=(row)=>{
deletData(row);
}
//获取当前年的前后三年
let yearData=Vue.ref([])
let getYearData=()=>{
let date=new Date();
let arr=[];
for(let i=0;i<=3;i++){
arr.push(date.getFullYear()-i);
if(i!=0){
arr.push(date.getFullYear()+i)
}
}
arr.sort((a, b) => {
return a - b
});
yearData.value=arr;
}
//新增配置
let addConfig=()=>{
hideDialog(true);
}
//批量删除配置
let delConfig=()=>{
if(checkData.value.length<1){
proxy.$global.showMsg('请至少选择一项','warning');
return;
}
deletData();
}
//删除操作
let deletData=(row)=>{
let idList='';
if(row){
idList=row.id;
}else{
if(checkData.value.length>0){
idList=checkData.value.join(',')
}
}
proxy.$global.confirm("确认删除数据吗？", function () {
proxy.$http.get(`/api-analysis/busyAnalysis/remove`, {
idList: idList
}, function (res) {
if(res && res.success){
proxy.$global.showMsg('删除成功');
}else{
proxy.$global.showMsg('删除失败','error');
}
getDataList();
})
})
}
//保存配置
let saveConfig=()=>{
if(hourCheckList.value.length<1){
proxy.$global.showMsg('请至少选择一个时间','warning');
return;
}
let year='';
if(yearCheckList.value.length>0){
year=yearCheckList.value.join(",");
}
let month='';
if(monthCheckList.value.length>0){
month=monthCheckList.value.join(",");
}
let day='';
if(dayCheckList.value.length>0){
day=dayCheckList.value.join(",");
}
let hour='';
if(hourCheckList.value.length>0){
hour=hourCheckList.value.join(",");
}
if(dialog.value.id){
proxy.$http.post(`/api-analysis/busyAnalysis/update`, {
year: year,
month: month,
day: day,
hour: hour,
id:dialog.value.id
}, function (res) {
if(res && res.success){
proxy.$global.showMsg('修改成功');
}else{
proxy.$global.showMsg('修改失败','error');
}
hideDialog(false);
getDataList();
})
}else{
proxy.$http.post(`/api-analysis/busyAnalysis/add`, {
year: year,
month: month,
day: day,
hour: hour
}, function (res) {
if(res && res.success){
proxy.$global.showMsg('保存成功');
}else{
proxy.$global.showMsg('保存失败','error');
}
hideDialog(false);
getDataList();
})
}
}
// 挂载完
Vue.onMounted(() => {
getYearData();
getDataList();
})
return {
saveConfig,
delConfig,
addConfig,
selectionChange,
handleDelete,
checkData,
yearData,
dialog,
getYearData,
height,
search,
hideDialog,
handle,
loaddata,
tableData,
getDataList,
handleEdit,
yearCheckList,
monthCheckList,
dayCheckList,
hourCheckList
}
}
}
... ...
... ... @@ -2,11 +2,11 @@
<el-row>
<el-col :span="24">
<div class="flex-div-start margin-top-bottom-10">
<el-input class="margin-right-10" @keydown.enter.native="onBtnSearch()" v-model="keyword" placeholder="输入关键字" />
<el-input :size="$global.elementConfig.size.input" class="margin-right-10" @keydown.enter.native="onBtnSearch()" v-model="keyword" placeholder="输入关键字" />
<div class="flex-div-start">
<el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">搜索</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">搜索</el-button>
</div>
</div>
... ...
... ... @@ -6,12 +6,12 @@
</div>
<div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%','padding-top':'3px','flex':'1'}">
<div class="search">
<div class="condition">
<div class="condition" style="width:100%;">
<el-form-item >
<el-input style="width:160px;" v-model="search.keyword" placeholder="请输入关键字"></el-input>
<el-input :size="$global.elementConfig.size.input" style="width:160px;margin-top:5px;" v-model="search.keyword" placeholder="请输入关键字"></el-input>
</el-form-item>
<el-form-item >
<el-select style="width:160px;" v-model="search.provider" class="m-2" placeholder="请选择厂商" clearable>
<el-select :size="$global.elementConfig.size.input" style="width:160px;margin-top:8px;" v-model="search.provider" class="m-2" placeholder="请选择厂商" clearable>
<el-option
v-for="item in providerData"
:key="item.ddicCode"
... ... @@ -21,7 +21,7 @@
</el-select>
</el-form-item>
<el-form-item >
<el-select style="width:160px;" v-model="search.system" class="m-2" placeholder="请选择系统" clearable>
<el-select :size="$global.elementConfig.size.input" style="width:160px;margin-top:8px;" v-model="search.system" class="m-2" placeholder="请选择系统" clearable>
<el-option
v-for="item in systemData"
:key="item.ddicCode"
... ... @@ -31,7 +31,7 @@
</el-select>
</el-form-item>
<el-form-item >
<el-select style="width:160px;" v-model="search.resSyncState" class="m-2" placeholder="请选择同步状态" clearable>
<el-select :size="$global.elementConfig.size.input" style="width:160px;margin-top:8px;" v-model="search.resSyncState" class="m-2" placeholder="请选择同步状态" clearable>
<el-option
v-for="item in resSyncStateData"
:key="item.ddicCode"
... ... @@ -41,7 +41,7 @@
</el-select>
</el-form-item>
<el-form-item >
<el-select style="width:160px;" v-model="search.disposeState" class="m-2" placeholder="请选择资源处理状态" clearable>
<el-select :size="$global.elementConfig.size.input" style="width:160px;margin-top:8px;" v-model="search.disposeState" class="m-2" placeholder="请选择资源处理状态" clearable>
<el-option
v-for="item in resDisposeStateData"
:key="item.ddicCode"
... ... @@ -51,16 +51,16 @@
</el-select>
</el-form-item>
<el-form-item >
<el-button @click="getDataList" type="primary">查询</el-button>
<el-button :size="$global.elementConfig.size.button" @click="getDataList" type="primary">查询</el-button>
</el-form-item>
<el-form-item >
<el-button @click="handleEdit" type="primary">纳入监控</el-button>
<el-button :size="$global.elementConfig.size.button" @click="handleEdit" type="primary">纳入监控</el-button>
</el-form-item>
<el-form-item >
<el-button @click="handleIgnore" >忽略</el-button>
<el-button :size="$global.elementConfig.size.button" @click="handleIgnore" >忽略</el-button>
</el-form-item>
<el-form-item >
<el-button @click="handleRefresh">同步</el-button>
<el-button :size="$global.elementConfig.size.button" @click="handleRefresh">同步</el-button>
</el-form-item>
</div>
</div>
... ...
... ... @@ -11,7 +11,7 @@
v-model="customDate"
type="date"
placeholder="请选择日期"
size="small"
:size="$global.elementConfig.size.input"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
style="margin-left:6px;"
... ... @@ -22,12 +22,12 @@
range-separator="-"
start-placeholder="开始时间"
end-placeholder="结束时间"
size="small"
:size="$global.elementConfig.size.input"
format="HH:mm:ss"
value-format="HH:mm:ss"
style="margin-left:6px;"
/>
<el-button style="margin-left:6px;" type="primary" size="small" @click="search"> 查询</el-button>
<el-button style="margin-left:6px;" type="primary" :size="$global.elementConfig.size.button" @click="search"> 查询</el-button>
</div>
</div>
</el-col>
... ...
... ... @@ -3,7 +3,7 @@
<div class="search">
<div class="condition">
<el-form-item >
<el-input v-model="search.keyword" placeholder="=资源名称、日志内容="></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="=资源名称、日志内容="></el-input>
</el-form-item>
<el-form-item >
<el-dropdown>
... ... @@ -11,7 +11,7 @@
</el-dropdown>
</el-form-item>
<el-form-item >
<el-select v-model="search.program" class="m-2" placeholder="日志类型" clearable>
<el-select :size="$global.elementConfig.size.input" v-model="search.program" class="m-2" placeholder="日志类型" clearable>
<el-option
v-for="item in logTypeData"
:key="item.ddicCode"
... ... @@ -33,7 +33,7 @@
/>
</el-form-item>
<el-form-item >
<el-button @click="getDataList">查询</el-button>
<el-button :size="$global.elementConfig.size.button" @click="getDataList">查询</el-button>
</el-form-item>
</div>
</div>
... ...
... ... @@ -25,7 +25,7 @@
</dev>
</template>
<el-upload
class="upload-demo"
class="upload-demo-logoConfig"
:show-file-list="false"
:before-upload="beforeAvatarUpload"
:data="item.imageUrl"
... ... @@ -57,7 +57,7 @@
</dev>
</template>
<el-upload
class="upload-demo"
class="upload-demo-logoConfig"
:show-file-list="false"
:before-upload="beforeAvatarUpload"
:data="item.imageUrlBg"
... ... @@ -88,7 +88,7 @@
</dev>
</template>
<el-upload
class="upload-demo"
class="upload-demo-logoConfig"
:show-file-list="false"
:before-upload="beforeAvatarUpload"
:data="item.imageUrlSkin"
... ... @@ -119,7 +119,7 @@
</dev>
</template>
<el-upload
class="upload-demo"
class="upload-demo-logoConfig"
:show-file-list="false"
:before-upload="beforeAvatarUpload"
:data="item.imageUrlIndex"
... ...
... ... @@ -2,10 +2,10 @@
<div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}">
<div class="search" style="margin:6px 0;">
<div class="condition">
<el-input style="width:160px" v-model="search.keyWords" placeholder="请输入关键字"></el-input>
<el-button size="small" type="primary" style="margin-left: 6px;" @click="getDataList">查询</el-button>
<el-button size="small" type="primary" @click="addConfig">新增关系</el-button>
<el-button size="small" type="primary" @click="delConfig">删除关系</el-button>
<el-input :size="$global.elementConfig.size.input" style="width:160px" v-model="search.keyWords" placeholder="请输入关键字"></el-input>
<el-button :size="$global.elementConfig.size.button" type="primary" style="margin-left: 6px;" @click="getDataList">查询</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="addConfig">新增关系</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="delConfig">删除关系</el-button>
</div>
</div>
<div class="search-table">
... ...
... ... @@ -45,10 +45,10 @@
<div class="search">
<div class="condition">
<el-form-item >
<el-input v-model="search.keyword" placeholder="=关键字="></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="search.keyword" placeholder="=关键字="></el-input>
</el-form-item>
<el-form-item >
<el-select v-model="search.kpiId" class="m-2" placeholder="指标" clearable @change="kpiChange">
<el-select :size="$global.elementConfig.size.input" v-model="search.kpiId" class="m-2" placeholder="指标" clearable @change="kpiChange">
<el-option
v-for="item in kpiData"
:key="item.kpiId"
... ... @@ -59,7 +59,7 @@
</el-select>
</el-form-item>
<el-form-item >
<el-select v-model="search.flag" class="m-2" placeholder="flag" clearable>
<el-select :size="$global.elementConfig.size.input" v-model="search.flag" class="m-2" placeholder="flag" clearable>
<el-option
v-for="item in flagData"
:key="item.flag"
... ... @@ -76,11 +76,12 @@
placeholder="日期"
end-placeholder="结束时间"
value-format="YYYY-MM-DD HH:mm:ss"
:size="$global.elementConfig.size.input"
/>
</el-form-item>
<el-form-item >
<el-button @click="getDataList">查询</el-button>
<el-button :size="$global.elementConfig.size.button" @click="getDataList">查询</el-button>
</el-form-item>
</div>
</div>
... ...
... ... @@ -28,7 +28,7 @@
.fault-book-input-text{
/* width: 25%;
text-align: center;*/
margin-right: 27px;
margin-right: 6px;
}
.fault-card{
background: #fff;
... ...
... ... @@ -238,6 +238,12 @@ const routes = [{
name: 'logoConfig',
component: () => myImport('views/logoConfig/index')
},
//忙时配置
{
path: '/vue3/busyConfig',
name: 'busyConfig',
component: () => myImport('views/busyConfig/index')
},
];
// hash模式： createWebHashHistory
... ...
... ... @@ -2,14 +2,14 @@
<div class="cm-card" :style="{'min-height':height+'px','height':'100%'}">
<analysis-line :legend="lineChart.legend" :xAxis="lineChart.xAxis" :series="lineChart.series">
<template #lineName="scope">
<el-input v-model="form.scene.name" placeholder="请输入场景名称"/>
<el-input :size="$global.elementConfig.size.input" v-model="form.scene.name" placeholder="请输入场景名称"/>
</template>
<template #tools="scope">
<el-button type="primary" style="margin-left: 10px" @click="showDialogForm(true)">保存</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" style="margin-left: 10px" @click="showDialogForm(true)">保存</el-button>
</template>
<template #timeRange="scope">
<el-dropdown style="margin-left: 100px">
<el-button>
<el-button :size="$global.elementConfig.size.button">
时间范围 <i class="el-icon el-icon-arrow-down"></i>
</el-button>
<template #dropdown>
... ... @@ -26,7 +26,7 @@
</template>
<template #frequency="scope">
<el-dropdown style="margin-left: 10px">
<el-button style="display: none !important;">
<el-button :size="$global.elementConfig.size.button" style="display: none !important;">
聚合频率 <i class="el-icon el-icon-arrow-down"></i>
</el-button>
<template #dropdown>
... ... @@ -51,7 +51,7 @@
<div style="width: calc(100% - 12px);padding: 0px 6px">
<el-row :gutter="5">
<el-col :span="4">
<div style="display: flex;flex-wrap: wrap;width: 100%;padding-left: 15px;">
<div style="display: flex;flex-wrap: wrap;width: 100%;padding-left: 15px;padding-right:15px;box-sizing: border-box;">
<!--<el-dropdown>
<el-icon class="el-icon&#45;&#45;right">
<arrow-down/>
... ... @@ -59,13 +59,13 @@
<cm-biz-type-tree-input multiple clearable collapseTags @callback="getBizType"/>
</el-dropdown>-->
<el-select v-model="busTypeArr" multiple filterable clearable collapse-tags placeholder="请选择业务" style="margin-top: 10px">
<el-select :size="$global.elementConfig.size.input" v-model="busTypeArr" multiple filterable clearable collapse-tags placeholder="请选择业务" style="margin-top: 10px">
<el-option
v-for="item in busTypeList"
:label="item.busTypeName" :value="item.busId"></el-option>
</el-select>
<el-dropdown>
<el-dropdown :size="$global.elementConfig.size.input">
<el-icon class="el-icon--right">
<arrow-down/>
</el-icon>
... ... @@ -79,17 +79,17 @@
<cm-kpi-type-tree-input multiple clearable collapseTags @callback="getKpiType"/>
</el-dropdown>-->
<el-select v-model="kpiTypeArr" multiple filterable clearable collapse-tags placeholder="请选择指标" style="margin-top: 10px">
<el-select :size="$global.elementConfig.size.input" v-model="kpiTypeArr" multiple filterable clearable collapse-tags placeholder="请选择指标" style="margin-top: 10px">
<el-option
v-for="item in kpiList"
:label="item.kpiName" :value="item.kpiId"></el-option>
</el-select>
<el-input v-model="keyWords" placeholder="输入关键字" style="margin-top: 15px;width: 225px;"/>
<el-input :size="$global.elementConfig.size.input" v-model="keyWords" placeholder="输入关键字" style="margin-top: 15px;width: 225px;"/>
<div style="margin-top: 10px;text-align: center">
<el-button type="primary" @click="onReset()">重置</el-button>
<el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
</div>
</div>
</el-col>
... ... @@ -144,23 +144,23 @@
</div>
<div v-if="!isAdd " style="padding: 3px 10px 3px 39px">
<span class="saab"> 菜单：</span>
<el-select style="width: 80%" v-model="form.addFirstPId" placeholder="请选择菜单" filterable @change="dataFilter">
<el-select :size="$global.elementConfig.size.input" style="width: 80%" v-model="form.addFirstPId" placeholder="请选择菜单" filterable @change="dataFilter">
<el-option v-for="item in firstMenu" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</div>
<div v-if="!isAdd " style="padding: 3px 10px;">
<span class="saab"> 场景分类：</span>
<el-input style="width: 75%" v-model="form.parentName" placeholder="请输入场景分类"/>
<el-input :size="$global.elementConfig.size.input" style="width: 75%" v-model="form.parentName" placeholder="请输入场景分类"/>
</div>
<div v-if="!isAdd " style="padding: 3px 10px;">
<span class="saab"> 分类描述：</span>
<el-input style="width: 75%" v-model="form.desc" placeholder="请输入场景分类描述"/>
<el-input :size="$global.elementConfig.size.input" style="width: 75%" v-model="form.desc" placeholder="请输入场景分类描述"/>
</div>
<div v-else style="padding: 3px 10px;">
<span class="saab"> 场景分类：</span>
<el-select style="width: 75%" v-model="form.parentId" placeholder="请选择场景分类" >
<el-select :size="$global.elementConfig.size.input" style="width: 75%" v-model="form.parentId" placeholder="请选择场景分类" >
<el-option
v-for="item in parentList"
:key="item.id"
... ... @@ -175,16 +175,16 @@
<!-- </div>-->
<div style="padding: 3px 10px;">
<span class="saab"> 场景名称：</span>
<el-input style="width: 75%" v-model="form.scene.name" placeholder="请输入场景名称"/>
<el-input :size="$global.elementConfig.size.input" style="width: 75%" v-model="form.scene.name" placeholder="请输入场景名称"/>
</div>
<div style="padding: 3px 10px;">
<span class="saab"> 场景描述：</span>
<el-input style="width: 75%" v-model="form.scene.desc" placeholder="请输入场景描述"/>
<el-input :size="$global.elementConfig.size.input" style="width: 75%" v-model="form.scene.desc" placeholder="请输入场景描述"/>
</div>
<div style="padding: 3px 10px 3px 39px">
<span class="saab"> 排序：</span>
<el-input style="width: 80%" v-model="form.scene.sort" type="number" :maxlength="10" placeholder="请输入排序"/>
<el-input :size="$global.elementConfig.size.input" style="width: 80%" v-model="form.scene.sort" type="number" :maxlength="10" placeholder="请输入排序"/>
</div>
</template>
</cm-dialog>
... ...
... ... @@ -15,9 +15,9 @@
<el-row class="list-search">
<el-col :span="6">
<div class="search-input flex-div-start">
<el-input v-model="inputSearch" placeholder="请输入查询内容" />
<el-input :size="$global.elementConfig.size.input" v-model="inputSearch" placeholder="请输入查询内容" />
<!-- <span class="search-text" >搜索</span>-->
<el-button type="primary" @click="searchData" class="search-text button-flex-div-center">搜索</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="searchData" class="search-text button-flex-div-center">搜索</el-button>
</div>
... ... @@ -26,7 +26,7 @@
<el-row class="list-title">
<el-col :span="24" class="text-left">
<router-link :to="'/analysis/add'" class="analysis link-type">
<el-button type="primary" class="button-flex-div-center"><i class="el-icon-plus"></i>新增</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" class="button-flex-div-center"><i class="el-icon-plus"></i>新增</el-button>
</router-link>
<!-- <el-button type="primary" class="button-flex-div-center"><i class="icon-list icon-list-delete"></i>删除</el-button>-->
... ... @@ -81,11 +81,11 @@
<el-dialog v-model="addVisible" :title="添加配置" width="50%" @close="closeDialog" top="15vh">
<el-form ref="addHandleForm" :model="addHandleForm" label-width="120px">
<el-form-item label="名称">
<el-input v-model="addHandleForm.parentName"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="addHandleForm.parentName"></el-input>
</el-form-item>
<el-form-item label="描述">
<el-input v-model="addHandleForm.desc"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="addHandleForm.desc"></el-input>
</el-form-item>
</el-form>
</el-dialog>
... ...
... ... @@ -32,11 +32,11 @@ export default {
parentInfo.value = parentList;
childArr.value =child;
if(child){
child.forEach(function (v){
getChartData(v);
})
}
}
});
}
... ...
... ... @@ -8,7 +8,7 @@
<el-col :span="24">
<div class="flex-div-start margin-top-bottom-10">
<el-select class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源">
<el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源">
<el-option
v-for="item in resTypeList"
:label="item.resName" :value="item.resId"></el-option>
... ... @@ -19,19 +19,19 @@
</el-dropdown>-->
<el-select class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标">
<el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标">
<el-option
v-for="item in kpiList"
:label="item.kpiName" :value="item.kpiId"></el-option>
</el-select>
<el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
<el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
<div class="flex-div-start">
<el-button type="primary" @click="onReset()">重置</el-button>
<el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button type="primary" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
<el-button type="primary" @click="saveAllData()" style="margin-left: 10px">全部添加</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="saveAllData()" style="margin-left: 10px">全部添加</el-button>
</div>
</div>
... ... @@ -42,7 +42,7 @@
<cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="apmMonitorListChecked"
:showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange"
:showBorder="true" :loading="false" :pageSize="pageSize"
:showPage="true" :showTools="true" :height="(height - 500)">
:showPage="true" :showTools="true" :height="(height - 300)">
<template #tools="{scope}">
<el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)">
<i class="el-icon-plus"/> 添加
... ...
... ... @@ -47,6 +47,7 @@ export default {
setup(props){
const {proxy} = Vue.getCurrentInstance();
let id = proxy.$global.getQueryVariable('configId') ;
let height=Vue.ref(window.innerHeight);
let config = Vue.ref(id == false ? null : id);
let count=Vue.ref(0);
let tableDataList = Vue.ref([]);
... ... @@ -301,7 +302,8 @@ export default {
resTypeList,
init,
onReset,
onBtnSearch
onBtnSearch,
height
}
},
... ...
... ... @@ -8,30 +8,13 @@
<el-col :span="24">
<div class="flex-div-start margin-top-bottom-10">
<!-- <el-select class="margin-right-10" v-model="busTypeArr" filterable clearable collapse-tags placeholder="请选择业务">
<el-option
v-for="item in busTypeList"
:label="item.busTypeName" :value="item.busId"></el-option>
</el-select>
-->
<!-- <el-dropdown class="margin-right-10">
<cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/>
</el-dropdown>
<el-select class="margin-right-10" v-model="kpiTypeArr" multiple filterable clearable collapse-tags placeholder="请选择指标">
<el-option
v-for="item in kpiList"
:label="item.kpiName" :value="item.kpiId"></el-option>
</el-select>-->
<el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
<el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
<div class="flex-div-start">
<el-button type="primary" @click="onReset()">重置</el-button>
<el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
<el-button type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>
</div>
</div>
</el-col>
... ... @@ -41,7 +24,7 @@
<cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="applicationMonitorListChecked"
:showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange"
:showBorder="true" :loading="false" :pageSize="pageSize"
:showPage="true" :showTools="true" :height="(height - 500)">
:showPage="true" :showTools="true" :height="(height - 300)">
<template #default="{row,prop,column}">
<div v-if="prop == 'url'" class="text-overflow" :title="row.url">
<span class="">{{row.url }}</span>
... ...
... ... @@ -28,6 +28,7 @@ export default {
setup(props){
const {proxy} = Vue.getCurrentInstance();
let id = proxy.$global.getQueryVariable('configId') ;
let height=Vue.ref(window.innerHeight);
let config = Vue.ref(id == false ? null : id);
let count=Vue.ref(0);
let tableDataList = Vue.ref([]);
... ... @@ -305,7 +306,8 @@ export default {
targetId,
init,
onReset,
onBtnSearch
onBtnSearch,
height
}
},
... ...
... ... @@ -2,7 +2,7 @@
<el-row>
<el-col :span="6">
<div class="search-input margin-30 flex-div-start">
<el-input v-model="name" placeholder="故障诊断" class="fault-book-input-text" />
<el-input :size="$global.elementConfig.size.input" v-model="name" placeholder="故障诊断" class="fault-book-input-text" />
<span class="search-text" style="border-radius: 4px" @click="searchList">搜索</span>
</div>
... ...
... ... @@ -33,7 +33,7 @@
</div>
<el-row v-if="!addSetLIstVisible" class="flex-div-start" style="margin: 20px 0 10px 4%;" >
<span>配置链路名称</span>
<el-input style="flex:1;margin-left:10px;" maxlength="50" class="margin-right-10" v-model="linkName" placeholder="输入链路名称" />
<el-input :size="$global.elementConfig.size.input" style="flex:1;margin-left:10px;" maxlength="50" class="margin-right-10" v-model="linkName" placeholder="输入链路名称" />
</el-row>
<div class="context-body">
... ... @@ -102,12 +102,10 @@
</el-row>
<div v-if="!addSetLIstVisible" class="margin-top flex-center position-bottom">
<el-button @click="saveLinkAndNodeInfo" type="primary">保存</el-button>
<el-button :size="$global.elementConfig.size.button" @click="saveLinkAndNodeInfo" type="primary">保存</el-button>
</div>
</div>
</div>
</div>
</el-col>
</el-row>
... ... @@ -118,41 +116,28 @@
<el-row>
<el-col :span="24">
<div class="flex-div-start margin-top-bottom-10">
<!--<el-select class="margin-right-10" v-model="busTypeArr" multiple filterable clearable collapse-tags placeholder="请选择业务">
<el-option
v-for="item in busTypeList"
:label="item.busTypeName" :value="item.busId"></el-option>
</el-select>-->
<el-select class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源">
<el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源">
<el-option
v-for="item in resTypeList"
:label="item.resName" :value="item.resId"></el-option>
</el-select>
<!-- <el-dropdown class="margin-right-10">
<cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/>
</el-dropdown>-->
<el-select class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标">
<el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标">
<el-option
v-for="item in kpiList"
:label="item.kpiName" :value="item.kpiId"></el-option>
</el-select>
<!-- <el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />-->
<div class="flex-div-start">
<el-button type="primary" @click="onReset()">重置</el-button>
<el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
</div>
</div>
</el-col>
</el-row>
<el-row v-if="flag" class="flex-div-start" style="margin-bottom: 10px;margin-top: 10px;padding-top:10px;border-top:1px solid #ebeef5" >
<span>节点名称</span>
<el-input style="flex:1;margin-left:10px;" class="margin-right-10" maxlength="50" v-model.trim="nodeName" placeholder="输入节点名称" />
<el-input :size="$global.elementConfig.size.input" style="flex:1;margin-left:10px;" class="margin-right-10" maxlength="50" v-model.trim="nodeName" placeholder="输入节点名称" />
</el-row>
<el-row class="margin-bottom-50">
<el-col :span="24" :class="[{'table-height':!flag},{'table-height-45':flag}]">
... ... @@ -179,7 +164,7 @@
</el-row>
<div v-if="tableVisible" class="margin-top btn-faultDiagnosis flex-center position-bottom">
<el-button @click="cancleList">取消</el-button>
<el-button :size="$global.elementConfig.size.button" @click="cancleList">取消</el-button>
<!-- <el-button @click="saveList" type="primary">保存</el-button>-->
</div>
</template>
... ...
... ... @@ -7,13 +7,13 @@
<el-row>
<el-col :span="24">
<div class="flex-div-start margin-top-bottom-10">
<el-input style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
<el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" />
<div class="flex-div-start">
<el-button type="primary" @click="onReset()">重置</el-button>
<el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
<el-button type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button>
</div>
</div>
</el-col>
... ... @@ -23,7 +23,7 @@
<cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="dialtestMonitorListChecked"
:showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange"
:showBorder="true" :loading="false" :pageSize="pageSize"
:showPage="true" :showTools="true" :height="(height - 500)">
:showPage="true" :showTools="true" :height="(height - 300)">
<template #default="{row,prop,column}">
<div v-if="prop == 'url'" class="text-overflow" :title="row.url">
<span class="">{{row.url }}</span>
... ...
... ... @@ -28,6 +28,7 @@ export default {
setup(props){
const {proxy} = Vue.getCurrentInstance();
let id = proxy.$global.getQueryVariable('configId') ;
let height=Vue.ref(window.innerHeight);
let config = Vue.ref(id == false ? null : id);
let count=Vue.ref(0);
let tableDataList = Vue.ref([]);
... ... @@ -302,7 +303,8 @@ export default {
targetId,
init,
onReset,
onBtnSearch
onBtnSearch,
height
}
},
... ...
<div class="container" :style="{'height':height+'px','max-height':height+'px'}">
<div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}">
<div class="search">
<div class="condition fault-book-input-text" style="width: 250px">
<div class="condition fault-book-input-text" >
<el-form-item>
<el-input v-model="searchForm.keyword" placeholder="输入关键字"
@keydown.enter.native="getPage" class="fault-book-input-text"></el-input>
<el-input :size="$global.elementConfig.size.input" v-model="searchForm.keyword" placeholder="输入关键字"
@keydown.enter.native="getPage" style="margin-top:5px;" class="fault-book-input-text"></el-input>
</el-form-item>
<!--<el-form-item>
<el-select v-model="searchForm.category" placeholder="故障分类">
<el-option label="Zone one" value="shanghai"></el-option>
<el-option label="Zone two" value="beijing"></el-option>
</el-select>
</el-form-item>-->
</div>
<div class="btns" style="justify-content: left;padding-left: 0px">
<el-form-item>
<el-button type="primary" @click="getPage">
<el-button :size="$global.elementConfig.size.button" type="primary" @click="getPage">
搜索
</el-button>
</el-form-item>
</div>
<div class="btns" style="justify-content: left;padding-left: 0px">
</div>
</div>
<div class="search-table">
... ...