集群改动

heyujie

2022-01-26 7656962ded2a6ccbe3eae75304b3789662d82711

集群改动

 src/pages/desktop/index/components/Desktop.vue

@@ -78,7 +78,7 @@
          </el-form>
        </div>
        <span slot="footer" class="dialog-footer">
          <el-button @click="activeDialog = false">取消</el-button>
          <el-button @click="cancelLogin">取消</el-button>
          <el-button type="primary" @click="loginShop">确定</el-button>
        </span>
      </el-dialog>
@@ -221,8 +221,9 @@
  data() {
    return {
      showFreeVersion: false,
      activeDialog: false,
      countdown: 60,innerDialog: false,
      activeDialog: true,
      countdown: 60,
      innerDialog: false,
      version: "SmartAI试用版",
      codeMsg: "获取验证码",
      versionState: "尚未激活",
@@ -270,24 +271,40 @@
        }
      }
    },
    loginShop(){
      loginShopInSmart({
        phoneNum:this.phone.phoneNum,
        verifyCode
      })
    loginShop() {
      // this.innerDialog = true
      //   this.activeDialog=false
      this.$refs["phoneLogin"].validate((valid) => {
        if (valid) {

          let param = {
            phoneNum: this.phone.phoneNum,
            verifyCode: this.phone.verifyCode,
          };
          loginShopInSmart(param).then((res) => {
            this.innerDialog = true;
            this.activeDialog = false;
          });
        } else {
          this.nullRule = {};
        }
      });
    },
    cancelLogin(){
      this.innerVisible= false
    },
    // 获取验证码
    getCode() {
      // 验证码60秒倒计时
      var pattern = /^1[345789]\d{9}$/;
      if (this.phone.phoneNum == "") {
        this.$refs['phoneLogin'].fields[0].validateMessage = "请输入手机号";
        this.$refs['phoneLogin'].fields[0].validateState = "error";
        this.$refs["phoneLogin"].fields[0].validateMessage = "请输入手机号";
        this.$refs["phoneLogin"].fields[0].validateState = "error";
        return;
      }
      if (!pattern.test(this.phone.phoneNum)) {
        this.$refs['phoneLogin'].fields[0].validateMessage = "手机号码格式有误";
        this.$refs['phoneLogin'].fields[0].validateState = "error";
        this.$refs["phoneLogin"].fields[0].validateMessage = "手机号码格式有误";
        this.$refs["phoneLogin"].fields[0].validateState = "error";
        return;
      }
      if (!this.timer) {
@@ -299,8 +316,8 @@
            this.gotCode = true;
          })
          .catch((err) => {
            this.$refs['phoneLogin'].fields[0].validateMessage = err.data.msg;
            this.$refs['phoneLogin'].fields[0].validateState = "error";
            this.$refs["phoneLogin"].fields[0].validateMessage = err.data.msg;
            this.$refs["phoneLogin"].fields[0].validateState = "error";
          });
      }
    },

 src/pages/settings/views/clusterManagement.vue

@@ -164,7 +164,7 @@
            class="join-form"

            v-loading="joinLoading"

          >

            <el-form-item prop="clusterid">

            <!-- <el-form-item prop="clusterid">

              <div class="p-title">集群ID</div>

              <el-input v-model="joinForm.clusterid" size="small"></el-input>

            </el-form-item>

@@ -177,7 +177,7 @@
                size="small"

                autocomplete="new-password"

              ></el-input>

            </el-form-item>

            </el-form-item> -->

            <el-form-item prop="clusterpwd">

              <div class="p-title">集群密码</div>

              <el-input

@@ -206,6 +206,7 @@
            </el-form-item>

          </el-form>

          <div class="clu-list">

            <!-- :class="pickedNodeI == index ? 'clu-item-active' : ''" -->

            <div

              class="clu-item"

              v-for="(item, index) in members"

@@ -216,9 +217,9 @@
              {{ item.Address }}

            </div>

          </div>

          <div class="btns">

          <!-- <div class="btns">

            <div class="ok" @click="join('joinForm')">加入集群</div>

          </div>

          </div> -->

        </div>

      </div>

    </div>

@@ -245,16 +246,16 @@
export default {

  data() {

    const checkPwd = (rule, value, callback) => {

      if (!value) {

      if (value=="") {

        return callback(new Error("密码不能为空"));

      }

      setTimeout(() => {

      // setTimeout(() => {

        if (value.length != 6) {

          callback(new Error("密码应为6位!"));

        } else {

          callback();

        }

      }, 1000);

      // }, 1000);

    };

    const checkID = (rule, value, callback) => {

      if (!value) {

@@ -302,13 +303,13 @@
        clustername: [

          { required: true, message: "请输入集群名称", trigger: "blur" },

        ],

        clusterpwd: [{ validator: checkPwd, required: true }],

        clusterpwd: [{ validator: checkPwd, required: true,trigger: "blur" }],

        virtualIp: [{ required: true, validator: isIPv4, trigger: "change" }],

      },

      joinExistRules: {

        clusterid: [{ validator: checkID, trigger: "blur" }],

        clusterip: [{ validator: isIPv4, trigger: "blur" }],

        clusterpwd: [{ validator: checkPwd, required: true }],

        clusterpwd: [{ validator: checkPwd, required: true,trigger: "blur" }],

      },

    };

  },

@@ -328,7 +329,55 @@
  },

  methods: {

    pickNode(index) {

      // this.pickedNodeI=index

      this.pickedNodeI = index;

      const node = this.members[index];

      const h = this.$createElement;

      // Address: "192.168.20.189:30190"

      // cluster_id: "5ee1dfa8-e3fb-4d62-8692-388d7632859b"

      // create_time: ""

      // id: "DSVAD010120190703"

      // nodeName: "192.168.20.189:30190"

      // node_id: "DSVAD010120190703"

      // role: "pc"

      this.$msgbox({

        title: "",

        message: h(

          "div",

          {

            style:

              "display: flex;  flex-direction: column; justify-content: center; align-items: center;",

          },

          [

            h("span", { class: "icon iconfont warn-icon" }, "\ue71c"),

            h("span", { class: "warn-title" }, "加入集群"),

            h(

              "span",

              { class: "warn-dec" },

              `您是否要加入 ${node.Address} 吗？`

            ),

          ]

        ),

        showCancelButton: true,

        showClose: true,

        confirmButtonText: "确定",

        cancelButtonText: "取消",

        customClass: "del-account-message-box",

      }).then(() => {

        this.joinLoading = true;

        let data = {

          clusterId: node.cluster_id,

          password: this.joinForm.clusterpwd,

          nodeIps: [node.Address],

        };

        this.joinCluster(data)

          .then(() => {

            this.joinLoading = false;

            this.findCluster();

          })

          .catch((e) => {

            this.joinLoading = false;

          });

      });

    },

    async createCluster(json) {

      let res = await createSerfCluster(json);

@@ -379,10 +428,6 @@
      this.$refs[formName].validate((valid) => {

        if (valid) {

          _this.joinLoading = true;

          // let nodeIps = _this.members.map((i) => {

          //   return i.Address;

          // });

          debugger;

          let data = {

            clusterId: _this.joinForm.clusterid,

            password: _this.joinForm.clusterpwd,

@@ -517,30 +562,33 @@
        cancelButtonText: "取消",

        customClass: "del-account-message-box",

      }).then(

        async () => {

          let res = await leave();

          this.$notify({

            title: res.success ? "成功" : "失败",

            message: res.msg,

            type: res.success ? "success" : "error",

          });

          if (res && res.success) {

            clearInterval(this.intervalTimer);

            this.showCurCluster = false;

            this.ruleForm.virtualIp = "";

            this.ruleForm.clustername = "";

            this.ruleForm.clusterpwd = "";

            this.clusterid = "";

          }

        },

        (err) => {

          clearInterval(this.intervalTimer);

        () => {

          this.showCurCluster = false;

          this.ruleForm.virtualIp = "";

          this.ruleForm.clustername = "";

          this.ruleForm.clusterpwd = "";

          this.clusterid = "";

        }

        // async () => {

        //   let res = await leave();

        //   this.$notify({

        //     title: res.success ? "成功" : "失败",

        //     message: res.msg,

        //     type: res.success ? "success" : "error",

        //   });

        //   if (res && res.success) {

        //     clearInterval(this.intervalTimer);

        //     this.showCurCluster = false;

        //     this.ruleForm.virtualIp = "";

        //     this.ruleForm.clustername = "";

        //     this.ruleForm.clusterpwd = "";

        //     this.clusterid = "";

        //   }

        // },

        // (err) => {

        //   clearInterval(this.intervalTimer);

        //   this.showCurCluster = false;

        //   this.ruleForm.virtualIp = "";

        //   this.ruleForm.clustername = "";

        //   this.ruleForm.clusterpwd = "";

        //   this.clusterid = "";

        // }

      );

    },

    clearInput(typ) {

@@ -806,7 +854,7 @@
      .clu-item {

        border-radius: 8px;

        height: 40px;

        // cursor: pointer;

        cursor: pointer;

        line-height: 40px;

        text-align: left;

        padding: 0 20px;

@@ -815,10 +863,14 @@
          margin-right: 8px;

        }

      }

      // .clu-item:hover {

      //   background: var(--colorCard);

      //   color: #fff;

      // }

      .clu-item:hover {

        background: var(--colorCard);

        color: #fff;

      }

      .clu-item-active {

        background: var(--colorCard);

        color: #fff;

      }

    }

    .el-form-item__content {

      line-height: 48px;


 vue.config.js

@@ -133,6 +133,10 @@
        target: serverUrl2,

        changeOrigin: true, //开启代理,

      },

      "/version": {

        target: serverUrl,

        changeOrigin: true, //开启代理,

      },

    },

  },

  // configureWebpack: {