diff --git a/src/components/personalCenter/index.vue b/src/components/personalCenter/index.vue index 636543c87..ae500d7f9 100644 --- a/src/components/personalCenter/index.vue +++ b/src/components/personalCenter/index.vue @@ -1,31 +1,60 @@ @@ -105,15 +134,10 @@ export default { color: #fff; .header-left { - text-align: left; - //width: 50%; + float: left; .logo { - display: inline-block; - width: 160px; - height: 61px; - background: url("~@/assets/images/shangqi/home/logo2.png") no-repeat; - background-size: cover; - cursor: pointer; + padding: 4px 42px 10px 10px; + text-align: left; } } .header-center{ diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index 5920e1055..3181806be 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -31,11 +31,12 @@ export default { data() { return { list: [], - tabValue: "listProject", + tabValue: "listOfCountries", menuName: ["国家/地区清单", "车型类别清单", "其他清单", "项目清单"] }; }, - methods: {}, + methods: { + }, components: { localProductsOrProjectLibrary, listOfCountries, @@ -84,8 +85,7 @@ export default { } } }); - this.list = list; - this.tabValue = this.list[0].name; + this.list = list }, beforeRouteLeave(to, from, next) { const toName = ["ListOfStandardsAndRegulationsDetails", "AccessStandardDetails", "LocalProductDetail", "OtherAddEit"]; diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index 89d6116d9..fa10328ed 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -50,6 +50,11 @@ }) }, handleNodeClick (node) { + let json = { + id: '123', + name: '123', + + } }, handleEdgeClick (node) {}, renderGraph(row) { @@ -182,11 +187,8 @@ { type: 'collapse-expand', onChange: function onChange(item, collapsed) { - console.log(1); const data = item.get('model'); const icon = item.get('group').find((element) => element.get('name') === 'collapse-icon'); - console.log(data); - console.log(icon); if (collapsed) { icon.attr('symbol', G6.Marker.expand); } else { @@ -197,7 +199,7 @@ }, shouldBegin: (e) => { const target = e.target - const nodeType = target.cfg.nature + const nodeType = target.cfg.name if (nodeType === 'collapse-icon') return true; return false; } diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue index 2e65282c6..fa93cd857 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue @@ -77,7 +77,9 @@ // } // this.$message.success('节点被点击' + data.name) }, - handleEdgeClick (node) {}, + handleEdgeClick (node) { + console.log(4); + }, renderGraph() { G6.registerNode( 'tree-node', @@ -281,6 +283,7 @@ }, handleGraphDraw () {}, handleGraphNodeClickEvent(graph) { + console.log(1); // 点击节点 graph.on('node:click', (e) => { // 先将所有当前是 click 状态的节点置为非 click 状态 @@ -294,6 +297,7 @@ }); }, handleGraphEdgeClickEvent(graph) { + console.log(2); // 点击边 graph.on('edge:click', (e) => { // 先将所有当前是 click 状态的边置为非 click 状态 diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 5dd1ca88d..de91fb48c 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -5,7 +5,7 @@
-