Merge pull request #144 from WeBankFinTech/dev-0.8

Dev 0.8
WeBankBlockchain · Jul 2, 2019 · b59062d · b59062d
2 parents ccab30f + d2b67e5
commit b59062d
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 25 deletions.
diff --git a/src/main/resources/static/dist/index.html b/src/main/resources/static/dist/index.html
@@ -14,7 +14,7 @@
             vertical-align: -0.15em;
             fill: currentColor;
             overflow: hidden;
-        }</style></head><body><body><div id=app style="height: 100% !important;"></div><script type=text/javascript src=./static/js/3.3a198214002993d4971f.js></script><script type=text/javascript src=./static/js/runtime.e17e6d4e94f2b2c33ee8.js></script><script type=text/javascript src=./static/js/5.49b86db2fbf8fa7d6f61.js></script></body><script>if (self == top) {
+        }</style></head><body><body><div id=app style="height: 100% !important;"></div><script type=text/javascript src=./static/js/3.3a198214002993d4971f.js></script><script type=text/javascript src=./static/js/runtime.1dae7c9e0ca2b17ed4c2.js></script><script type=text/javascript src=./static/js/5.49b86db2fbf8fa7d6f61.js></script></body><script>if (self == top) {
             var antiClickjack = document.getElementById("antiClickjack");
             antiClickjack.parentNode.removeChild(antiClickjack);
         } else {

diff --git a/...dist/static/js/10.dea25922a07c8bb43bca.js → ...dist/static/js/10.819ca7ed8391be6ed7f3.js b/...dist/static/js/10.dea25922a07c8bb43bca.js → ...dist/static/js/10.819ca7ed8391be6ed7f3.js
diff --git a/.../dist/static/js/6.300cdf83c90baec7ccc7.js → .../dist/static/js/6.837fb508cdda49659bb6.js b/.../dist/static/js/6.300cdf83c90baec7ccc7.js → .../dist/static/js/6.837fb508cdda49659bb6.js
diff --git a/src/main/resources/static/dist/static/js/7.97dc9838e1d2d3e0f75c.js b/src/main/resources/static/dist/static/js/7.97dc9838e1d2d3e0f75c.js
diff --git a/src/main/resources/static/dist/static/js/7.fb02846e510986dbdc89.js b/src/main/resources/static/dist/static/js/7.fb02846e510986dbdc89.js
diff --git a/src/main/resources/static/dist/static/js/runtime.1dae7c9e0ca2b17ed4c2.js b/src/main/resources/static/dist/static/js/runtime.1dae7c9e0ca2b17ed4c2.js
diff --git a/src/main/resources/static/dist/static/js/runtime.e17e6d4e94f2b2c33ee8.js b/src/main/resources/static/dist/static/js/runtime.e17e6d4e94f2b2c33ee8.js
diff --git a/src/main/resources/static/docs/nginx.conf b/src/main/resources/static/docs/nginx.conf
@@ -32,12 +32,12 @@ http {
 
     #gzip  on;
     upstream node_mgr_server{
-        server 10.10.0.1:8083;
+        server 127.0.0.1:8083;
     }
     add_header X-Frame-Options SAMEORIGIN;
     server {
         listen       3002 default_server;
-        server_name  10.10.0.1;
+        server_name  127.0.0.1;
         location / {    
             root    /data/webase-web/dist;
             index  index.html index.htm;

diff --git a/src/main/resources/static/package.json b/src/main/resources/static/package.json
@@ -56,7 +56,7 @@
     "postcss-url": "^7.2.1",
     "rimraf": "^2.6.0",
     "semver": "^5.3.0",
-    "shelljs": "^0.7.6",
+    "shelljs": "^0.8.3",
     "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^1.1.2",
     "vue-loader": "^15.7.0",

diff --git a/src/main/resources/static/src/views/chaincode/components/code.vue b/src/main/resources/static/src/views/chaincode/components/code.vue
@@ -58,7 +58,7 @@
             <div class="contract-info" v-show="successHide" :style="{height:infoHeight + 'px'}">
                 <div class="move" @mousedown="dragDetailWeight($event)" @mouseup="resizeCode"></div>
                 <div class="contract-info-title">
-                    <i class="wbs-icon-clear float-right" @click="refreshMessage" title="清除"></i>
+                    <!-- <i class="wbs-icon-clear float-right" @click="refreshMessage" title="清除"></i> -->
                 </div>
                 <div>
                     <div class="contract-info-list1" v-html="compileinfo">

diff --git a/src/main/resources/static/src/views/home/home.vue b/src/main/resources/static/src/views/home/home.vue
@@ -191,7 +191,8 @@ import {
     queryNodesNumber,
     queryTxNumber,
     queryPendingTxNumber,
-    queryHomeSearch
+    queryHomeSearch,
+    queryGroup
 } from "@/util/api";
 import { changWeek, numberFormat, format } from "@/util/util";
 import router from "@/router";
@@ -307,7 +308,7 @@ export default {
             overviewNodesNumber: "",
             overviewTxNumber: "",
             overviewPendingTxNumber: "",
-            group: localStorage.getItem("groupId") || null,
+            group: localStorage.getItem("groupId"),
             searchMap: {}
         };
     },
@@ -324,12 +325,10 @@ export default {
         // this.getBlockList();
         // this.getTransaction();
         if (this.group) {
-            this.getBlockNumber();
-            this.getNodesNumber();
-            this.getTxNumber();
-            this.getPendingTxNumber();
+            this.getAllOverview()
+        } else {
+            this.getGroup()
         }
-
         this.$nextTick(function () {
             // this.chartStatistics.chartSize.width = this.$refs.chart.offsetWidth;
             // this.chartStatistics.chartSize.height = this.$refs.chart.offsetHeight;
@@ -338,6 +337,31 @@ export default {
     },
     destroyed() { },
     methods: {
+        getGroup() {
+            queryGroup()
+                .then(res => {
+                    const { data, status } = res;
+                    if (status === 200) {
+                        let arr = data.sort((a, b) => {
+                            return a - b
+                        })
+                        this.group = arr[0]
+                        this.getAllOverview()
+                    }
+                })
+                .catch(err => {
+                    this.$message({
+                        type: "error",
+                        message: "系统错误"
+                    });
+                })
+        },
+        getAllOverview() {
+            this.getBlockNumber();
+            this.getNodesNumber();
+            this.getTxNumber();
+            this.getPendingTxNumber();
+        },
         changeGroup(val) {
             this.group = val;
             this.blockData = [];
@@ -719,7 +743,7 @@ export default {
             //     }
             // });
         },
-        clickTable: function (row, $event, column) {
+        clickTable: function (row, column, $event) {
             let nodeName = $event.target.nodeName;
             if (nodeName === "I") {
                 return;
@@ -930,10 +954,6 @@ export default {
 .node-ip {
     color: #2d5f9e;
 }
-
-.block-table-content >>> .el-icon-arrow-right:before {
-    content: "\e60e";
-}
 .block-table-content >>> .el-table__row {
     cursor: pointer;
 }

diff --git a/src/main/resources/static/src/views/index/sidebar.vue b/src/main/resources/static/src/views/index/sidebar.vue
@@ -169,7 +169,9 @@ export default {
                 .then(res => {
                     const { data, status, statusText } = res;
                     if (status === 200) {
-                        let arr = data.sort(),
+                        let arr = data.sort((a, b) => {
+                            return a - b
+                        }),
                             list = [];
                         for (let i = 0; i < arr.length; i++) {
                             list.push({

diff --git a/src/main/resources/static/src/views/transactionInfo/transactionInfo.vue b/src/main/resources/static/src/views/transactionInfo/transactionInfo.vue
@@ -205,9 +205,6 @@ export default {
 .block-table-content>>>.el-table__expanded-cell {
     padding: 12px 6px;
 }
-.block-table-content>>>.el-icon-arrow-right:before {
-    content: "\e60e";
-}
 .block-table-content>>>.el-table__expand-icon > .el-icon {
     font-size: 14px;
 }