删除文件

bc621aee · zhuzhequan · edc10d65 · edc10d65 · bc621aee
Commit bc621aee authored Sep 05, 2024 by zhuzhequan
Hide whitespace changes
Inline Side-by-side

Showing with 108 additions and 48 deletions

print/GTXproCMD.zip
+0 -0

src/views/login/index.vue
+108 -48

No files found.
--- a/print/GTXproCMD.zip
+++ b/print/GTXproCMD.zip
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
 <script>
 export default {
  data() {
    return {
      rules: {
-        company: [{ message: "请选择客户名称", required: true, trigger: "change" }],
+        company: [
-        loginName: [{ message: "请输入用户名", required: true, trigger: "blur" }],
+          { message: "请选择客户名称", required: true, trigger: "change" },
-        password: [{ message: "请输入密码", required: true, trigger: "blur" }]
+        ],
+        loginName: [
+          { message: "请输入用户名", required: true, trigger: "blur" },
+        ],
+        password: [{ message: "请输入密码", required: true, trigger: "blur" }],
      },
      companyList: [],
      userList: [],
@@ -19,8 +22,8 @@ export default {
        loginName: "",
        user: "",
        company: "",
-        password: ""
+        password: "",
-      }
+      },
    };
  },
  created() {
@@ -54,20 +57,29 @@ export default {
    submitAuthority() {
      this.$refs.authorityForm.validate((v) => {
        if (v) {
-          this.$api.post("/commitApply", {
+          this.$api
-            ...this.authorityForm,
+            .post(
-            ...this.form
+              "/commitApply",
-          }, {
+              {
-            headers: {
+                ...this.authorityForm,
-              "company": this.form.company
+                ...this.form,
-            }
+              },
-          }).then((res) => {
+              {
-            if (res.code === 200) {
+                headers: {
-              this.authorityVisible = false;
+                  company: this.form.company,
-              this.$message.success("申请提交成功");
+                },
-              this.$dataStore.set("deviceId" + this.form.loginName, res.data.id);
+              }
-            }
+            )
-          });
+            .then((res) => {
+              if (res.code === 200) {
+                this.authorityVisible = false;
+                this.$message.success("申请提交成功");
+                this.$dataStore.set(
+                  this.form.company.replace('.jomalls.com','_') + "deviceId_" + this.form.loginName,
+                  res.data.id
+                );
+              }
+            });
        }
      });
    },
@@ -75,7 +87,9 @@ export default {
      if (!value || value === "") {
        return callback(new Error("请输入客户（例如demo)"));
      }
-      let item = this.companyList.find(item => item.domain.replace(".jomalls.com", "") === value);
+      let item = this.companyList.find(
+        (item) => item.domain.replace(".jomalls.com", "") === value
+      );
      if (item) {
        return callback();
      } else {
@@ -83,19 +97,20 @@ export default {
      }
    },
    async login() {
      // if (this.form.auth) {
      //   this.$dataStore.set(this.form.auth.split(",")[0], this.form.auth.split(",")[1]);
      //   console.log("存储成功");
      //   console.log(this.$dataStore.store);
      //
      // }
-      this.$refs.formRef.validate(async valid => {
+      this.$refs.formRef.validate(async (valid) => {
        if (valid) {
          let f = JSON.parse(JSON.stringify(this.form));
          if (!f.deviceId) {
-            f.deviceId = this.$dataStore.get("deviceId" + this.form.loginName);
+            f.deviceId = this.$dataStore.get(
+              f.company.replace('.jomalls.com','_') + "deviceId_" + this.form.loginName
+            );
          }
          if (!f.deviceId) delete f.deviceId;
@@ -108,20 +123,28 @@ export default {
          data = {
            ...data.sysUser,
            ...{
-              token: data.token
+              token: data.token,
-            }
+            },
          };
          delete data.sysMenus;
          delete data.sysUser;
-          let item = this.companyList.find(item => item.domain === f.company);
+          let item = this.companyList.find((item) => item.domain === f.company);
          console.log(item, 111222);
          this.$dataStore.set("user", data);
          this.$dataStore.set("company", item);
          if (this.remember) {
            let userList = this.$dataStore.get("userList");
-            if (userList && !userList.find(el => el.loginName === f.loginName && el.company === f.company)) {
-              userList.push(f);
+            if (userList) {
+              if (
+                !userList.find(
+                  (el) =>
+                    el.loginName === f.loginName && el.company === f.company
+                )
+              ) {
+                userList.push(f);
+              }
            } else {
              userList = [f];
            }
@@ -131,8 +154,6 @@ export default {
          await this.$router.push("/design");
        }
      });
    },
    userChange(v) {
      if (v === "") {
@@ -148,8 +169,8 @@ export default {
    async getCompanyList() {
      let { data } = await this.$api.get("/getCompanyList");
      this.companyList = data.records;
-    }
+    },
-  }
+  },
 };
 </script>
@@ -157,14 +178,24 @@ export default {
  <div class="login">
    <div class="form-content">
      <el-form v-if="" ref="formRef" :rules="rules" size="small" :model="form">
-        <el-form-item v-if="userList.length>0">
+        <el-form-item v-if="userList.length > 0">
-          <el-select @change="userChange" filterable style="width: 100%;" placeholder="登录记录" v-model="form.user"
+          <el-select
-                     clearable>
+            @change="userChange"
+            filterable
+            style="width: 100%"
+            placeholder="登录记录"
+            v-model="form.user"
+            clearable
+          >
            <template slot="prefix">
              <i class="el-icon-monitor"></i>
            </template>
-            <el-option v-for="(it,i) in userList" :key="i" :label="`${it.loginName}(${it.company.split('.')[0]})`"
+            <el-option
-                       :value="i"></el-option>
+              v-for="(it, i) in userList"
+              :key="i"
+              :label="`${it.loginName}(${it.company.split('.')[0]})`"
+              :value="i"
+            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item v-if="!company" prop="company">
@@ -175,21 +206,42 @@ export default {
          <!--&lt;!&ndash;                    clearable>&ndash;&gt;-->
          <!--&lt;!&ndash;          </el-input>&ndash;&gt;-->
-          <el-select filterable style="width: 100%;" placeholder="系统" v-model="form.company"
+          <el-select
-                     clearable>
+            filterable
+            style="width: 100%"
+            placeholder="系统"
+            v-model="form.company"
+            clearable
+          >
            <template slot="prefix">
              <i class="el-icon-monitor"></i>
            </template>
-            <el-option v-for="(it,i) in companyList" :key="i" :label="it.companyName" :value="it.domain"></el-option>
+            <el-option
+              v-for="(it, i) in companyList"
+              :key="i"
+              :label="it.companyName"
+              :value="it.domain"
+            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item prop="loginName">
-          <el-input placeholder="用户名" prefix-icon="el-icon-user" v-model="form.loginName" clearable></el-input>
+          <el-input
+            placeholder="用户名"
+            prefix-icon="el-icon-user"
+            v-model="form.loginName"
+            clearable
+          ></el-input>
        </el-form-item>
        <el-form-item prop="password">
-          <el-input placeholder="密码" show-password prefix-icon="el-icon-lock" type="password" v-model="form.password"
+          <el-input
-                    clearable></el-input>
+            placeholder="密码"
+            show-password
+            prefix-icon="el-icon-lock"
+            type="password"
+            v-model="form.password"
+            clearable
+          ></el-input>
        </el-form-item>
        <!--        <el-form-item v-if="len===0" prop="授权信息">-->
        <!--          <el-input placeholder="授权信息" prefix-icon="el-icon-lock" v-model="form.auth"-->
@@ -199,8 +251,14 @@ export default {
          <el-checkbox v-model="remember">记住账号</el-checkbox>
        </div>
        <el-form-item>
-          <div style="display: flex;justify-content: center">
+          <div style="display: flex; justify-content: center">
-            <el-button @keyup.enter.native="login" @click="login" type="primary" style="width: 60%;">登录</el-button>
+            <el-button
+              @keyup.enter.native="login"
+              @click="login"
+              type="primary"
+              style="width: 60%"
+              >登录</el-button
+            >
          </div>
        </el-form-item>
      </el-form>
@@ -210,12 +268,14 @@ export default {
      title="权限申请"
      :visible.sync="authorityVisible"
      top="15%"
-      width="400px">
+      width="400px"
+    >
      <el-form
        :model="authorityForm"
        size="mini"
        ref="authorityForm"
-        label-width="80px">
+        label-width="80px"
+      >
        <el-form-item label="设备名称" prop="deviceName" required>
          <el-input v-model="authorityForm.deviceName"></el-input>
        </el-form-item>