Merge pull request WeBankBlockchain#655 from 724338817/dev0929

dev0929modified
Sayou1989 · Sep 29, 2021 · 6e63d86 · 6e63d86
2 parents e002c23 + 674e45b
commit 6e63d86
Show file tree

Hide file tree

Showing 17 changed files with 72 additions and 75 deletions.
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
@@ -15,7 +15,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/0.714e566ade85ec8d6bdf.js></script><script type=text/javascript src=./static/js/3.3be06719b992ec2b68d8.js></script><script type=text/javascript src=./static/js/runtime.ae846189f4d523a0caf3.js></script><script type=text/javascript src=./static/js/5.3de44c8af7d57401ccff.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/0.0b763e72125d2d26208c.js></script><script type=text/javascript src=./static/js/3.eb12a41a6deb04d256ae.js></script><script type=text/javascript src=./static/js/runtime.ae846189f4d523a0caf3.js></script><script type=text/javascript src=./static/js/5.3de44c8af7d57401ccff.js></script></body><script>if (self == top) {
             var antiClickjack = document.getElementById("antiClickjack");
             antiClickjack.parentNode.removeChild(antiClickjack);
         } else {

diff --git a/src/main/resources/static/static/js/0.0b763e72125d2d26208c.js b/src/main/resources/static/static/js/0.0b763e72125d2d26208c.js
diff --git a/src/main/resources/static/static/js/0.0b763e72125d2d26208c.js.gz b/src/main/resources/static/static/js/0.0b763e72125d2d26208c.js.gz
diff --git a/src/main/resources/static/static/js/0.714e566ade85ec8d6bdf.js b/src/main/resources/static/static/js/0.714e566ade85ec8d6bdf.js
diff --git a/src/main/resources/static/static/js/0.714e566ade85ec8d6bdf.js.gz b/src/main/resources/static/static/js/0.714e566ade85ec8d6bdf.js.gz
diff --git a/src/main/resources/static/static/js/3.3be06719b992ec2b68d8.js b/src/main/resources/static/static/js/3.3be06719b992ec2b68d8.js
diff --git a/src/main/resources/static/static/js/3.3be06719b992ec2b68d8.js.gz b/src/main/resources/static/static/js/3.3be06719b992ec2b68d8.js.gz
diff --git a/src/main/resources/static/static/js/3.eb12a41a6deb04d256ae.js b/src/main/resources/static/static/js/3.eb12a41a6deb04d256ae.js
diff --git a/src/main/resources/static/static/js/3.eb12a41a6deb04d256ae.js.gz b/src/main/resources/static/static/js/3.eb12a41a6deb04d256ae.js.gz
diff --git a/web/src/components/editor.vue b/web/src/components/editor.vue
@@ -122,7 +122,7 @@
                                             <el-table-column prop="data" label="data" align="left" :show-overflow-tooltip="true">
                                                 <template slot-scope="scope">
                                                     <i class="wbs-icon-baocun font-12 copy-public-key" @click="copyPubilcKey(scope.row.data)" :title="$t('title.copy')"></i>
-                                                    <span>{{scope.row.data}}</span>
+                                                      <span>{{ abc(scope.row.data) }}</span>
                                                 </template>
                                             </el-table-column>
                                         </el-table>
@@ -206,6 +206,11 @@ export default {
 
     },
     methods: {
+         abc(arr) {
+      // return arr.replace(/\'/g, "");
+          if(!Array.isArray(arr)){return arr}
+          return '['+arr.toString()+']'
+         },
         modelClose() {
             this.$emit('close')
         },

diff --git a/web/src/svgIcons/svg/evidenceId.svg b/web/src/svgIcons/svg/evidenceId.svg
diff --git a/web/src/svgIcons/svg/pointsId.svg b/web/src/svgIcons/svg/pointsId.svg
diff --git a/web/src/svgIcons/svg/propertyId.svg b/web/src/svgIcons/svg/propertyId.svg
diff --git a/web/src/svgIcons/svg/toolboxId.svg b/web/src/svgIcons/svg/toolboxId.svg
diff --git a/web/src/svgIcons/svg/traceId.svg b/web/src/svgIcons/svg/traceId.svg
diff --git a/web/src/views/abiList/index.vue b/web/src/views/abiList/index.vue
@@ -243,7 +243,10 @@ export default {
         sendSuccess(val) {
             this.dialogVisible = false;
             this.editorShow = true;
-            this.editorData = val;
+            this.editorData = null;
+            this.editorData = val.resData;
+            this.editorInput = val.input;
+            this.editorOutput = val.data.outputs;
         },
         editorClose() {
             this.editorShow = false;

diff --git a/web/src/views/contractWarehouse/index.vue b/web/src/views/contractWarehouse/index.vue
@@ -12,7 +12,7 @@
                     <el-col :span="12" v-for="(item, index) in wareHouseList" :key="index">
                         <li class="item-warehouse">
                             <div class="left-warehouse">
-                                <svg-icon :icon-class='item.iconName' class="font-120" style=""></svg-icon>
+                                <svg-icon :icon-class='item.storeIcon' class="font-120" style=""></svg-icon>
                                 <!-- <el-image style="width: 120px; height: 120px" :src="item.storeIcon">
                                     <div slot="error" class="image-slot">
                                         <i class="el-icon-picture-outline"></i>
@@ -107,24 +107,8 @@ export default {
             getContractStore()
                 .then(res => {
                     this.loading = false;
-                    if (res.data.code === 0) {
+                     if (res.data.code === 0) {
                         var list = res.data.data;
-                        var iconList = ["tools", "supply", "points"];
-                        list.forEach((item, index) => {
-                            switch (item.storeIcon) {
-                                case "toolboxId":
-                                    item.iconName = "tools"
-                                    break;
-                                case "evidenceId":
-                                    item.iconName = "supply"
-                                    break;
-                                case "pointsId":
-                                    item.iconName = "points"
-                                    break;
-                                default:
-                                    break;
-                            }
-                        });
                         this.wareHouseList = list;
 
                     } else {