commit

src/components/personalCenter/index.vue

@@ -1,31 +1,60 @@
 <template>
   <div class="header">
-    <div class="header-left">
+    <div style="background-color: #0068B7; height: 65px; width: 100%;">
-      <span class="logo" @click="toHome" title="回到首页"></span>
+      <div class="header-left">
-    </div>
+        <div class="logo">
-    <div class="header-center">
+          <img src="@/assets/images/shangqi/img/logo2.png" style="height: 61px; width: 160px;" />
-        <span style="color: #fff; line-height: 65px; font-size: 20px;">
+        </div>
-            标准法规管理系统  standard and regulations management system
+      </div>
+          <span style="color: #fff; line-height: 65px; float: left; font-size: 20px; font-weight: 600;">
+            标准法规管理系统  Standard and Regulations Management System
           </span>
-    </div>
+      <!-- header头部 右侧内容 当前登录人和退出-->
-    <div class="header-right">
+      <div class="header-right" style="display: inline-block; float: right; margin-right: 20px; color: #fff">
-      <span class="date">{{ currentTime }}</span>
+        <div>
-      <span class="divide-line"> | </span>
+          <el-dropdown
-      <span class="user-img"></span>
+                  trigger="click"
-      <span class="user">{{ $store.getters.userInfo.uName }}</span>
+                  @command="handleCommand"
-      <div class="user-info-panel-setting" @click.prevent="userInfoVisible = !userInfoVisible">
+          >
-        <el-dropdown
+            <div>
-          trigger="click"
+              <img :src="userAvator" v-if="$store.getters.userInfo.avator">
-          :visible="userInfoVisible"
+              <span class="iconfont" v-else style="color: #FFFFFF;">&#xe69b;</span>
-          @command="userInfoOpen"
+              <span style="color: #FFFFFF;">{{ $store.getters.userInfo.uName }}</span>
-        >
+              <i style="color: #FFFFFF;" class="el-icon-arrow-down"/>
-          <div class="iconfont" style="color: #fff;"><i class="el-icon-arrow-down"></i></div>
+            </div>
-          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item name="logout" command="logout">{{ $t("m.exit") }}</el-dropdown-item>
+              <el-dropdown-item command="loginOut">退出</el-dropdown-item>
-          </el-dropdown-menu>
+            </el-dropdown-menu>
-        </el-dropdown>
+          </el-dropdown>
+        </div>
       </div>
     </div>
+<!--    <div class="header-left">-->
+<!--      <span class="logo" @click="toHome" title="回到首页"></span>-->
+<!--    </div>-->
+<!--    <div class="header-center">-->
+<!--        <span style="color: #fff; line-height: 65px; font-size: 20px;">-->
+<!--            标准法规管理系统  standard and regulations management system-->
+<!--          </span>-->
+<!--    </div>-->
+<!--    <div class="header-right">-->
+<!--      <span class="date">{{ currentTime }}</span>-->
+<!--      <span class="divide-line"> | </span>-->
+<!--      <span class="user-img"></span>-->
+<!--      <span class="user">{{ $store.getters.userInfo.uName }}</span>-->
+<!--      <div class="user-info-panel-setting" @click.prevent="userInfoVisible = !userInfoVisible">-->
+<!--        <el-dropdown-->
+<!--          trigger="click"-->
+<!--          :visible="userInfoVisible"-->
+<!--          @command="userInfoOpen"-->
+<!--        >-->
+<!--          <div class="iconfont" style="color: #fff;"><i class="el-icon-arrow-down"></i></div>-->
+<!--          <el-dropdown-menu slot="dropdown">-->
+<!--            <el-dropdown-item name="logout" command="logout">{{ $t("m.exit") }}</el-dropdown-item>-->
+<!--          </el-dropdown-menu>-->
+<!--        </el-dropdown>-->
+<!--      </div>-->
+<!--    </div>-->
   </div>
 </template>
 
@@ -105,15 +134,10 @@ export default {
   color: #fff;
 
   .header-left {
-    text-align: left;
+    float: left;
-    //width: 50%;
     .logo {
-      display: inline-block;
+      padding: 4px 42px 10px 10px;
-      width: 160px;
+      text-align: left;
-      height: 61px;
-      background: url("~@/assets/images/shangqi/home/logo2.png") no-repeat;
-      background-size: cover;
-      cursor: pointer;
     }
   }
   .header-center{

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.list = list
-    this.tabValue = this.list[0].name;
   },
   beforeRouteLeave(to, from, next) {
     const toName = ["ListOfStandardsAndRegulationsDetails", "AccessStandardDetails", "LocalProductDetail", "OtherAddEit"];

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;
                                 }

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 状态

src/pages/searchCenter/pages/standardSearch.vue

@@ -5,7 +5,7 @@
         <div class="standard-search-content">
             <div style="position: absolute;left: 0;right: 0;top: 0;bottom: 0;">
                 <div class="content-left">
-                    <div class="search" style="padding: 40px;">
+                    <div class="search" style="padding: 20px 0 0;">
                         <div class="search-box">
                             <div class="home-input">
                                 <el-input
@@ -268,7 +268,6 @@
             </div>
         </div>
         <adc-back-top scroll-bind="standardSearch" windowScroll></adc-back-top>
-
         <!--              分享           -->
         <el-drawer :title="$t('m.share')" :visible.sync="drawerModal" size="300px" :styles="drawerModalstyles" @close="treeCancel">
             <div class="demo-drawer-content">