|
|
@@ -20,21 +20,14 @@
|
|
|
>
|
|
|
<el-col
|
|
|
:span="24"
|
|
|
- style="
|
|
|
- padding-left: 0px;
|
|
|
- padding-right: 0px;
|
|
|
- border-radius: 12px;
|
|
|
- "
|
|
|
+ style="padding-left: 0px; padding-right: 0px; border-radius: 12px"
|
|
|
>
|
|
|
</el-col>
|
|
|
<el-col :span="24" style="margin-top: 30px">
|
|
|
<el-row :span="24">
|
|
|
<el-col :span="4"> </el-col>
|
|
|
<el-col :span="16">
|
|
|
- <div
|
|
|
- class="padding-logo center-logo"
|
|
|
- style="margin-top: 30px"
|
|
|
- >
|
|
|
+ <div class="padding-logo center-logo" style="margin-top: 30px">
|
|
|
<el-select
|
|
|
:popper-append-to-body="false"
|
|
|
class="login_select"
|
|
|
@@ -75,10 +68,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="4"> </el-col>
|
|
|
</el-row>
|
|
|
- <el-row
|
|
|
- :span="24"
|
|
|
- style="margin-top: 5px; margin-bottom: 10px"
|
|
|
- >
|
|
|
+ <el-row :span="24" style="margin-top: 5px; margin-bottom: 10px">
|
|
|
<el-col :span="4"> </el-col>
|
|
|
<el-col :span="16" v-show="userType === '1'">
|
|
|
<div @click="registerFlag = false">
|
|
|
@@ -135,19 +125,13 @@
|
|
|
<div class="registerVertical">
|
|
|
<div class="registerTitle">昵称</div>
|
|
|
<el-form-item label="" class="registerInput" prop="name">
|
|
|
- <el-input
|
|
|
- v-model="ruleForm.name"
|
|
|
- placeholder="请输入昵称"
|
|
|
- ></el-input>
|
|
|
+ <el-input v-model="ruleForm.name" placeholder="请输入昵称"></el-input>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div class="registerVertical">
|
|
|
<div class="registerTitle">编号</div>
|
|
|
<el-form-item label="" class="registerInput" prop="num">
|
|
|
- <el-input
|
|
|
- v-model="ruleForm.num"
|
|
|
- placeholder="请输入编号"
|
|
|
- ></el-input>
|
|
|
+ <el-input v-model="ruleForm.num" placeholder="请输入编号"></el-input>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -155,19 +139,13 @@
|
|
|
<div class="registerVertical">
|
|
|
<div class="registerTitle">年龄</div>
|
|
|
<el-form-item label="" class="registerInput" prop="age">
|
|
|
- <el-input
|
|
|
- v-model="ruleForm.age"
|
|
|
- placeholder="请输入年龄"
|
|
|
- ></el-input>
|
|
|
+ <el-input v-model="ruleForm.age" placeholder="请输入年龄"></el-input>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div class="registerVertical">
|
|
|
<div class="registerTitle">单位</div>
|
|
|
<el-form-item label="" class="registerInput" prop="unit">
|
|
|
- <el-input
|
|
|
- v-model="ruleForm.unit"
|
|
|
- placeholder="请输入单位"
|
|
|
- ></el-input>
|
|
|
+ <el-input v-model="ruleForm.unit" placeholder="请输入单位"></el-input>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -175,11 +153,7 @@
|
|
|
<div class="registerVertical">
|
|
|
<div class="registerTitle">性别</div>
|
|
|
<el-form-item label="" class="registerInput" prop="sex">
|
|
|
- <el-select
|
|
|
- style="width: 100%"
|
|
|
- v-model="ruleForm.sex"
|
|
|
- placeholder="请选择"
|
|
|
- >
|
|
|
+ <el-select style="width: 100%" v-model="ruleForm.sex" placeholder="请选择">
|
|
|
<el-option label="女" value="0"></el-option>
|
|
|
<el-option label="男" value="1"></el-option>
|
|
|
</el-select>
|
|
|
@@ -232,12 +206,8 @@
|
|
|
</div>
|
|
|
<div class="registerContent">
|
|
|
<div class="registerRow">
|
|
|
- <el-button class="registerLoginCancle" @click="handleClose"
|
|
|
- >取 消</el-button
|
|
|
- >
|
|
|
- <el-button
|
|
|
- class="registerLoginCancle"
|
|
|
- @click="resetForm('ruleForm')"
|
|
|
+ <el-button class="registerLoginCancle" @click="handleClose">取 消</el-button>
|
|
|
+ <el-button class="registerLoginCancle" @click="resetForm('ruleForm')"
|
|
|
>重 置</el-button
|
|
|
>
|
|
|
</div>
|
|
|
@@ -299,18 +269,12 @@
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="密码" prop="userPassword">
|
|
|
- <el-input
|
|
|
- v-model="ruleForm.userPassword"
|
|
|
- type="password"
|
|
|
- ></el-input>
|
|
|
+ <el-input v-model="ruleForm.userPassword" type="password"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="确认密码" prop="userRePassword">
|
|
|
- <el-input
|
|
|
- v-model="ruleForm.userRePassword"
|
|
|
- type="password"
|
|
|
- ></el-input>
|
|
|
+ <el-input v-model="ruleForm.userRePassword" type="password"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="12" class="login_back_group1">
|
|
|
@@ -332,9 +296,7 @@
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="handleClose">取 消</el-button>
|
|
|
<el-button @click="resetForm('ruleForm')">重 置</el-button>
|
|
|
- <el-button type="primary" @click="submitFormV2('ruleForm')"
|
|
|
- >确 定</el-button
|
|
|
- >
|
|
|
+ <el-button type="primary" @click="submitFormV2('ruleForm')">确 定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
@@ -479,7 +441,7 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
mounted() {
|
|
|
- this.$root.smartNum=0;
|
|
|
+ this.$root.smartNum = 0;
|
|
|
this.$root.topPageFlag = false;
|
|
|
|
|
|
this.dirpath = "C:\\DataPilot";
|
|
|
@@ -735,12 +697,13 @@ IF NOT EXISTS t_user_table (
|
|
|
sessionStorage.setItem("num", account);
|
|
|
sessionStorage.setItem("pass", that.$md5(password));
|
|
|
sessionStorage.setItem("userType", "1");
|
|
|
- sessionStorage.setItem(
|
|
|
- "isMarried",
|
|
|
- res.data.data.marriageSituation
|
|
|
- );
|
|
|
+ sessionStorage.setItem("isMarried", res.data.data.marriageSituation);
|
|
|
+ // that.$router.push({
|
|
|
+ // path: "/mainTable",
|
|
|
+ // });
|
|
|
that.$router.push({
|
|
|
- path: "/mainTable",
|
|
|
+ path: "/menu/animation",
|
|
|
+ query: { url: "swfk" },
|
|
|
});
|
|
|
}
|
|
|
//当type等于2时跳转到我的测试页面
|
|
|
@@ -751,7 +714,13 @@ IF NOT EXISTS t_user_table (
|
|
|
sessionStorage.setItem("num", that.account);
|
|
|
sessionStorage.setItem("pass", that.$md5(that.password));
|
|
|
sessionStorage.setItem("userType", "2");
|
|
|
- that.$router.push({ path: "/mainTable" });
|
|
|
+ // that.$router.push({ path: "/mainTable" });
|
|
|
+ //menu/manageElectrical
|
|
|
+ that.$router.push({
|
|
|
+ path: "/menu/manageElectrical",
|
|
|
+ query: { url: "yhfk" },
|
|
|
+ });
|
|
|
+ sessionStorage.setItem("defaultUrl", '/menu/manageElectrical');
|
|
|
}
|
|
|
} else {
|
|
|
this.$message.error("访问服务器失败！");
|
|
|
@@ -785,12 +754,15 @@ IF NOT EXISTS t_user_table (
|
|
|
sessionStorage.setItem("num", that.account);
|
|
|
sessionStorage.setItem("pass", that.$md5(that.password));
|
|
|
sessionStorage.setItem("userType", "1");
|
|
|
- sessionStorage.setItem(
|
|
|
- "isMarried",
|
|
|
- res.data.data.marriageSituation
|
|
|
- );
|
|
|
+ sessionStorage.setItem("isMarried", res.data.data.marriageSituation);
|
|
|
+ // that.$router.push({
|
|
|
+ // path: "/mainTable",
|
|
|
+ // });
|
|
|
+ // '/menu/animation', 'swfk'
|
|
|
+ // path: url, query: { url: val } }
|
|
|
that.$router.push({
|
|
|
- path: "/mainTable",
|
|
|
+ path: "/menu/animation",
|
|
|
+ query: { url: "swfk" },
|
|
|
});
|
|
|
}
|
|
|
//当type等于2时跳转到我的测试页面
|
|
|
@@ -801,7 +773,13 @@ IF NOT EXISTS t_user_table (
|
|
|
sessionStorage.setItem("num", that.account);
|
|
|
sessionStorage.setItem("pass", that.$md5(that.password));
|
|
|
sessionStorage.setItem("userType", "2");
|
|
|
- that.$router.push({ path: "/mainTable" });
|
|
|
+ // /menu/manageElectrical', 'yhfk
|
|
|
+ // that.$router.push({ path: "/mainTable" });
|
|
|
+ that.$router.push({
|
|
|
+ path: "/menu/manageElectrical",
|
|
|
+ query: { url: "yhfk" },
|
|
|
+ });
|
|
|
+ sessionStorage.setItem("defaultUrl", '/menu/manageElectrical');
|
|
|
}
|
|
|
} else {
|
|
|
this.$message.error("访问服务器失败！");
|
|
|
@@ -1122,4 +1100,4 @@ IF NOT EXISTS t_user_table (
|
|
|
.registerInput >>> .el-input__inner {
|
|
|
color: #1d55ff;
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
