+
+
+
+
+
+
diff --git a/src/views/bigScreen/largeSreenFooter.vue b/src/views/bigScreen/largeSreenFooter.vue
index 924df6b6..b250dc44 100644
--- a/src/views/bigScreen/largeSreenFooter.vue
+++ b/src/views/bigScreen/largeSreenFooter.vue
@@ -1719,7 +1719,7 @@ height: .075rem;
height: 4.05rem;
position: absolute;
top: 0.1875rem;
- left: 0.625rem;
+ left: 1.23125rem;
}
.column1 {
width: 6.7375rem;
diff --git a/src/views/bigScreen/largeSreenMiddle.vue b/src/views/bigScreen/largeSreenMiddle.vue
index c28b0222..72172341 100644
--- a/src/views/bigScreen/largeSreenMiddle.vue
+++ b/src/views/bigScreen/largeSreenMiddle.vue
@@ -44,7 +44,7 @@
diff --git a/src/views/chaincode/components/contractCatalog.vue b/src/views/chaincode/components/contractCatalog.vue
index 2dcbdac6..147507bb 100644
--- a/src/views/chaincode/components/contractCatalog.vue
+++ b/src/views/chaincode/components/contractCatalog.vue
@@ -14,1317 +14,1510 @@
* limitations under the License.
*/
-
+ {{$t('contracts.bfsTitle')}}
+
+
+
+
+
+
+ {{item.operate}}
+
+
+
+
+
+
+
+
+ {{item.userName}}
+ {{item.address | splitString}}
+
+
+
+
+ {{this.$t('text.implement')}}
+
+
+
+
+ 提示:
+ {{$t('bfs.Tip1')}}
+ {{$t('bfs.Tip2')}}
+ {{$t('bfs.Tip3')}}
+
+
+
+
+ 提示:
+ {{$t('bfs.Tip4')}}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/views/chaincode/contract.vue b/src/views/chaincode/contract.vue
index cbd39cfa..36a6f540 100755
--- a/src/views/chaincode/contract.vue
+++ b/src/views/chaincode/contract.vue
@@ -14,385 +14,492 @@
* limitations under the License.
*/
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/chaincode/dialog/addFile.vue b/src/views/chaincode/dialog/addFile.vue
index 8d6fb4fb..4d2c3278 100644
--- a/src/views/chaincode/dialog/addFile.vue
+++ b/src/views/chaincode/dialog/addFile.vue
@@ -18,7 +18,7 @@
-
+
diff --git a/src/views/chaincode/dialog/changeUser.vue b/src/views/chaincode/dialog/changeUser.vue
index 9cc74a4a..84e573fb 100755
--- a/src/views/chaincode/dialog/changeUser.vue
+++ b/src/views/chaincode/dialog/changeUser.vue
@@ -14,86 +14,110 @@
* limitations under the License.
*/
-
-
-
-
-
+
{{item.userName}}
- {{item.address | splitString}}...
+ {{item.address | splitString}}
diff --git a/src/views/chaincode/dialog/resetDialog.vue b/src/views/chaincode/dialog/resetDialog.vue
new file mode 100644
index 00000000..f85b35a3
--- /dev/null
+++ b/src/views/chaincode/dialog/resetDialog.vue
@@ -0,0 +1,452 @@
+
+
{{this.$t("nodes.addAbi")}}
{{$t('title.parseAbi')}}
+ {{$t('title.resetContractUser')}}
+ {{$t('title.checkDeploy')}}
+ {{$t('title.checkMethod')}}
@@ -70,9 +73,11 @@
{{$t('contracts.sendTransaction')}}
{{$t('contracts.updateAbi')}}
{{$t('contracts.deleteAbi')}}
+ {{$t('contracts.setPolicy')}}
+ {{$t('contracts.setAdmin')}}
-
-
+ {{$t('text.cns')}}
+ {{$t('title.checkEvent')}}
@@ -82,9 +87,9 @@
-
-
@@ -100,6 +105,21 @@
+
+
+
+
+
+
+
+
+
+
@@ -109,14 +129,20 @@
import sendTransation from "@/components/sendTransaction";
import editor from "@/components/editor"
import abiDialog from "./dialog/abiDialog"
+import resetDialog from "./dialog/resetDialog.vue"
+import checkDeploy from "./dialog/checkDeploy.vue"
+import checkMethod from "./dialog/checkMethod.vue"
+import setPolicy from "./dialog/setPolicy.vue"
+import setAdmin from "./dialog/setAdmin.vue"
import freezeThaw from "./dialog/freezeThaw"
import checkEventDialog from "./dialog/checkEventDialog"
import checkEventResult from "./dialog/checkEventResult"
import mgmtCns from "./dialog/mgmtCns"
-import { getContractList, getAllContractStatus, deleteHandleHistory, getAllAbiList, deleteImportAbi, deleteCode } from "@/util/api"
+import {getFronts, getContractList, getAllContractStatus, deleteHandleHistory, getAllAbiList, deleteImportAbi, deleteCode,checkIsWasm } from "@/util/api"
import importAbi from "../abiList/components/importAbi"
import updateAbi from "../abiList/components/updateAbi"
import router from '@/router'
+import Bus from "@/bus";
export default {
name: "registeredContract",
components: {
@@ -128,7 +154,12 @@ export default {
checkEventResult,
mgmtCns,
importAbi,
- updateAbi
+ updateAbi,
+ resetDialog,
+ checkDeploy,
+ checkMethod,
+ setPolicy,
+ setAdmin
},
data: function () {
return {
@@ -207,7 +238,15 @@ export default {
mgmtCnsItem: {},
importVisibility: false,
updateVisibility: false,
- updateItem: null
+ resetVisibility: false,
+ checkVisibility:false,
+ checkMethodVisibility:false,
+ setPolicyVisibility:false,
+ setAdminVisibility:false,
+ checkMethodVisibility:false,
+ updateItem: null,
+ setPolicyItem:null,
+ liquidCheck: false,
}
},
created() {
@@ -222,10 +261,62 @@ export default {
this.disabled = true
}
if (localStorage.getItem("groupId")) {
- this.getContracts()
+ this.getfrontList()
+ this.getContracts()
+
}
+ Bus.$on("changGroup", (data) => {
+ this.getfrontList()
+ this.getContracts()
+ });
},
methods: {
+ getfrontList() {
+ let reqData = {
+ frontId: this.frontId,
+ };
+ getFronts(reqData)
+ .then((res) => {
+ if (res.data.code === 0) {
+ this.frontList = res.data.data || [];
+ this.frontId = this.frontList[0].frontId;
+ this.loading = false;
+ this.liquidCheckMethod();
+ } else {
+ this.loading = false;
+ this.$message({
+ message: this.$chooseLang(res.data.code),
+ type: "error",
+ duration: 2000,
+ });
+ }
+ })
+ .catch((err) => {
+ this.loading = false;
+ this.$message({
+ message: err.data || this.$t("text.systemError"),
+ type: "error",
+ duration: 2000,
+ });
+ });
+ },
+ liquidCheckMethod() {
+ let groupId = localStorage.getItem("groupId");
+ checkIsWasm(this.frontId,groupId)
+ .then((res) => {
+ if (res.data.data == true) {
+ this.liquidCheck = false;
+ } else{
+ this.liquidCheck = true;
+ }
+ })
+ .catch((err) => {
+ this.$message({
+ type: "error",
+ message: err.data || this.$t("text.systemError"),
+ });
+ });
+ },
formatterPath: function(row) {
let str = row ? row : "-"
return str
@@ -412,6 +503,14 @@ export default {
this.updateItem = val;
this.updateVisibility = true;
},
+ setPolicy(val){
+ this.setPolicyItem=val;
+ this.setPolicyVisibility=true
+ },
+ setAdmin(val){
+ this.setPolicyItem=val;
+ this.setAdminVisibility=true
+ },
updateSuccess() {
this.updateVisibility = false;
this.getContracts()
@@ -419,6 +518,45 @@ export default {
routeAbi() {
this.$router.push("/parseAbi")
},
+ resetSuccess(){
+ this.resetVisibility=false
+ },
+ checkSuccess(){
+ this.checkVisibility=false
+ },
+ setPolicySuccess(){
+ this.setPolicyVisibility=false
+ },
+ setAdminSuccess(){
+ this.setAdminVisibility=false
+ },
+ checkMethodSuccess(){
+ this.checkMethodVisibility=false
+ },
+ closeCheckMethod(){
+ this.checkMethodVisibility=false
+ },
+ closeCheck(){
+ this.checkVisibility=false
+ },
+ closeSetPolicy(){
+ this.setPolicyVisibility=false
+ },
+ closeSetAdmin(){
+ this.setAdminVisibility=false
+ },
+ closeReset(){
+ this.resetVisibility=false
+ },
+ resetContractUser(){
+ this.resetVisibility=true
+ },
+ checkDeploy(){
+ this.checkVisibility=true
+ },
+ checkMethod(){
+ this.checkMethodVisibility=true
+ },
deleteAbi(val) {
this.$confirm(this.$t('text.confirmDelete'))
.then(_ => {
@@ -548,7 +686,10 @@ export default {
this.abiData = null
},
search: function () {
- if (this.contractData && this.contractData.length && this.contractData.length < 20) {
+ if (this.contractData && this.contractData.length && this.contractData.substring(0,1)=='/') {
+ this.contractAddress = this.contractData;
+ this.contractName = ""
+ } else if (this.contractData && this.contractData.length && this.contractData.length < 20) {
this.contractName = this.contractData;
this.contractAddress = ""
} else if (this.contractData && this.contractData.length && (this.contractData.length > 20 || this.contractData.length == 20)) {
diff --git a/src/views/chaincode/totalContract.vue b/src/views/chaincode/totalContract.vue
index 850378ca..4abd3993 100644
--- a/src/views/chaincode/totalContract.vue
+++ b/src/views/chaincode/totalContract.vue
@@ -60,7 +60,7 @@
-
@@ -77,7 +77,7 @@
diff --git a/src/views/committeeMgmt/components/bindKey.vue b/src/views/committeeMgmt/components/bindKey.vue
new file mode 100644
index 00000000..e6df314f
--- /dev/null
+++ b/src/views/committeeMgmt/components/bindKey.vue
@@ -0,0 +1,349 @@
+
+
| {{this.$t('contracts.user')}}： | -
- |
- - - {{this.$t("privateKey.addUser")}} - - | -
| {{this.$t('contracts.params')}}： | -
-
-
- |
- |
| - |
- {{this.$t('contracts.paramsInfo')}} - |
-
- {{this.$t("text.cancel")}}
- {{this.$t("text.sure")}}
-
-
-
+
+
+
+
+
diff --git a/src/views/chaincode/dialog/checkDeploy.vue b/src/views/chaincode/dialog/checkDeploy.vue
new file mode 100644
index 00000000..90240f41
--- /dev/null
+++ b/src/views/chaincode/dialog/checkDeploy.vue
@@ -0,0 +1,420 @@
+
+ | {{$t('contracts.user')}}： | +
+ |
+ + + {{$t("privateKey.addUser")}} + + | +
| CNS： | +
+ |
+ |
| + |
+ |
+ |
| + |
+ |
+ |
| {{$t('contracts.contractAddress')}}： | +
+ |
+ |
| + | {{$t('dialog.liquidTip')}} | +|
| + | {{$t('dialog.liquidTip1')}} | +|
| {{this.$t('contracts.params')}}： | +
+
+
+ |
+ |
| + |
+ {{this.$t('contracts.paramsInfo')}} + |
+
+ {{this.$t("text.cancel")}}
+ {{this.$t("text.sure")}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chaincode/dialog/checkMethod.vue b/src/views/chaincode/dialog/checkMethod.vue
new file mode 100644
index 00000000..1b1ef3d0
--- /dev/null
+++ b/src/views/chaincode/dialog/checkMethod.vue
@@ -0,0 +1,669 @@
+
+ {{item.userName}} / {{ item.address | splitString}}
+
+
+ {{this.$t('text.cancel')}}
+ {{this.$t('text.sure')}}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chaincode/dialog/freezeThaw.vue b/src/views/chaincode/dialog/freezeThaw.vue
index 62edca09..5b114812 100644
--- a/src/views/chaincode/dialog/freezeThaw.vue
+++ b/src/views/chaincode/dialog/freezeThaw.vue
@@ -5,7 +5,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.contractName}} / {{ item.contractAddress | splitString}}
+
+
+
+ {{item.name}}:
+ {{item.userName}} / {{ item.address | splitString}}
+
+
+ {{$t('text.search')}}
+
+
+
+
+
+
+
+
+ {{scope.row.log.blockNumber}}
+
+
+
+
+
+ {{$t('text.noData')}}
+
+
+
+
+
+
+ {{item.userName}}
+ {{item.governorAddress| splitString}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chaincode/dialog/setAdmin.vue b/src/views/chaincode/dialog/setAdmin.vue
new file mode 100644
index 00000000..e8d48613
--- /dev/null
+++ b/src/views/chaincode/dialog/setAdmin.vue
@@ -0,0 +1,524 @@
+
+ {{item.userName}} / {{ item.address | splitString}}
+
+ {{$t('govCommittee.resetTips')}}
+
+ {{this.$t('text.cancel')}}
+ {{this.$t('text.sure')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{this.$t('contracts.openAdmin')}}
+ {{this.$t('contracts.closeAdmin')}}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chaincode/dialog/setPolicy.vue b/src/views/chaincode/dialog/setPolicy.vue
new file mode 100644
index 00000000..fd20a57a
--- /dev/null
+++ b/src/views/chaincode/dialog/setPolicy.vue
@@ -0,0 +1,541 @@
+
+ {{item.userName}} / {{ item.address | splitString}}...
+
+ {{$t('govCommittee.setAdmin')}}
+
+ {{this.$t('text.cancel')}}
+ {{this.$t('text.sure')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{this.$t('contracts.WhiteList')}}
+ {{this.$t('contracts.blackList')}}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/chaincode/oldContract.vue b/src/views/chaincode/oldContract.vue
index ac33c7e9..21b4783c 100644
--- a/src/views/chaincode/oldContract.vue
+++ b/src/views/chaincode/oldContract.vue
@@ -20,6 +20,9 @@
{{$t('govCommittee.setPolicy')}}
+
+ {{this.$t('text.cancel')}}
+ {{this.$t('text.sure')}}
+
+
+
+
+
+ {{item.enName}}
+
+
+
+
+
+
+
+
+ {{$t('text.hexType')}}
+ {{$t('text.decimalType')}}
+
+
+
+
+
+
+
+
+ {{this.$t('privateKey.importFile')}}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/committeeMgmt/components/creatUser.vue b/src/views/committeeMgmt/components/creatUser.vue
new file mode 100644
index 00000000..a2c51f35
--- /dev/null
+++ b/src/views/committeeMgmt/components/creatUser.vue
@@ -0,0 +1,276 @@
+/*
+ * Copyright 2014-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/committeeMgmt/components/exportKey.vue b/src/views/committeeMgmt/components/exportKey.vue
new file mode 100644
index 00000000..bf8b70a7
--- /dev/null
+++ b/src/views/committeeMgmt/components/exportKey.vue
@@ -0,0 +1,309 @@
+
+
+
+ {{this.$t("privateKey.privateKeyUser")}}
+ {{this.$t('privateKey.publicKeyUser')}}
+
+
+
+
+
+
+
+ {{item.enName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/committeeMgmt/components/importKey.vue b/src/views/committeeMgmt/components/importKey.vue
new file mode 100644
index 00000000..6bbd3fc3
--- /dev/null
+++ b/src/views/committeeMgmt/components/importKey.vue
@@ -0,0 +1,364 @@
+
+
+
+
+
+ {{item.enName}}
+
+
+
+
+
+
+
+
+ {{$t('text.hexType')}}
+ {{$t('text.decimalType')}}
+
+
+
+
+
+
+
+
+ {{this.$t('privateKey.importFile')}}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/committeeMgmt/index.vue b/src/views/committeeMgmt/index.vue
index f5a952dc..2e233b84 100644
--- a/src/views/committeeMgmt/index.vue
+++ b/src/views/committeeMgmt/index.vue
@@ -1,929 +1,1228 @@
- {{$t('privateKey.importPrivateKeyAccountTip')}}
+ +
-
-
-
- {{this.$t('govCommittee.addCommittee')}}
- {{this.$t('govCommittee.deleteCommittee')}}
- {{this.$t('govCommittee.modifyWeight')}}
- {{this.$t('govCommittee.modifyThreshold')}}({{currentThreshold}})
-
-
-
-
-
-
-
- {{userName(scope.row['address'])}}
-
-
- {{scope.row[head.enName]}}
-
- {{scope.row[head.enName]}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.userName}}
- {{item.address | splitString}}...
-
-
-
-
-
-
- {{item.userName}}
- {{item.address | splitString}}...
-
-
-
-
- {{this.$t("privateKey.addUser")}}
-
-
-
-
-
- {{item.userName}}
- {{item.address | splitString}}...
-
-
-
-
-
-
-
-
-
-
- {{item.userName}}
- {{item.address | splitString}}...
-
-
-
-
-
-
- {{item.userName}}
- {{item.address | splitString}}...
-
-
-
-
-
-
-
-
-
-
- {{item.userName}}
- {{item.address | splitString}}...
-
-
-
-
-
-
- {{item.userName}}
- {{item.address | splitString}}...
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.userName}}
- {{item.address | splitString}}...
-
-
-
-
-
-
-
-
+
{{$t('govCommittee.dialogTips')}}
-
- {{this.$t('text.cancel')}}
- {{this.$t('text.sure')}}
-
- {{$t('govCommittee.dialogTips')}}
-
- {{this.$t('text.cancel')}}
- {{this.$t('text.sure')}}
-
-
- {{this.$t('text.cancel')}}
- {{this.$t('text.sure')}}
-
-
- {{this.$t('text.cancel')}}
- {{this.$t('text.sure')}}
-
-
+
+
{{item.userName}}
- {{item.address | splitString}}...
+ {{item.address | splitString}}
@@ -16,7 +16,7 @@
-
+
+
+ {{this.$t('govCommittee.addCommittee')}}
+
+ {{this.$t('govCommittee.modifyThreshold')}}
+ {{this.$t('govCommittee.importUserprivateKey')}}
+
+
+
+
+
+
+ {{userName(scope.row['governorAddress'])}}
+ {{weightRate(scope.row['weight'])}}
+
+
+ {{scope.row[head.enName]}}
+
+ {{scope.row[head.enName]}}
+
+
+ {{$t('govCommittee.modifyWeight')}}
+ {{$t('govCommittee.deleteCommittee')}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.userName}}
+ {{item.governorAddress | splitString}}
+
+
+
+
+
+
+ {{item.userName}}
+ {{item.address | splitString}}
+
+
+
+
+ {{this.$t("privateKey.addUser")}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.userName}}
+ {{item.governorAddress | splitString}}
+
+
+
+
+
+
+
+
+
+
+
+ {{item.userName}}
+ {{item.governorAddress | splitString}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.userName}}
+ {{item.governorAddress | splitString}}
+
+
+
+
+
+
+
+
+
+
+ {{$t('govCommittee.dialogTips')}}
+
+ {{this.$t('text.cancel')}}
+ {{this.$t('text.sure')}}
+
+ *{{$t('govCommittee.dialogTips')}}
+
+ {{this.$t('text.cancel')}}
+ {{this.$t('text.sure')}}
+
+
+ {{this.$t('text.cancel')}}
+ {{this.$t('text.sure')}}
+
+
+ {{$t('govCommittee.thresholdNow')}}:{{winRateNow}}
+ {{$t('govCommittee.participatesRateNow')}}:{{participatesRateNow}}
+ {{$t('privateKey.modifyThresholdTip')}}
+
+ {{this.$t('text.cancel')}}
+ {{this.$t('text.sure')}}
+
+
+
+
+
+
+ {{airJudg(scope.row[head.enName])}}
+
+
+ {{(scope.row[head.enName])}}
+
+
+ -
+
+
+
+
+
+ {{scope.row['toAddress']}}
+
+
+ -
+
+
+
+
+ {{scope.row[head.enName] | voteType}}
+
+
+ -
+
+
+
+
+ {{(scope.row['status'])}}
+
+
+ {{(scope.row['status'])}}
+
+
+
+
+ {{voteTimeZh(scope.row['timeLimit'])}}
+
+
+ -
+
+
+
+
+ {{scope.row[head.enName]}}
+
+
+ -
+
+
+
+
+
+ {{$t('govCommittee.Committee')}}
+
+
+ {{$t('govCommittee.revokeVote')}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.userName}}
+ {{item.governorAddress | splitString}}
+
+
+
+
+
+ {{this.$t('govCommittee.agree')}}
+ {{this.$t('govCommittee.refuse')}}
+
+
+
+
+
+
+
+
diff --git a/src/views/configManagement/components/systemConfig.vue b/src/views/configManagement/components/systemConfig.vue
index fe8b692f..70d107fe 100644
--- a/src/views/configManagement/components/systemConfig.vue
+++ b/src/views/configManagement/components/systemConfig.vue
@@ -8,7 +8,7 @@
+ {{this.$t('govCommittee.votingList')}} + +
+
+ {{this.$t('text.cancel')}}
+ {{this.$t('text.sure')}}
-
-
-
-
-
- {{userName(scope.row[head.enName])}}
-
-
- {{userName(scope.row[head.enName])}}
-
-
- -
-
-
-
-
-
- {{scope.row['toAddress']}}
-
-
- -
-
-
-
-
- {{scope.row[head.enName] | voteType}}
-
-
- -
-
-
-
-
- {{changValueZh(scope.row['detail'])}}
-
-
- -
-
-
-
-
- {{voteTimeZh(scope.row['timeLimit'])}}
-
-
- -
-
-
-
-
- {{scope.row[head.enName]}}
-
-
- -
-
-
-
-
- {{$t('govCommittee.delete')}}
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{item.userName}}
+ {{item.governorAddress | splitString}}
+
+
+
+
+
+
+
-
+
+ - {{this.$t('govCommittee.votingList')}} - -
-*{{$t('govCommittee.dialogTips')}}
+
+ {{this.$t('text.cancel')}}
+ {{this.$t('text.sure')}}
-
@@ -115,14 +115,19 @@ export default {
let reqData = {
groupId: localStorage.getItem("groupId"),
configKey: this.configKey,
- configValue: this.modifyForm.configValue,
+ configValue: this.modifyForm.configValue.toString(),
fromAddress: this.modifyForm.adminRivateKey,
+ signUserId:''
}
querySysConfig(reqData)
.then(res => {
this.loading = false;
if (res.data.code === 0) {
this.$emit('modifySuccess')
+ this.$message({
+ type: 'success',
+ message: this.$t('text.updateSuccessMsg')
+ })
} else {
this.$message({
message: this.$chooseLang(res.data.code),
diff --git a/src/views/configManagement/index.vue b/src/views/configManagement/index.vue
index 5dc52a82..743ec5d5 100644
--- a/src/views/configManagement/index.vue
+++ b/src/views/configManagement/index.vue
@@ -140,8 +140,8 @@ export default {
getSysConfigList() {
let reqData = {
groupId: localStorage.getItem("groupId"),
- pageNumber: this.currentPage,
- pageSize: this.pageSize,
+ // pageNumber: this.currentPage,
+ // pageSize: this.pageSize,
}
querySysConfigList(reqData)
.then(res => {
diff --git a/src/views/developerMgmt/components/developerDialog.vue b/src/views/developerMgmt/components/developerDialog.vue
index c425fe8b..0e1b5d5b 100644
--- a/src/views/developerMgmt/components/developerDialog.vue
+++ b/src/views/developerMgmt/components/developerDialog.vue
@@ -5,7 +5,7 @@
{{item.userName}}
- {{item.address | splitString}}...
+ {{item.address | splitString}}
@@ -16,7 +16,7 @@
{{item.userName}}
- {{item.address | splitString}}...
+ {{item.address | splitString}}
diff --git a/src/views/developerMgmt/index.vue b/src/views/developerMgmt/index.vue
index e7e7778c..920c2c3e 100644
--- a/src/views/developerMgmt/index.vue
+++ b/src/views/developerMgmt/index.vue
@@ -13,9 +13,12 @@
{{userName(scope.row['address'])}}
{{scope.row[head.enName]}}
-
- {{$t('devOpsMgmt.deleteDeveloper')}}
-
+
+ {{$t('govCommittee.Committee')}}
+
+
+ {{$t('govCommittee.revokeVote')}}
+
@@ -93,7 +96,7 @@ export default {
this.disabled = true
}
if (localStorage.getItem("groupId")) {
- this.queryOperatorList()
+ //this.queryOperatorList()
this.getUserData()
}
},
diff --git a/src/views/eventCheck/index.vue b/src/views/eventCheck/index.vue
index 4c6da255..bd3d0ba1 100644
--- a/src/views/eventCheck/index.vue
+++ b/src/views/eventCheck/index.vue
@@ -1,572 +1,601 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/views/front/components/hostDetail.vue b/src/views/front/components/hostDetail.vue
index aa301dbb..3c63ee38 100644
--- a/src/views/front/components/hostDetail.vue
+++ b/src/views/front/components/hostDetail.vue
@@ -15,7 +15,7 @@
*/
{{ item.contractAddress }} {{item.contractName}}
-
-
-
-
-
-
-
-
-
- {{item.name}}:
-
- {{$t('text.search')}}
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- {{ item.contractAddress }} {{item.contractName}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}:
+
+ {{$t('text.search')}}
+
+
-
-
-
-
- {{scope.row.log.blockNumber}}
-
-
-
-
-
- {{$t('text.noData')}}
-
-
+
+
+
+
+
+ {{scope.row.log.blockNumber}}
+
+
+
+
+
+ {{$t('text.noData')}}
+
+
-
{{item.userName}}
- {{item.address | splitString}}...
+ {{item.address | splitString}}
diff --git a/src/views/groupManagement/index.vue b/src/views/groupManagement/index.vue
index 65c80d54..3ec6f9aa 100644
--- a/src/views/groupManagement/index.vue
+++ b/src/views/groupManagement/index.vue
@@ -16,13 +16,7 @@
@click="addHadGroup"
>{{ this.$t("nodes.addHadGroup") }} -->
- {{ this.$t('alarm.refresh') }}
+ {{ this.$t('alarm.refresh') }}
@@ -133,7 +133,8 @@ export default {
},
metricData: [],
nodesHealthData: [],
- nodesQuery: ''
+ nodesQuery: '',
+ nodeIp: localStorage.getItem('nodeIp')
};
},
beforeDestroy: function () {
@@ -142,6 +143,10 @@ export default {
},
mounted() {
this.nodesQuery = this.$root.$route.query;
+ if(this.nodesQuery.nodeId){
+ localStorage.setItem('nodeId',this.nodesQuery.nodeId)
+ localStorage.setItem('nodeIp',this.nodesQuery.nodeIp)
+ }
this.getHealthData();
Bus.$on("changeGroup", data => {
this.changGroup(localStorage.getItem('groupId'))
@@ -166,7 +171,7 @@ export default {
this.loading = true;
this.sureing = true;
var reqData = {
- nodeId: this.nodesQuery.nodeId
+ nodeId: localStorage.getItem('nodeId')
},
reqQurey = {};
reqQurey = this.chartParam;
@@ -244,7 +249,7 @@ export default {
this.loading = true;
this.sureing = true;
var reqData = {
- nodeId: this.nodesQuery.nodeId
+ nodeId: localStorage.getItem('nodeId')
},
reqQurey = {};
reqQurey = this.chartParam;
diff --git a/src/views/front/components/modifyNodeType.vue b/src/views/front/components/modifyNodeType.vue
index eb71c524..e92e73b2 100644
--- a/src/views/front/components/modifyNodeType.vue
+++ b/src/views/front/components/modifyNodeType.vue
@@ -5,7 +5,7 @@
{{item.userName}}
- {{item.address | splitString}}...
+ {{item.address | splitString}}
diff --git a/src/views/front/components/remarkNode.vue b/src/views/front/components/remarkNode.vue
new file mode 100644
index 00000000..4cd65773
--- /dev/null
+++ b/src/views/front/components/remarkNode.vue
@@ -0,0 +1,243 @@
+
+ {{$t("text.update")}}
+ {{ $t("text.remarks") }}
@@ -102,6 +110,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/front/newFront.vue b/src/views/front/newFront.vue
index 44493735..3b7478d3 100644
--- a/src/views/front/newFront.vue
+++ b/src/views/front/newFront.vue
@@ -81,6 +81,14 @@
+ {{ this.$t("text.cancel") }}
+ {{ this.$t("text.sure") }}
+
+
@@ -52,20 +46,8 @@
>{{ $t("text.update") }} -->
{{ $t("text.dropGroupData") }}
-
+ {{ $t("system.export") }}
+ {{ $t("text.remarks") }}
@@ -118,6 +100,7 @@ import {
getUpdateGroup,
getGroupsInvalidIncluded,
deleteGroupData,
+ changeDescription,
} from "@/util/api";
const FileSaver = require("file-saver");
export default {
@@ -151,6 +134,10 @@ export default {
modifyGroupId: "",
joinGroupTipsVisibility: false,
descriptionShow: false,
+ nodes: {
+ description: "",
+ groupId: "",
+ },
};
},
@@ -371,6 +358,11 @@ export default {
break;
}
},
+ remarks(val) {
+ this.descriptionShow = true;
+ this.nodes.description = val.description;
+ this.nodes.groupId = val.groupId;
+ },
handleSizeChange(val) {
this.pageSize = val;
this.currentPage = 1;
@@ -397,6 +389,34 @@ export default {
break;
}
},
+ changeDescriptions() {
+ let reqData = {
+ groupId: this.nodes.groupId,
+ description: this.nodes.description,
+ };
+ changeDescription(reqData)
+ .then((res) => {
+ if (res.data.code === 0) {
+ this.$message({
+ type: "success",
+ message: "修改成功",
+ });
+ this.descriptionShow = false;
+ this.queryGroupTable();
+ }
+ })
+ .catch((err) => {
+ this.loading = false;
+ this.$message({
+ type: "error",
+ message: err.data || this.$t("text.systemError"),
+ });
+ this.descriptionShow = false;
+ });
+ },
+ closeThis(){
+ this.descriptionShow = false;
+ },
},
};
@@ -405,4 +425,11 @@ export default {
.search-part-left-btn {
border-radius: 20px;
}
+.descr {
+ width: 50%;
+ margin: 0 auto;
+}
+.btn {
+ margin: 0 auto;
+}
diff --git a/src/views/index/main.vue b/src/views/index/main.vue
index 6f099958..8f36518a 100755
--- a/src/views/index/main.vue
+++ b/src/views/index/main.vue
@@ -163,7 +163,7 @@ export default {
},
mounted() {
this.getEncryption();
- //this.getConfigList();
+ this.getConfigList();
},
methods: {
getConfigList: function () {
diff --git a/src/views/index/sidebar.vue b/src/views/index/sidebar.vue
index 5a5039bd..e42c90cb 100755
--- a/src/views/index/sidebar.vue
+++ b/src/views/index/sidebar.vue
@@ -14,540 +14,648 @@
* limitations under the License.
*/
-
-
{{item.userName}}
- {{item.address | splitString}}...
+ {{item.address | splitString}}
@@ -17,7 +17,7 @@
{{item.userName}}
- {{item.address | splitString}}...
+ {{item.address | splitString}}
diff --git a/src/views/permission/newPermission.vue b/src/views/permission/newPermission.vue
index a4f2f8a7..27234879 100644
--- a/src/views/permission/newPermission.vue
+++ b/src/views/permission/newPermission.vue
@@ -2,19 +2,20 @@
-
-
-
-
-
-
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index a53c89a8..8b9073a2 100755
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -299,7 +299,7 @@ export default {
} else {
this.$message({
message: this.$chooseLang(res.data.code),
- type: "error",
+ // type: "error",
duration: 2000,
});
}
diff --git a/src/views/parseAbi/index.vue b/src/views/parseAbi/index.vue
index b9ac0842..120fd858 100644
--- a/src/views/parseAbi/index.vue
+++ b/src/views/parseAbi/index.vue
@@ -314,8 +314,9 @@ export default {
type: item.type,
name: item.name
})
+ if(item.type=='string'||item.type=='address'){ inputsVal.push(item.argumentValue)}else{
inputsVal.push(dataType(item.type, item.argumentValue))
-
+ }
})
if (!inputs.length) {
this.textarea = '';
@@ -340,6 +341,7 @@ export default {
inputs: inputs
}, inputsVal)
}
+ //console.log(inputsVal)
} catch (error) {
this.textarea = error
}
diff --git a/src/views/permission/components/authorizationRivateKey.vue b/src/views/permission/components/authorizationRivateKey.vue
index 32f53a01..6602b614 100644
--- a/src/views/permission/components/authorizationRivateKey.vue
+++ b/src/views/permission/components/authorizationRivateKey.vue
@@ -6,7 +6,7 @@
- ![]()
-
-
-
-
-
- {{item.name}}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- {{term.name}}
-
-
-
-
- {{item.children[0].name}}
-
-
-
-
-
+
+ {{item.children[0].name}}
+
+
+
+ ![]()
+
+ ({{version}})
+
-
+
+ {{item.name}}
+
+
+
+
+
+
-
+
-
-
+
{{$t('text.hexType')}}
{{$t('text.decimalType')}}
@@ -31,6 +31,7 @@
+
+
@@ -71,7 +72,7 @@ export default {
if (this.activeName == 0) {
if (localStorage.getItem("groupId")) {
this.$refs.committeeMgmt.adminRivateKeyList = [];
- this.$refs.committeeMgmt.queryGetThreshold()
+ // this.$refs.committeeMgmt.queryGetThreshold()
this.$refs.committeeMgmt.getUserData()
this.$refs.committeeMgmt.queryCommitteeList()
this.$refs.committeeMgmt.queryVoteRecordList()
diff --git a/src/views/privateKeyManagement/components/importKey.vue b/src/views/privateKeyManagement/components/importKey.vue
index 047aa357..85ce2aaa 100644
--- a/src/views/privateKeyManagement/components/importKey.vue
+++ b/src/views/privateKeyManagement/components/importKey.vue
@@ -12,7 +12,7 @@
{{$t('privateKey.importPrivateKeyTip')}}