|
|
@@ -69,10 +69,20 @@
|
|
|
<template slot="header" slot-scope="{row}">
|
|
|
<span>{{$t('EtaBasePage.catalogue_directory')}}</span>
|
|
|
<el-radio-group v-model="classifyType" @change="handleClassifyTypeChange">
|
|
|
- <el-radio :label="1"><!-- 分目录 -->{{$t('EtaBasePage.subdirectory_radio')}}</el-radio>
|
|
|
+ <el-radio :label="1" style="margin-right:5px"><!-- 分目录 -->{{$t('EtaBasePage.subdirectory_radio')}}</el-radio>
|
|
|
<el-radio :label="2"><!-- 同目录 -->{{$t('EtaBasePage.directory_radio')}}</el-radio>
|
|
|
</el-radio-group>
|
|
|
- <el-cascader v-if="classifyType===2" v-model="selectClassify"></el-cascader>
|
|
|
+ <el-cascader v-if="classifyType===2" v-model="selectClassify"
|
|
|
+ :options="edbClassifyList"
|
|
|
+ :props="{
|
|
|
+ label: 'ClassifyName',
|
|
|
+ value: 'ClassifyId',
|
|
|
+ children: 'Children',
|
|
|
+ checkStrictly: true,
|
|
|
+ emitPath:false
|
|
|
+ }"
|
|
|
+ >
|
|
|
+ </el-cascader>
|
|
|
</template>
|
|
|
<template slot-scope="{row,$index}">
|
|
|
<el-cascader
|
|
|
@@ -86,7 +96,7 @@
|
|
|
emitPath:false
|
|
|
}"
|
|
|
style="width:100%;"
|
|
|
- :disabled="classifyType===2&&$index>0"
|
|
|
+ :disabled="classifyType===2"
|
|
|
></el-cascader>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -98,8 +108,30 @@
|
|
|
</div>
|
|
|
<div class="footer-container" slot="footer">
|
|
|
<el-button type="primary" plain @click="$emit('close')">{{ $t('Dialog.cancel_btn') }}</el-button>
|
|
|
- <el-button type="primary" @click="handleAddEdb">{{ $t('ManualEdbListPage.add_tobase_btn') }}</el-button>
|
|
|
+ <el-button type="primary" @click="handleAddEdb" :loading="btnloading">{{ $t('ManualEdbListPage.add_tobase_btn') }}</el-button>
|
|
|
</div>
|
|
|
+ <!-- 操作提示弹窗 -->
|
|
|
+ <el-dialog
|
|
|
+ :title="$t('BloombergPage.operation_prompt')"
|
|
|
+ :visible.sync="isHintDiaShow"
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ :modal-append-to-body="false"
|
|
|
+ @close="isHintDiaShow=false"
|
|
|
+ width="578px"
|
|
|
+ v-dialogDrag
|
|
|
+ center>
|
|
|
+ <div class="hint-dialog-wrap">
|
|
|
+ <p style="margin-bottom: 20px;">{{ hintText }}</p>
|
|
|
+ <ul>
|
|
|
+ <li v-for="(item,index) in hintList" :key="index" class="hint-item" @click="gotoEdbDetail(item)">
|
|
|
+ {{ index+1 }}、{{ item.IndexName }}({{ item.IndexCode }})
|
|
|
+ </li>
|
|
|
+ </ul>
|
|
|
+ </div>
|
|
|
+ <div style="text-align: center;margin-bottom: 30px;">
|
|
|
+ <el-button type="primary" @click="handleCloseDia">{{$t('Dialog.known')}}</el-button>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
</el-dialog>
|
|
|
</template>
|
|
|
|
|
|
@@ -129,6 +161,7 @@ export default {
|
|
|
searchName:'',
|
|
|
searchClassify:'',
|
|
|
classifyType:1,//1分目录 2同目录
|
|
|
+ selectClassify:'',
|
|
|
frequencyArr:frequencySelectList(),
|
|
|
edbList:[
|
|
|
/* {
|
|
|
@@ -142,7 +175,12 @@ export default {
|
|
|
],
|
|
|
tableLoading:false,
|
|
|
edbClassifyList:[],//指标库目录
|
|
|
- selectEdbList:[]
|
|
|
+ selectEdbList:[],//勾选的指标
|
|
|
+
|
|
|
+ isHintDiaShow:false,
|
|
|
+ hintList:[],
|
|
|
+ hintText:'',
|
|
|
+ btnloading:false,
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -156,6 +194,8 @@ export default {
|
|
|
this.searchName = ''
|
|
|
this.edbList = []
|
|
|
this.selectEdbList = []
|
|
|
+ this.selectClassify=''
|
|
|
+ this.btnloading=false
|
|
|
},
|
|
|
//获取钢联化工数据库目录
|
|
|
getClassifyList(){
|
|
|
@@ -209,7 +249,6 @@ export default {
|
|
|
handleSelectionChange(val){
|
|
|
this.selectEdbList = val
|
|
|
},
|
|
|
- handleClassifyTypeChange(){},
|
|
|
handleAddEdb(){
|
|
|
//校验所选指标
|
|
|
if(!this.selectEdbList.length){
|
|
|
@@ -222,10 +261,11 @@ export default {
|
|
|
if(this.classifyType===2&&!this.selectClassify){
|
|
|
return this.$message.warning(this.$t('CustomAnalysisPage.select_appropriate_category'))
|
|
|
}
|
|
|
-
|
|
|
+ //重置tableData的高亮
|
|
|
+ this.edbList.forEach(i=>i.isHighlight=false)
|
|
|
let messageList = [] //有问题的列表
|
|
|
this.selectEdbList.forEach((item)=>{
|
|
|
- let checkResult = this.checkEdbData(item)
|
|
|
+ item.isHighlight=false
|
|
|
if(!this.checkEdbData(item)){
|
|
|
item.isHighlight = true
|
|
|
messageList.push(item)
|
|
|
@@ -233,22 +273,110 @@ export default {
|
|
|
})
|
|
|
//message轻提示 同时标出不完整的行
|
|
|
if(messageList.length){
|
|
|
- this.$message.warning('指标信息未填写完整，请检查')
|
|
|
-
|
|
|
- return
|
|
|
+ return this.$message.warning(/* '部分指标信息未填写完整，请检查' */this.$t('SteelChemicalPage.batch_add_hint1'))
|
|
|
}
|
|
|
-
|
|
|
- //调用接口check是否有指标重名
|
|
|
- //没有则batchAddEdb
|
|
|
|
|
|
+ this.btnloading = true
|
|
|
+ //添加检测
|
|
|
+ steelInterface.batchAddEdbCheck({
|
|
|
+ IndexCodes:this.selectEdbList.map(i=>i.edbId)
|
|
|
+ }).then(res=>{
|
|
|
+ if(res.Ret!==200) return (this.btnloading=false)
|
|
|
+ const edbList = res.Data||[]
|
|
|
+ const afterAddList = edbList.filter(i=>i.EdbExist===1) //已添加进指标库的指标
|
|
|
+ const beforeAddList = edbList.filter(i=>i.EdbExist===0) //需要添加进指标库的指标
|
|
|
+ //已选择的指标均添加进指标库 弹窗提示
|
|
|
+ if(!beforeAddList.length){
|
|
|
+ return this.showHintDialog('all',afterAddList)
|
|
|
+ }
|
|
|
+ //剩余指标进行重名校验
|
|
|
+ this.batchNameCheck(afterAddList,beforeAddList)
|
|
|
+ })
|
|
|
+
|
|
|
+ },
|
|
|
+ //重名检测
|
|
|
+ batchNameCheck(afterAddList,beforeAddList){
|
|
|
+ const indexCodeList = beforeAddList.map(i=>i.IndexCode)
|
|
|
+ let checkList = []
|
|
|
+ indexCodeList.forEach(i=>{
|
|
|
+ const item = this.selectEdbList.find(s=>s.edbId===i)
|
|
|
+ item&&checkList.push(item)
|
|
|
+ })
|
|
|
+ steelInterface.batchCheckEdbName(checkList.map(i=>{
|
|
|
+ return {
|
|
|
+ EdbCode:i.edbId,
|
|
|
+ EdbName:i.edbName,
|
|
|
+ Frequency:i.frequency
|
|
|
+ }
|
|
|
+ })).then(res=>{
|
|
|
+ if(res.Ret!==200) return (this.btnloading=false)
|
|
|
+ const checkedList = res.Data.filter(i=>i.Exist)
|
|
|
+ if(checkedList.length){
|
|
|
+ checkedList.forEach(i=>{
|
|
|
+ const item = this.selectEdbList.find(s=>s.edbId===i.EdbCode)
|
|
|
+ item&&(item.isHighlight = true)
|
|
|
+ })
|
|
|
+ return this.$message.warning(/* '部分指标名称已存在，请重新填写' */this.$t('SteelChemicalPage.batch_add_hint2'))&&(this.btnloading=false)
|
|
|
+ }else{
|
|
|
+ //通过重名校验后添加进指标库
|
|
|
+ this.batchAddEdb(afterAddList,checkList)
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
},
|
|
|
checkEdbData(edbData){
|
|
|
return edbData.edbName&&edbData.frequency&&edbData.unit&&(this.classifyType===1?edbData.classify:true)
|
|
|
},
|
|
|
- batchAddEdb(){
|
|
|
- //获取添加结果
|
|
|
- //有已存在的指标 emit将结果返回
|
|
|
+ //显示操作提示弹窗
|
|
|
+ showHintDialog(type,list){
|
|
|
+ this.btnloading = false
|
|
|
+ this.isHintDiaShow = true
|
|
|
+ this.hintList = list
|
|
|
+ this.hintText = type==='all'
|
|
|
+ ?this.$t('YsDataPage.haved_all_msg') //本次添加的指标均已在指标库中，请勿重复添加！
|
|
|
+ :this.$t('YsDataPage.haved_some_msg') //指标库中已存在以下指标，会自动过滤！
|
|
|
+ },
|
|
|
+ //添加进指标库
|
|
|
+ batchAddEdb(afterAddList=[],checkList){
|
|
|
+ //checkList
|
|
|
+ steelInterface.batchAddToLib(checkList.map(i=>{
|
|
|
+ return {
|
|
|
+ EdbCode:i.edbId,
|
|
|
+ EdbName:i.edbName,
|
|
|
+ Unit:i.unit,
|
|
|
+ Frequency:i.frequency,
|
|
|
+ ClassifyId:this.classifyType===1?Number(i.classify):Number(this.selectClassify),
|
|
|
+ }
|
|
|
+ })).then(res=>{
|
|
|
+ if(res.Ret!==200) return (this.btnloading=false)
|
|
|
+ //若afterAddList有值 弹窗提示部分指标已加入
|
|
|
+ if(afterAddList.length){
|
|
|
+ this.showHintDialog('',afterAddList)
|
|
|
+ }else{
|
|
|
+ this.$message.success(this.$t('MsgPrompt.add_msg2'))
|
|
|
+ this.$emit('close')
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
|
|
|
+ },
|
|
|
+ //跳转至指标库
|
|
|
+ gotoEdbDetail(data){
|
|
|
+ const {EdbClassifyId,EdbInfoId,EdbUniqueCode} = data||{}
|
|
|
+ const href = this.$router.resolve({
|
|
|
+ path:'/database',
|
|
|
+ query:{
|
|
|
+ code:EdbUniqueCode,
|
|
|
+ id:EdbInfoId,
|
|
|
+ classifyId:EdbClassifyId,
|
|
|
+ }
|
|
|
+ }).href
|
|
|
+ window.open(href,"_blank")
|
|
|
+ },
|
|
|
+ handleCloseDia(){
|
|
|
+ //两个弹窗都关掉
|
|
|
+ this.isHintDiaShow=false
|
|
|
+ this.$emit('close')
|
|
|
}
|
|
|
},
|
|
|
};
|
|
|
@@ -277,5 +405,16 @@ export default {
|
|
|
overflow-y:auto;
|
|
|
}
|
|
|
}
|
|
|
+ .hint-dialog-wrap{
|
|
|
+ padding-bottom:30px;
|
|
|
+ .hint-item{
|
|
|
+ cursor: pointer;
|
|
|
+ margin-bottom: 10px;
|
|
|
+ &:hover{
|
|
|
+ color:#409EFF;
|
|
|
+ text-decoration: underline;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
</style>
|
cxmo