Merge pull request #141 from gongdaxia/dev

fix bug
WeBankBlockchain · Dec 25, 2019 · 1ad540f · 1ad540f
2 parents 47b975f + d123166
commit 1ad540f
Show file tree

Hide file tree

Showing 49 changed files with 155 additions and 206 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -11,8 +11,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.e6f6c4eef8f46e99bd0a.js></script><script type=text/javascript src=./static/js/3.0bfe8c760b770e19ca7c.js></script><script type=text/javascript src=./static/js/runtime.3b3ce3a07b1ffbe27563.js></script><script type=text/javascript src=./static/js/5.a3fd349a55a77c83539a.js></script></body><script src=./static/js/web3.min.js type=text/javascript></script><script>if (self == top) {
-
+        }</style></head><body><body><div id=app style="height: 100% !important;"></div><script type=text/javascript src=./static/js/0.6e6049111196c0ec0fc4.js></script><script type=text/javascript src=./static/js/3.690100aa4d0cf7a99ff0.js></script><script type=text/javascript src=./static/js/runtime.3b3ce3a07b1ffbe27563.js></script><script type=text/javascript src=./static/js/5.a3fd349a55a77c83539a.js></script></body><script src=./static/js/web3.min.js type=text/javascript></script><script>if (self == top) {
         var antiClickjack = document.getElementById("antiClickjack");
         antiClickjack.parentNode.removeChild(antiClickjack);
     } else {

diff --git a/dist/static/js/0.465a5817238a165bef22.js b/dist/static/js/0.465a5817238a165bef22.js
diff --git a/dist/static/js/0.6e6049111196c0ec0fc4.js b/dist/static/js/0.6e6049111196c0ec0fc4.js
diff --git a/dist/static/js/0.e6f6c4eef8f46e99bd0a.js b/dist/static/js/0.e6f6c4eef8f46e99bd0a.js
diff --git a/dist/static/js/1.60152a8a1377e2ee6ae0.js → dist/static/js/1.bdf9cd411a9fe9f2573e.js b/dist/static/js/1.60152a8a1377e2ee6ae0.js → dist/static/js/1.bdf9cd411a9fe9f2573e.js
diff --git a/dist/static/js/10.2f52dfbe96836b0e67ae.js → dist/static/js/10.d5f33bf12ea552a7bce8.js b/dist/static/js/10.2f52dfbe96836b0e67ae.js → dist/static/js/10.d5f33bf12ea552a7bce8.js
diff --git a/dist/static/js/11.e1a42e23deda055eb130.js → dist/static/js/11.fa8994f499b2865d3f4b.js b/dist/static/js/11.e1a42e23deda055eb130.js → dist/static/js/11.fa8994f499b2865d3f4b.js
diff --git a/dist/static/js/12.8b3ae72b1f658bba13a9.js → dist/static/js/12.0f5df32718484b6ebd93.js b/dist/static/js/12.8b3ae72b1f658bba13a9.js → dist/static/js/12.0f5df32718484b6ebd93.js
diff --git a/dist/static/js/13.898ac4a2ae62aaafe374.js → dist/static/js/13.ddf6d5214511b247737c.js b/dist/static/js/13.898ac4a2ae62aaafe374.js → dist/static/js/13.ddf6d5214511b247737c.js
diff --git a/dist/static/js/14.85f90966b442e68a64a6.js → dist/static/js/14.485c4ff30beccdd2335f.js b/dist/static/js/14.85f90966b442e68a64a6.js → dist/static/js/14.485c4ff30beccdd2335f.js
diff --git a/dist/static/js/15.42e4aec82d74043fb0bd.js → dist/static/js/15.6006d3a3bc0143bf6c65.js b/dist/static/js/15.42e4aec82d74043fb0bd.js → dist/static/js/15.6006d3a3bc0143bf6c65.js
diff --git a/dist/static/js/16.007635f0b3c902ee247f.js → dist/static/js/16.45b2609a21876fa0b0f7.js b/dist/static/js/16.007635f0b3c902ee247f.js → dist/static/js/16.45b2609a21876fa0b0f7.js
diff --git a/dist/static/js/17.0cc2b9a289e7ec958d62.js → dist/static/js/17.83a643092bd942df57cc.js b/dist/static/js/17.0cc2b9a289e7ec958d62.js → dist/static/js/17.83a643092bd942df57cc.js
diff --git a/dist/static/js/18.3945440d3d97f3506c41.js → dist/static/js/18.3473b095bafc2cee3615.js b/dist/static/js/18.3945440d3d97f3506c41.js → dist/static/js/18.3473b095bafc2cee3615.js
diff --git a/dist/static/js/19.9ffc7752e9f1cb473806.js → dist/static/js/19.d5e4856298eadcb5d3bb.js b/dist/static/js/19.9ffc7752e9f1cb473806.js → dist/static/js/19.d5e4856298eadcb5d3bb.js
diff --git a/dist/static/js/2.249d2d917e221138707a.js → dist/static/js/2.47ca19f2d105f99a5173.js b/dist/static/js/2.249d2d917e221138707a.js → dist/static/js/2.47ca19f2d105f99a5173.js
diff --git a/dist/static/js/20.5894b4932f3874fe45a7.js → dist/static/js/20.731da7c446680d44770f.js b/dist/static/js/20.5894b4932f3874fe45a7.js → dist/static/js/20.731da7c446680d44770f.js
diff --git a/dist/static/js/21.e76354ad117c355b45dd.js → dist/static/js/21.db99a59e7e8a32f2a53b.js b/dist/static/js/21.e76354ad117c355b45dd.js → dist/static/js/21.db99a59e7e8a32f2a53b.js
diff --git a/dist/static/js/22.c879a35a3040e6d5f667.js → dist/static/js/22.80b65ea7c720c12e8dea.js b/dist/static/js/22.c879a35a3040e6d5f667.js → dist/static/js/22.80b65ea7c720c12e8dea.js
diff --git a/dist/static/js/23.7b5c1c73c43e4e7a4cc9.js → dist/static/js/23.d7da9f34f28bda878088.js b/dist/static/js/23.7b5c1c73c43e4e7a4cc9.js → dist/static/js/23.d7da9f34f28bda878088.js
diff --git a/dist/static/js/24.b0793608bcddc82676bb.js → dist/static/js/24.e770e413d43dde1fab1e.js b/dist/static/js/24.b0793608bcddc82676bb.js → dist/static/js/24.e770e413d43dde1fab1e.js
diff --git a/dist/static/js/25.d470858cfadad36532a7.js → dist/static/js/25.76691b37637b0f8eb02d.js b/dist/static/js/25.d470858cfadad36532a7.js → dist/static/js/25.76691b37637b0f8eb02d.js
diff --git a/dist/static/js/26.a0262059698c40296307.js → dist/static/js/26.f5d474978f9e3e9ccfcc.js b/dist/static/js/26.a0262059698c40296307.js → dist/static/js/26.f5d474978f9e3e9ccfcc.js
diff --git a/dist/static/js/27.32dce336945d105909cd.js → dist/static/js/27.d1af47f00db61d00f983.js b/dist/static/js/27.32dce336945d105909cd.js → dist/static/js/27.d1af47f00db61d00f983.js
diff --git a/dist/static/js/28.ca5bd54b58b3807228b2.js → dist/static/js/28.799780cfb2e47341d0c0.js b/dist/static/js/28.ca5bd54b58b3807228b2.js → dist/static/js/28.799780cfb2e47341d0c0.js
diff --git a/dist/static/js/29.67242f03d1a148c9e81b.js → dist/static/js/29.6bb0651f21659237c629.js b/dist/static/js/29.67242f03d1a148c9e81b.js → dist/static/js/29.6bb0651f21659237c629.js
diff --git a/dist/static/js/3.0bfe8c760b770e19ca7c.js b/dist/static/js/3.0bfe8c760b770e19ca7c.js
diff --git a/dist/static/js/3.541d9571b914c9a2b006.js b/dist/static/js/3.541d9571b914c9a2b006.js
diff --git a/dist/static/js/3.690100aa4d0cf7a99ff0.js b/dist/static/js/3.690100aa4d0cf7a99ff0.js
diff --git a/dist/static/js/30.959e4c2399896205be2a.js → dist/static/js/30.0dc4d992e9331936b9e9.js b/dist/static/js/30.959e4c2399896205be2a.js → dist/static/js/30.0dc4d992e9331936b9e9.js
diff --git a/dist/static/js/5.19a6f88148f8266d07b4.js b/dist/static/js/5.19a6f88148f8266d07b4.js
diff --git a/dist/static/js/5.a3fd349a55a77c83539a.js b/dist/static/js/5.a3fd349a55a77c83539a.js
diff --git a/dist/static/js/6.312279e4a1e186dc40e9.js b/dist/static/js/6.312279e4a1e186dc40e9.js
diff --git a/dist/static/js/6.c2382be11c4754a725a0.js b/dist/static/js/6.c2382be11c4754a725a0.js
diff --git a/dist/static/js/7.1d1fd4670db1d2346d85.js → dist/static/js/7.64f96e5fff2e75172fd2.js b/dist/static/js/7.1d1fd4670db1d2346d85.js → dist/static/js/7.64f96e5fff2e75172fd2.js
diff --git a/dist/static/js/8.aeeb1267244f9a4ab89e.js → dist/static/js/8.8e99c54719d90fcef799.js b/dist/static/js/8.aeeb1267244f9a4ab89e.js → dist/static/js/8.8e99c54719d90fcef799.js
diff --git a/dist/static/js/9.fcb7a00d3ab3e66da45e.js → dist/static/js/9.c24429ac818b3dbc88c4.js b/dist/static/js/9.fcb7a00d3ab3e66da45e.js → dist/static/js/9.c24429ac818b3dbc88c4.js
diff --git a/dist/static/js/runtime.3b3ce3a07b1ffbe27563.js b/dist/static/js/runtime.3b3ce3a07b1ffbe27563.js
diff --git a/dist/static/js/runtime.84bc8915eb5048723ed0.js b/dist/static/js/runtime.84bc8915eb5048723ed0.js
diff --git a/src/lang/en.js b/src/lang/en.js
@@ -8,8 +8,8 @@ export default {
         hash: "Normal"
     },
     inputText: {
-        user: "Please User",
-        password: "Please Password",
+        user: "Please enter User",
+        password: "Please enter Password",
         verificationCode: "Verification Code",
         blockInput: "Search by Block / Txn Hash",
         contractSearch: "Please enter the contract name or address",
@@ -155,7 +155,7 @@ export default {
         agency: "Agency",
         modifyTime: "Modify Time",
         nodeStyle: "Node Type",
-        operation: "Action",
+        operation: "Actions",
         sealer: "Sealer",
         observer: "Observer",
         remove: "Remove",
@@ -196,28 +196,28 @@ export default {
         conmileNameError: "Contract name and file name should be consistent!",
         deploySuccess: "< Deployment Success！",
         contractDeploySuccess: "Contract deployed successfully！",
-        contractName: "Contract Name",
+        contractName: "Name",
         filePath: "File Path",
         folderName: "Folder Name",
         folderSameFail: "The new folder has the same name as the existing folder",
         user: "User",
         params: "Params",
         paramsInfo: "If the parameter type is an array, separate it with commas, without quotation marks, for example: arry1, arry2. Other types, such as string, do not need to be quoted.",
-        contractAddress: "Contract Address",
+        contractAddress: "Address",
         method: "Method",
         contractAddressInput: "Please enter the contract address",
         contractAddressInfo: "Optional item,import deployed contract addresses.",
         selectUser: "Please Select Users",
         methodType: "Method Type",
         methodName: "Method Name",
-        contractCatalogue: "Contract Catalogue",
+        contractCatalogue: "Location",
         copyContractAddress: "Copy Contract Address",
-        contractAbi: "contract Abi",
-        contractBin: "contract Bin",
+        contractAbi: "Abi",
+        contractBin: "Bin",
         copyContractAbi: "Copy Contract Abi",
         copyContractBin: "Copy Contract Bin",
         abiInfo: "ABI Details",
-        contractVersion: "Contract Version",
+        contractVersion: "Version",
         adminUser: 'User Account',
         createTable: "Create Table",
         insertTable: "Insert Table Record",
@@ -240,23 +240,23 @@ export default {
         description: "Description",
         userAddress: "Address",
         userStatus: "Status",
-        inputDescription: "Please enter user description",
+        inputDescription: "Please enter User Description",
         updateUserSuccess: "User modified successfully",
         normal: "Normal",
         disable: "Disable",
         privateKeyUser: "Private key user",
         publicKeyUser: "Public key user",
         publicKeyInfo: "Public key information",
-        inputUserName: "Please enter user name",
+        inputUserName: "Please enter User Name",
         inputPublicInfo: "Please enter public key information or public key address.",
         userLong: "Within 120 characters",
         inputPublic: "Please enter public key information",
         addUserSuccess: "User added successfully!",
         addUserFail: "Failed to add user!"
     },
     system: {
-        chainManager: "Chain management permission",
-        addChainManager: "Add chain management permission",
+        chainManager: "Chain Management Permission",
+        addChainManager: "Add Chain Management Permission",
         copyAddress: "Copy Address",
         commonManager: "General Management Permission",
         chainAdministrator: "Chain Administrator",
@@ -270,8 +270,8 @@ export default {
         node: "Node",
         confirmPermission: "When adding the first administrator permission, the administrator will start the permission. Please confirm whether the account is correct. Misoperation may cause the service to be unavailable.",
         dialogTips: "Tips: public key users cannot authorize other users",
-        outUserAddress: "Address of external account",
-        inputUser: "Please enter your account number",
+        outUserAddress: "User Address",
+        inputUser: "Please enter your Account Name",
         authorizedSuccess: "Authorized Success",
         deleteSuccess: "Delete Successful",
         configContent1: "It is not recommended to modify tx_count_limit and tx_gas_limit arbitrarily. These parameters can be modified as follows.",
@@ -306,7 +306,7 @@ export default {
         deleteAccount: "Delete Account",
         updataAccount: "Modify Account",
         email: "Email",
-        inputEmail: "Please enter email",
+        inputEmail: "Please enter Email",
         emailTypeError: "E-mail format is incorrect"
     },
     transaction: {
@@ -366,7 +366,7 @@ export default {
         selectDate: "Please select display date and time"
     },
     alarm: {
-        alarmCofig: "System Metric",
+        alarmCofig: "System Metrics",
         emailAlarmConfig: "Alarm Config",
         emailAlarmConfigYips: "System configuration management instructions: The system configuration can configure system property values (currently supports the setting of tx_count_limit and tx_gas_limit properties).",
         agreementType: "Protocol",
@@ -400,7 +400,7 @@ export default {
         alarmEmailTile: "Tiltle",
         emailContent: "Template",
         sendTime: "Interval",
-        operation: "Action",
+        operation: "Actions",
         update: "Update",
         disable: "Disable",
         enable: "enable",

diff --git a/src/views/account/accountInfo.vue b/src/views/account/accountInfo.vue
@@ -85,6 +85,10 @@ export default {
                     enName: "roleNameZh",
                     name: this.$t('account.roleNameZh')
                 },
+                {
+                    enName: "email",
+                    name: this.$t("account.email")
+                },
                 {
                     enName: "operate",
                     name: this.$t('nodes.operation')

diff --git a/src/views/alarm/dialog/emailAlarmDetail.vue b/src/views/alarm/dialog/emailAlarmDetail.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog :title="$t('alarm.emailAlarmDetail')" :visible.sync="dialogVisible" width="600px" :before-close="handleClose">
+        <el-dialog :title="$t('alarm.emailAlarmDetail')" :visible.sync="dialogVisible" width="600px" :before-close="handleClose" :center="true">
             <div>
                 <el-form  ref="alarmForm" label-width="130px" class="demo-ruleForm">
                     <el-form-item :label="$t('alarm.alarmEmailTile')" prop="ruleName">

diff --git a/src/views/alarm/dialog/emailAlarmTypeDetail.vue b/src/views/alarm/dialog/emailAlarmTypeDetail.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog :title="$t('alarm.alarmCofig')" :visible.sync="dialogVisible" width="600px" :before-close="handleClose">
+        <el-dialog :title="$t('alarm.alarmCofig')" :visible.sync="dialogVisible" width="500px" :before-close="handleClose" :center="true">
         <div>
             <el-form :model="alarmForm" :rules="rules" ref="alarmForm" label-width="120px" class="demo-ruleForm">
                 <el-form-item :label="$t('alarm.alarmEmailTile')" prop="ruleName">
@@ -35,7 +35,7 @@
                 </el-form-item>
             </el-form>
         </div>
-        <div slot="footer" class="dialog-footer">
+        <div class="text-right sure-btn" style="margin-top:10px">
             <el-button @click="handleClose">{{$t('alarm.cancel')}}</el-button>
             <el-button type="primary"  @click="submitForm('alarmForm')">{{$t('alarm.sure')}}</el-button>
         </div>

diff --git a/src/views/chaincode/dialog/addFile.vue b/src/views/chaincode/dialog/addFile.vue
@@ -33,7 +33,7 @@
                     </el-form-item>
                 </el-form>
             </div>
-            <div slot="footer" class="dialog-footer">
+            <div class="text-right sure-btn" style="margin-top:10px">
                 <el-button @click="modelClose">{{this.$t("text.cancel")}}</el-button>
                 <el-button type="primary" @click="submit('fileFrom')">{{this.$t("text.sure")}}</el-button>
             </div>

diff --git a/src/views/chaincode/dialog/addFolder.vue b/src/views/chaincode/dialog/addFolder.vue
@@ -17,13 +17,13 @@
     <div>
         <el-dialog :title="$t('contracts.createFolder')" :visible.sync="dialogVisible" :before-close="modelClose" class="dialog-wrapper" width="433px" :center="true">
             <div>
-                <el-form :model="folderFrom" :rules="rules" ref="folderFrom" label-width="100px" class="demo-ruleForm">
+                <el-form :model="folderFrom" :rules="rules" ref="folderFrom" label-width="110px" class="demo-ruleForm">
                     <el-form-item :label="$t('contracts.folderName')" prop="folderName" style="width:330px">
                         <el-input v-model="folderFrom.folderName" @keyup.enter.native="handleFolder"></el-input>
                     </el-form-item>
                 </el-form>
             </div>
-            <div slot="footer" class="dialog-footer">
+            <div class="text-right sure-btn" style="margin-top:10px">
                 <el-button @click="modelClose">{{this.$t("text.cancel")}}</el-button>
                 <el-button type="primary" @click="submit('folderFrom')">{{this.$t("text.sure")}}</el-button>
             </div>

diff --git a/src/views/configManagement/components/systemConfig.vue b/src/views/configManagement/components/systemConfig.vue
@@ -1,18 +1,18 @@
 <template>
     <div>
-        <el-form :model="modifyForm" :rules="rules" ref="modifyForm" label-width="146px" class="demo-ruleForm">
-            <el-form-item :label="$t('system.configKey')"  style="width: 320px;">
+        <el-form :model="modifyForm" :rules="rules" ref="modifyForm" label-width="90px" class="demo-ruleForm">
+            <el-form-item :label="$t('system.configKey')">
                 <span>{{configKey}}</span>
             </el-form-item>
-            <el-form-item :label="$t('nodes.admin')" prop="adminRivateKey" style="width: 320px;">
-                <el-select v-model="modifyForm.adminRivateKey" :placeholder="$t('text.select')">
+            <el-form-item :label="$t('nodes.admin')" prop="adminRivateKey">
+                <el-select v-model="modifyForm.adminRivateKey" :placeholder="$t('text.select')" style="width: 245px;">
                     <el-option v-for="item in adminRivateKeyList" :key="item.address" :label="item.userName" :value="item.address">
                         <span>{{item.userName}}</span>
                         <span class="font-12">{{item.address | splitString}}...</span>
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item :label="$t('system.configValue')" prop="configValue" style="width: 320px;">
+            <el-form-item :label="$t('system.configValue')" prop="configValue">
                 <el-input v-model.number="modifyForm.configValue" :placeholder="configKey ==='tx_gas_limit'? $t('system.gasLong') : ''"></el-input>
             </el-form-item>
         </el-form>

diff --git a/src/views/index/dialog/setFront.vue b/src/views/index/dialog/setFront.vue
@@ -29,7 +29,7 @@
                     </el-form-item>
                 </el-form>
             </div>
-            <div slot="footer" class="dialog-footer">
+            <div class="text-right sure-btn" style="margin-top:10px">
                 <el-button v-if='closeVisible' @click="modelClose">{{this.$t("text.cancel")}}</el-button>
                 <el-button type="primary" :loading="loading" @click="submit('frontFrom')">{{this.$t("text.sure")}}</el-button>
             </div>