完善ws消息
This commit is contained in:
龙运模
parent
f0bb390907
commit
956e255899
@ -148,7 +148,7 @@ function webSocketOnMessage(msg) {
|
|||||||
}else{
|
}else{
|
||||||
showNot = ElNotification.error({
|
showNot = ElNotification.error({
|
||||||
title: '系统退出',
|
title: '系统退出',
|
||||||
message: result.msg,
|
message: result.data.msg,
|
||||||
duration:0
|
duration:0
|
||||||
});
|
});
|
||||||
handleError('系统退出', result.msg);
|
handleError('系统退出', result.msg);
|
||||||
@ -156,8 +156,7 @@ function webSocketOnMessage(msg) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
eventBus.$emit('sockBack',result);
|
eventBus.$emit('sockBack',result);
|
||||||
|
if(result.data && result.data.type == 1){
|
||||||
if(result.type == 'init'){
|
|
||||||
if(showNot && showNot.close){
|
if(showNot && showNot.close){
|
||||||
showNot.close();
|
showNot.close();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,25 +1,26 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-container class="mainBox mainHeaderNoBorderPadding">
|
<el-container class="mainBox mainBoxHeaderNoBorder">
|
||||||
<el-header>
|
<!-- <el-header>-->
|
||||||
<div class="left-panel">
|
<!-- <div class="left-panel">-->
|
||||||
<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增库存</el-button>
|
<!-- <el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增库存</el-button>-->
|
||||||
<scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">
|
<!-- <scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">-->
|
||||||
<template #header>
|
<!-- <template #header>-->
|
||||||
<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
|
<!-- <el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>-->
|
||||||
</template>
|
<!-- </template>-->
|
||||||
<template #download>
|
<!-- <template #download>-->
|
||||||
<div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>
|
<!-- <div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>-->
|
||||||
</template>
|
<!-- </template>-->
|
||||||
</scImport>
|
<!-- </scImport>-->
|
||||||
</div>
|
<!-- </div>-->
|
||||||
<div class="right-panel">
|
<!-- <div class="right-panel">-->
|
||||||
<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="11">
|
<!-- <scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="11">-->
|
||||||
<el-button :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>
|
<!-- <el-button :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>-->
|
||||||
</scExport>
|
<!-- </scExport>-->
|
||||||
</div>
|
<!-- </div>-->
|
||||||
</el-header>
|
<!-- </el-header>-->
|
||||||
|
<!-- searchMainNoTop-->
|
||||||
<el-main class="nopadding">
|
<el-main class="nopadding">
|
||||||
<div class="searchMain searchMainNoTop">
|
<div class="searchMain">
|
||||||
<scSearch ref="scSearch" :searchList="searchList" @fetchSelectData="getSelectData"></scSearch>
|
<scSearch ref="scSearch" :searchList="searchList" @fetchSelectData="getSelectData"></scSearch>
|
||||||
|
|
||||||
<div class="searchItem searchBtn">
|
<div class="searchItem searchBtn">
|
||||||
|
|||||||
@ -3,10 +3,14 @@
|
|||||||
<el-main class="nopadding">
|
<el-main class="nopadding">
|
||||||
<div class="searchMain">
|
<div class="searchMain">
|
||||||
<div class="title">任务信息</div>
|
<div class="title">任务信息</div>
|
||||||
|
<div class="formRow">
|
||||||
<el-form ref="form" :size="size" :model="form" label-width="100px">
|
<el-form ref="form" :size="size" :model="form" label-width="100px">
|
||||||
<el-form-item label="任务名称" prop="name">
|
<el-form-item label="任务名称" prop="name">
|
||||||
<el-select type="text" v-model="form.name" placeholder="请选择任务名称" style="width: 100%;" @visible-change="getNameList" @change="nameChange">
|
<el-select type="text" v-model="form.name" placeholder="请选择任务名称" style="width: 100%;" @visible-change="getNameList" @change="nameChange">
|
||||||
<el-option v-for="(item,index) in setMap.nameList" :key="index" :value="item.name" :label="item.name"></el-option>
|
<el-option v-for="(item,index) in setMap.nameList" :key="index" :value="item.name" :label="item.name">
|
||||||
|
<span style="float: left">{{ item.name }}</span>
|
||||||
|
<span style="float: right;color: var(--el-text-color-secondary);">{{ item.memo }}</span>
|
||||||
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="任务描述" prop="memo">
|
<el-form-item label="任务描述" prop="memo">
|
||||||
@ -22,7 +26,11 @@
|
|||||||
<el-button :size="size" type="primary" @click="save" :loading="isSave">保存配置</el-button>
|
<el-button :size="size" type="primary" @click="save" :loading="isSave">保存配置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<div class="title">配置列表</div>
|
<el-image class="img" src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/xw_cloud/image/mingling.png" fit="contain"></el-image>
|
||||||
|
</div>
|
||||||
|
<div class="title">配置列表
|
||||||
|
<span class="tip">注意：此配置由专业IT管理员操作；无配置时以系统默认定时任务配置为准。</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe :size="size" highlightCurrentRow :hideDo="true" :hidePagination="true">
|
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe :size="size" highlightCurrentRow :hideDo="true" :hidePagination="true">
|
||||||
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
|
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
|
||||||
@ -169,6 +177,14 @@ export default {
|
|||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
padding: 0 0 5px 0;
|
padding: 0 0 5px 0;
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
.tip{
|
||||||
|
margin-left: 10px;
|
||||||
|
color: var(--el-color-warning);
|
||||||
|
font-weight: 400;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.searchMain{
|
.searchMain{
|
||||||
@ -178,4 +194,12 @@ export default {
|
|||||||
width: 400px;
|
width: 400px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.formRow{
|
||||||
|
display: flex;
|
||||||
|
.img{
|
||||||
|
margin-left: 30px;
|
||||||
|
height: 165px;
|
||||||
|
border-radius: 8px;
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -1,25 +1,25 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-container class="mainBox mainHeaderNoBorderPadding">
|
<el-container class="mainBox mainBoxHeaderNoBorder">
|
||||||
<el-header>
|
<!-- <el-header>-->
|
||||||
<div class="left-panel">
|
<!-- <div class="left-panel">-->
|
||||||
<el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增工单</el-button>
|
<!-- <el-button type="primary" :size="size" icon="el-icon-plus" @click="add">新增工单</el-button>-->
|
||||||
<scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">
|
<!-- <scImport ref="scImport" :size="size" title="批量导入维保工单" @parentParams="importUpload" @importSuccess="importSuccess">-->
|
||||||
<template #header>
|
<!-- <template #header>-->
|
||||||
<el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>
|
<!-- <el-button v-auth="'organizationImport'" type="primary" :size="size" plain @click="importFile">批量导入</el-button>-->
|
||||||
</template>
|
<!-- </template>-->
|
||||||
<template #download>
|
<!-- <template #download>-->
|
||||||
<div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>
|
<!-- <div v-auth="'companyImportTemplate'" @click="importTemplate">下载导入模版</div>-->
|
||||||
</template>
|
<!-- </template>-->
|
||||||
</scImport>
|
<!-- </scImport>-->
|
||||||
</div>
|
<!-- </div>-->
|
||||||
<div class="right-panel">
|
<!-- <div class="right-panel">-->
|
||||||
<scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="11">
|
<!-- <scExport :size="size" @exportData="exportData" @updateShow="exportChangeShow" :show="exportShow" type="11">-->
|
||||||
<el-button :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>
|
<!-- <el-button :size="size" icon="sc-icon-Download" @click="exportData">下载</el-button>-->
|
||||||
</scExport>
|
<!-- </scExport>-->
|
||||||
</div>
|
<!-- </div>-->
|
||||||
</el-header>
|
<!-- </el-header>-->
|
||||||
<el-main class="nopadding">
|
<el-main class="nopadding">
|
||||||
<div class="searchMain searchMainNoTop">
|
<div class="searchMain">
|
||||||
<scSearch ref="scSearch" :searchList="searchList" @fetchSelectData="getSelectData"></scSearch>
|
<scSearch ref="scSearch" :searchList="searchList" @fetchSelectData="getSelectData"></scSearch>
|
||||||
|
|
||||||
<div class="searchItem searchBtn">
|
<div class="searchItem searchBtn">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user