Commit f3e14666 authored by “yiyousong”'s avatar “yiyousong”

fix:修改切换站点,业务板块丢失站点问题

parent 0b148bf8
...@@ -45,13 +45,13 @@ export default { ...@@ -45,13 +45,13 @@ export default {
handleClick(siteInfo) { handleClick(siteInfo) {
this.siteId = siteInfo.id; this.siteId = siteInfo.id;
if (this.$refs.BusinessTabs1) { if (this.$refs.BusinessTabs1) {
this.$refs.BusinessTabs1.getSiteInfo(siteInfo); this.$refs.BusinessTabs1.getSiteInfo(siteInfo.id);
} }
if (this.$refs.BusinessTabs2) { if (this.$refs.BusinessTabs2) {
this.$refs.BusinessTabs2.getSiteInfo(siteInfo); this.$refs.BusinessTabs2.getSiteInfo(siteInfo.id);
} }
if (this.$refs.BusinessTabs3) { if (this.$refs.BusinessTabs3) {
this.$refs.BusinessTabs3.getSiteInfo(siteInfo); this.$refs.BusinessTabs3.getSiteInfo(siteInfo.id);
} }
}, },
// 点击区域 // 点击区域
...@@ -66,6 +66,7 @@ export default { ...@@ -66,6 +66,7 @@ export default {
if (this.siteId) { if (this.siteId) {
switch (key) { switch (key) {
case 1: case 1:
console.log(this.siteId);
this.$refs.BusinessTabs1.getSiteInfo(this.siteId); this.$refs.BusinessTabs1.getSiteInfo(this.siteId);
break; break;
case 2: case 2:
......
...@@ -67,33 +67,11 @@ ...@@ -67,33 +67,11 @@
</template> </template>
</a-table> </a-table>
</div> </div>
<!-- 分页 -->
<!-- <div class="pagination" v-if="leftTotal">
<a-pagination
v-model="leftCurrent"
:show-total="(total) => `共 ${total} 条`"
:total="leftTotal"
@change="changeLeft"
show-less-items
show-size-changer
show-quick-jumper
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChange"
/>
</div> -->
</div> </div>
<!-- 右 --> <!-- 右 -->
<div class="right"> <div class="right">
<div class="header"> <div class="header">
<h3 class="titel">一体化业务列表</h3> <h3 class="titel">一体化业务列表</h3>
<!-- <a-radio-group
class="titel"
v-model="businessType"
@change="onChangeBusiness"
>
<a-radio-button :value="0"> 一体化业务列表 </a-radio-button>
<a-radio-button :value="1"> 自建业务列表 </a-radio-button>
</a-radio-group> -->
<div class="control"> <div class="control">
<div> <div>
<a-button type="primary" @click="handleAddAll"> 批量加入 </a-button> <a-button type="primary" @click="handleAddAll"> 批量加入 </a-button>
...@@ -158,21 +136,6 @@ ...@@ -158,21 +136,6 @@
</template> </template>
</a-table> </a-table>
</div> </div>
<!-- 分页 -->
<!-- <div class="pagination" v-if="rightTotal">
<a-pagination
v-model="rightCurrent"
size="small"
:show-total="(total) => `共 ${total} 条`"
:total="rightTotal"
@change="changeRight"
show-less-items
show-size-changer
show-quick-jumper
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChangeRight"
/>
</div> -->
</div> </div>
<!-- 新增对话框 --> <!-- 新增对话框 -->
<addprofession <addprofession
...@@ -272,9 +235,9 @@ export default { ...@@ -272,9 +235,9 @@ export default {
created() {}, created() {},
methods: { methods: {
// 获取站点 // 获取站点
getSiteInfo(val) { getSiteInfo(siteId) {
Object.assign(this.$data, this.$options.data()); //获取data源对象,覆盖当前data对象状态 Object.assign(this.$data, this.$options.data()); //获取data源对象,覆盖当前data对象状态
this.siteId = val.id; this.siteId = siteId;
this.getSiteBusinessData(); this.getSiteBusinessData();
this.getBusinessListData(); this.getBusinessListData();
}, },
...@@ -331,11 +294,6 @@ export default { ...@@ -331,11 +294,6 @@ export default {
this.leftCurrent = 1; this.leftCurrent = 1;
this.getSiteBusinessData(); this.getSiteBusinessData();
}, },
// 切换业务类型
// onChangeBusiness(val) {
// this.businessType = val.target.value;
// this.getBusinessListData();
// },
// 删除 // 删除
handleDel(num, data) { handleDel(num, data) {
let _this = this; let _this = this;
...@@ -485,36 +443,6 @@ export default { ...@@ -485,36 +443,6 @@ export default {
}, },
}); });
}, },
// 自定义表格展开图标
expandIcon(props) {
if (props.record.children) {
if (props.expanded) {
//有数据-展开时候图标
return (
<div
style="display: inline-block"
onClick={(e) => {
props.onExpand(props.record, e);
}}
>
<a-icon type="down" />
</div>
);
} else {
//有数据-未展开时候图标
return (
<div
style="display: inline-block"
onClick={(e) => {
props.onExpand(props.record, e);
}}
>
<a-icon type="right" />
</div>
);
}
}
},
}, },
}; };
</script> </script>
......
...@@ -297,9 +297,9 @@ export default { ...@@ -297,9 +297,9 @@ export default {
methods: { methods: {
// 获取站点 // 获取站点
getSiteInfo(val) { getSiteInfo(siteId) {
Object.assign(this.$data, this.$options.data()); //获取data源对象,覆盖当前data对象状态 Object.assign(this.$data, this.$options.data()); //获取data源对象,覆盖当前data对象状态
this.siteId = val.id; this.siteId = siteId;
this.getMatterSiteData(); this.getMatterSiteData();
this.getMatterListData(); this.getMatterListData();
}, },
...@@ -344,12 +344,6 @@ export default { ...@@ -344,12 +344,6 @@ export default {
this.rightTotal = pageInfo.totalResult; this.rightTotal = pageInfo.totalResult;
this.rightLoading = false; this.rightLoading = false;
}, },
// 获取部门列表
// async getDeptData() {
// let res = await getDeptList({ siteId: this.siteId });
// let { data } = res.data.data;
// this.deptList = data;
// },
// 左边搜索 // 左边搜索
onSearchLeft() { onSearchLeft() {
this.leftCurrent = 1; this.leftCurrent = 1;
...@@ -373,6 +367,7 @@ export default { ...@@ -373,6 +367,7 @@ export default {
if (code === 1) { if (code === 1) {
_this.$message.success(msg); _this.$message.success(msg);
_this.getMatterSiteData(); _this.getMatterSiteData();
_this.getMatterListData();
_this.deleteData = ""; _this.deleteData = "";
_this.$bus.$emit("delMatterSiteData"); _this.$bus.$emit("delMatterSiteData");
_this.$bus.$emit("delMatterSiteRelevance", row); _this.$bus.$emit("delMatterSiteRelevance", row);
......
...@@ -404,12 +404,13 @@ export default { ...@@ -404,12 +404,13 @@ export default {
methods: { methods: {
// 获取站点 // 获取站点
getSiteInfo(val) { getSiteInfo(siteId) {
Object.assign(this.$data, this.$options.data()); //获取data源对象,覆盖当前data对象状态 Object.assign(this.$data, this.$options.data()); //获取data源对象,覆盖当前data对象状态
this.siteId = val.id; this.siteId = siteId;
this.getSiteBusinessData({ siteId: val.id }); console.log(this.siteId);
this.getMatterSiteData({ siteId: val.id }); this.getSiteBusinessData({ siteId });
this.getBusinessMatterData({ siteId: val.id }); this.getMatterSiteData({ siteId });
this.getBusinessMatterData({ siteId });
}, },
getEmpty() { getEmpty() {
Object.assign(this.$data, this.$options.data()); //获取data源对象,覆盖当前data对象状态 Object.assign(this.$data, this.$options.data()); //获取data源对象,覆盖当前data对象状态
......
...@@ -146,23 +146,10 @@ ...@@ -146,23 +146,10 @@
</span> </span>
</a-table> </a-table>
</div> </div>
<!-- 翻页 -->
<!-- <div class="pagination" v-if="total">
<a-pagination
v-model="page"
:show-total="(total) => `共 ${total} 条`"
:total="total"
@change="onPage"
show-less-items
show-size-changer
show-quick-jumper
:pageSizeOptions="pageSizeOptions"
@showSizeChange="showSizeChange"
/>
</div> -->
</div> </div>
<!-- 关联业务 -->
<div> <div>
<!-- 关联业务 -->
<a-modal <a-modal
title="关联业务" title="关联业务"
:visible="visibleWork" :visible="visibleWork"
...@@ -394,12 +381,7 @@ export default { ...@@ -394,12 +381,7 @@ export default {
} }
}, },
clickArea() { clickArea() {
this.department = []; Object.assign(this.$data, this.$options.data());
this.windowData = [];
this.siteId = "";
this.total = 0;
this.active = undefined;
this.deptId = "";
}, },
// 去掉空children // 去掉空children
delChildren(arr) { delChildren(arr) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment