Merge pull request #222 from gongdaxia/dev

Modify the prompt to get docker
WeBankBlockchain · Aug 10, 2020 · 119b772 · 119b772
2 parents baca040 + 4a435bc
commit 119b772
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 15 deletions.
diff --git a/dist/index.html b/dist/index.html
@@ -11,7 +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.7c2337c9e61a874657b8.js></script><script type=text/javascript src=./static/js/3.8e4c7d4ece39b61945db.js></script><script type=text/javascript src=./static/js/runtime.46b21c84d1bfd61febfd.js></script><script type=text/javascript src=./static/js/5.f6e4449a803f4b016ead.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.11afb885ba33f78a8d4c.js></script><script type=text/javascript src=./static/js/3.579ce1b599972b64296a.js></script><script type=text/javascript src=./static/js/runtime.46b21c84d1bfd61febfd.js></script><script type=text/javascript src=./static/js/5.f6e4449a803f4b016ead.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.7c2337c9e61a874657b8.js → dist/static/js/0.11afb885ba33f78a8d4c.js b/dist/static/js/0.7c2337c9e61a874657b8.js → dist/static/js/0.11afb885ba33f78a8d4c.js
diff --git a/dist/static/js/3.579ce1b599972b64296a.js b/dist/static/js/3.579ce1b599972b64296a.js
diff --git a/dist/static/js/3.8e4c7d4ece39b61945db.js b/dist/static/js/3.8e4c7d4ece39b61945db.js
diff --git a/src/lang/en.js b/src/lang/en.js
@@ -121,7 +121,8 @@ export default {
         imageMode: "Docker Image pull mode",
         manual: "Manual (recommended)",
         automatic: "Automatic",
-        imageModeInfo: "Automatic pull: The deployment script automatically pulls the image from docker's official website without additional operation. Due to network reasons, the image may fail to pull, leading to deployment failure;Manual deployment: After obtaining the docker image compression package manually, upload it to the host that needs to be deployed, and then manually extract the image JAR file. This deployment mode is recommended.",
+        imageModeInfo1: "Automatic: pull the image from docker's official website to the host.",
+        imageModeInfo2: "Manual: Manually upload docker image compression package to the host.",
         hostListInfo: "Operating system requirements: CentOS 7.2 / Ubuntu 16.04 / Debian 9;Configuration requirements: 2 core 4G, 500G hard disk;SSH free login needs to be configured",
         chainName: "Chain Name",
         chainVersion: "Chain Version",

diff --git a/src/lang/zh.js b/src/lang/zh.js
@@ -121,7 +121,8 @@ export default {
         imageMode: "Docker拉取方式",
         manual: "手动 (推荐)",
         automatic: "自动",
-        imageModeInfo: "自动拉取：部署脚本自动从docker官网拉取镜像，不需要额外操作，由于网络原因，镜像可能会拉取失败，导致部署失败；手动部署：手动获取docker镜像压缩包后，上传到需要部署的主机，再手动解压镜像jar文件，推荐使用这种部署方式。",
+        imageModeInfo1: "自动拉取：从docker官网拉取镜像到主机。",
+        imageModeInfo2: "手动部署：手动上传docker镜像压缩包到主机。",
         hostListInfo: "操作系统要求：CentOS 7.2 / Ubuntu 16.04 / Debian 9;配置要求：单机2核4G，500G硬盘；需要配置ssh免密登录",
         chainName: "链名称",
         chainVersion: "链版本",

diff --git a/src/views/front/dialog/newNode.vue b/src/views/front/dialog/newNode.vue
@@ -17,11 +17,8 @@
                         <el-input v-model="nodeFrom.agencyName" :placeholder="$t('nodes.inputAgency')" style="width: 250px;" maxlength="16"></el-input>
                     </el-form-item>
                     <el-form-item :label="$t('text.imageMode')" prop='dockerImageType'>
-                        <el-radio v-model="nodeFrom.dockerImageType" :label="0">{{$t("text.manual")}}</el-radio>
-                        <el-radio v-model="nodeFrom.dockerImageType" :label="1">{{$t("text.automatic")}}</el-radio>
-                        <el-tooltip class="item" effect="dark" placement="top-start">
-                            <div slot="content" style="width: 600px;">{{$t('text.imageModeInfo')}}</div>
-                            <i class="el-icon-info"></i></el-tooltip>
+                        <el-radio v-model="nodeFrom.dockerImageType" :label="0">{{$t("text.manual")}}<el-tooltip class="item" effect="dark" :content="$t('text.imageModeInfo2')" placement="top-start"><i class="el-icon-info" style="display: inline-block;padding-left: 10px;"></i></el-tooltip></el-radio>
+                        <el-radio v-model="nodeFrom.dockerImageType" :label="1">{{$t("text.automatic")}}<el-tooltip class="item" effect="dark" :content="$t('text.imageModeInfo1')" placement="top-start"><i class="el-icon-info" style="display: inline-block;padding-left: 10px;"></i></el-tooltip></el-radio>
                     </el-form-item>
                     <!-- <el-form-item :label='$t("nodes.nodeCount")'>
                         <el-input v-model="nodeFrom.num" :placeholder="$t('nodes.inputNodes')" style="width: 250px;" maxlength="16"></el-input>

diff --git a/src/views/index/dialog/setConfig.vue b/src/views/index/dialog/setConfig.vue
@@ -40,13 +40,13 @@
                             <!-- <el-button type="primary"  style="margin-left: 20px;" @click='refresh'>{{$t('nodes.newVersion')}}</el-button> -->
                     </el-form-item>
                         <div class="config-item-tile">{{$t('text.imageMode')}} 
-                            <el-tooltip class="item" effect="dark" :content="$t('text.imageModeInfo')" placement="top-start"><i class="el-icon-info"></i></el-tooltip>
+
                             </div>
-                        <el-radio v-model="configFrom.dockerImageType" :label="0">{{$t("text.manual")}}</el-radio>
-                        <el-radio v-model="configFrom.dockerImageType" :label="1">{{$t("text.automatic")}}</el-radio>
+                        <el-radio v-model="configFrom.dockerImageType" :label="0">{{$t("text.manual")}}<el-tooltip class="item" effect="dark" :content="$t('text.imageModeInfo2')" placement="top-start"><i class="el-icon-info" style="display: inline-block;padding-left: 10px;"></i></el-tooltip></el-radio>
+                        <el-radio v-model="configFrom.dockerImageType" :label="1">{{$t("text.automatic")}}<el-tooltip class="item" effect="dark" :content="$t('text.imageModeInfo1')" placement="top-start"><i class="el-icon-info" style="display: inline-block;padding-left: 10px;"></i></el-tooltip></el-radio>
                       <hr style="margin: 15px 0;">
                     <div class="config-item-tile">{{$t('text.ip')}}
-                        <el-tooltip class="item" effect="dark" :content="$t('text.hostLihostIpstInfo')" placement="top-start"><i class="el-icon-info"></i></el-tooltip>
+                        <el-tooltip class="item" effect="dark" :content="$t('text.hostListInfo')" placement="top-start"><i class="el-icon-info"></i></el-tooltip>
                         <span style="dispaly: inline-block;padding-left: 125px;">{{$t("text.org")}}</span>
                     </div>
                     <div v-for="(item,index) in configFrom.data" :key="item.key">