|
@@ -1919,6 +1919,7 @@
|
|
<el-scrollbar style="height: 100%;">
|
|
<el-scrollbar style="height: 100%;">
|
|
<div v-loading="treeLoad">
|
|
<div v-loading="treeLoad">
|
|
<el-tree
|
|
<el-tree
|
|
|
|
+
|
|
class="filter-tree"
|
|
class="filter-tree"
|
|
lazy
|
|
lazy
|
|
:load="loadNode"
|
|
:load="loadNode"
|
|
@@ -2034,7 +2035,8 @@
|
|
<el-button type="primary" @click="syncListDialog=false">好的,我已知晓</el-button>
|
|
<el-button type="primary" @click="syncListDialog=false">好的,我已知晓</el-button>
|
|
</div>
|
|
</div>
|
|
<div class="mt-14">
|
|
<div class="mt-14">
|
|
- <el-link type="primary" @click="refreshData" v-loading="refreshLoading">刷新数据</el-link>
|
|
|
|
|
|
+ <el-link type="primary" @click="refreshData" v-loading="refreshLoading" v-if="!isAdd">刷新数据</el-link>
|
|
|
|
+ <el-link type="primary" @click="refreshData1" v-loading="refreshLoading1" v-else>刷新数据</el-link>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
@@ -2556,7 +2558,9 @@ export default {
|
|
syncListData:{
|
|
syncListData:{
|
|
nodeNum:'',//同步节点数量
|
|
nodeNum:'',//同步节点数量
|
|
nodeNumEnd:''//已同步数量
|
|
nodeNumEnd:''//已同步数量
|
|
- }
|
|
|
|
|
|
+ },
|
|
|
|
+ isAdd:'',
|
|
|
|
+ refreshLoading1:false,
|
|
|
|
|
|
};
|
|
};
|
|
},
|
|
},
|
|
@@ -4205,6 +4209,7 @@ export default {
|
|
},
|
|
},
|
|
|
|
|
|
async syncNodeTableHandle(data) {
|
|
async syncNodeTableHandle(data) {
|
|
|
|
+ this.isAdd=''
|
|
console.log('后管数据同步',data);
|
|
console.log('后管数据同步',data);
|
|
this.curTreeData=data
|
|
this.curTreeData=data
|
|
this.isShowLeft=false
|
|
this.isShowLeft=false
|
|
@@ -4217,7 +4222,12 @@ export default {
|
|
|
|
|
|
|
|
|
|
this.proSyncTag=true
|
|
this.proSyncTag=true
|
|
-
|
|
|
|
|
|
+ if(this.$refs.syncProTree){
|
|
|
|
+ this.$refs.syncProTree.setCheckedKeys([])
|
|
|
|
+ }
|
|
|
|
+ if(this.$refs.proTable){
|
|
|
|
+ this.$refs.proTable.clearSelection()
|
|
|
|
+ }
|
|
this.isShowTable=true
|
|
this.isShowTable=true
|
|
this.getTypeOptions()
|
|
this.getTypeOptions()
|
|
this.getRangeOptions()
|
|
this.getRangeOptions()
|
|
@@ -4822,11 +4832,17 @@ export default {
|
|
},
|
|
},
|
|
async proSyncbtn(){
|
|
async proSyncbtn(){
|
|
console.log('项目数据同步');
|
|
console.log('项目数据同步');
|
|
-
|
|
|
|
|
|
+ this.isAdd=''
|
|
this.getTypeOptions()
|
|
this.getTypeOptions()
|
|
this.getRangeOptions()
|
|
this.getRangeOptions()
|
|
this.getCheckIdList()
|
|
this.getCheckIdList()
|
|
this.proSyncTag=true
|
|
this.proSyncTag=true
|
|
|
|
+ if(this.$refs.syncProTree){
|
|
|
|
+ this.$refs.syncProTree.setCheckedKeys([])
|
|
|
|
+ }
|
|
|
|
+ if(this.$refs.proTable){
|
|
|
|
+ this.$refs.proTable.clearSelection()
|
|
|
|
+ }
|
|
this.isShowLeft=true
|
|
this.isShowLeft=true
|
|
this.isShowTable=false
|
|
this.isShowTable=false
|
|
},
|
|
},
|
|
@@ -4925,6 +4941,7 @@ export default {
|
|
},
|
|
},
|
|
|
|
|
|
closeProSyncTag(){
|
|
closeProSyncTag(){
|
|
|
|
+ this.proSyncTag=false
|
|
this.syncForm={
|
|
this.syncForm={
|
|
range:'',
|
|
range:'',
|
|
rangeName:'',
|
|
rangeName:'',
|
|
@@ -4937,14 +4954,10 @@ export default {
|
|
nodeId:'',
|
|
nodeId:'',
|
|
formIds:''};
|
|
formIds:''};
|
|
|
|
|
|
- if(this.$refs.syncProTree){
|
|
|
|
- this.$refs.syncProTree.setCheckedKeys([])
|
|
|
|
- }
|
|
|
|
- if(this.$refs.proTable){
|
|
|
|
- this.$refs.proTable.clearSelection()
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
this.preTableData=[]
|
|
this.preTableData=[]
|
|
- this.proSyncTag=false
|
|
|
|
|
|
+ this.isShowLeft=false
|
|
|
|
+
|
|
|
|
|
|
},
|
|
},
|
|
async saveProTag(){
|
|
async saveProTag(){
|
|
@@ -4972,6 +4985,12 @@ export default {
|
|
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ console.log(this.syncForm.range,'this.syncForm.range=');
|
|
|
|
+
|
|
|
|
+ if(this.syncForm.range===''){
|
|
|
|
+ this.$message.warning('请选择同步范围')
|
|
|
|
+ return
|
|
|
|
+ }
|
|
this.saveProTagLoading=true
|
|
this.saveProTagLoading=true
|
|
|
|
|
|
addSync({
|
|
addSync({
|
|
@@ -4991,7 +5010,13 @@ export default {
|
|
|
|
|
|
this.syncListData.nodeNum=res.data.data.nodeNum
|
|
this.syncListData.nodeNum=res.data.data.nodeNum
|
|
this.syncListData.nodeNumEnd=res.data.nodeNumEnd
|
|
this.syncListData.nodeNumEnd=res.data.nodeNumEnd
|
|
-
|
|
|
|
|
|
+ if(this.isShowLeft){
|
|
|
|
+ this.isAdd=res.data.data.nodeId
|
|
|
|
+ }else{
|
|
|
|
+ this.isAdd=''
|
|
|
|
+ }
|
|
|
|
+console.log( this.isAdd,' this.isAdd');
|
|
|
|
+
|
|
this.syncListDialog=true
|
|
this.syncListDialog=true
|
|
this.closeProSyncTag()
|
|
this.closeProSyncTag()
|
|
|
|
|
|
@@ -5084,7 +5109,7 @@ export default {
|
|
this.$message.success(res.data.msg)
|
|
this.$message.success(res.data.msg)
|
|
this.syncTableDialog=false
|
|
this.syncTableDialog=false
|
|
this.$refs.proTable1.clearSelection()
|
|
this.$refs.proTable1.clearSelection()
|
|
-
|
|
|
|
|
|
+
|
|
}else{
|
|
}else{
|
|
this.$message.error(res.data.msg)
|
|
this.$message.error(res.data.msg)
|
|
}
|
|
}
|
|
@@ -5122,6 +5147,37 @@ export default {
|
|
this.syncListDialog=true
|
|
this.syncListDialog=true
|
|
this.refreshLoading=false
|
|
this.refreshLoading=false
|
|
|
|
|
|
|
|
+ },
|
|
|
|
+ refreshData1(){
|
|
|
|
+ console.log('shuax');
|
|
|
|
+ this.refreshLoading1=true
|
|
|
|
+ getNodeStatus({ id:this.isAdd}).then((res) => {
|
|
|
|
+ this.refreshLoading1=false
|
|
|
|
+ if(res.data.code==200){
|
|
|
|
+ if(res.data.data){
|
|
|
|
+
|
|
|
|
+ this.syncListData.nodeNum=res.data.data.nodeNum
|
|
|
|
+ this.syncListData.nodeNumEnd=res.data.data.nodeNumEnd
|
|
|
|
+
|
|
|
|
+ }else{
|
|
|
|
+
|
|
|
|
+ this.syncListData={
|
|
|
|
+ nodeNum:'',//同步节点数量
|
|
|
|
+ nodeNumEnd:''//已同步数量
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }else{
|
|
|
|
+
|
|
|
|
+ this.syncListData={
|
|
|
|
+ nodeNum:'',//同步节点数量
|
|
|
|
+ nodeNumEnd:''//已同步数量
|
|
|
|
+ }
|
|
|
|
+ this.$message.error(res.data.msg)
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+
|
|
},
|
|
},
|
|
getNodeStatusData(){
|
|
getNodeStatusData(){
|
|
|
|
|
|
@@ -5129,7 +5185,8 @@ export default {
|
|
if(this.isShowLeft){
|
|
if(this.isShowLeft){
|
|
ids=this.$refs.syncProTree.getCheckedKeys()
|
|
ids=this.$refs.syncProTree.getCheckedKeys()
|
|
ids=ids.join(',')
|
|
ids=ids.join(',')
|
|
- }else{
|
|
|
|
|
|
+ }
|
|
|
|
+ else{
|
|
ids=this.curTreeData.primaryKeyId
|
|
ids=this.curTreeData.primaryKeyId
|
|
}
|
|
}
|
|
|
|
|