From d5fe0b27048b64c9904d1f8332422ce718787ba0 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期三, 14 十二月 2022 16:03:20 +0800
Subject: [PATCH] 2022-12-14 肖辉 用户管理模块-新建用户密码校验修改 智能巡查模块-预警研判样式修改
---
src/views/operate/images/index.vue | 4
src/views/intelligentPatrol/studyJudge/index.vue | 415 ++++++++-------
src/components/map/index.vue | 3
src/views/systemSetting/baseSetting/user/components/createUser/index.vue | 1086 +++++++++++++++++++++--------------------
src/views/intelligentPatrol/illegalSearch/index.vue | 4
5 files changed, 775 insertions(+), 737 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 34e89bf..f8668fc 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -10,7 +10,6 @@
};
},
created() {
- debugger;
if (!this.point) {
this.point = { x: "119.27179890", y: "28.59027084" };
}
@@ -51,4 +50,4 @@
width: 100%;
height: 100%;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/intelligentPatrol/illegalSearch/index.vue b/src/views/intelligentPatrol/illegalSearch/index.vue
index 9e7e68c..59fec7b 100644
--- a/src/views/intelligentPatrol/illegalSearch/index.vue
+++ b/src/views/intelligentPatrol/illegalSearch/index.vue
@@ -23,7 +23,7 @@
<!-- 鎸夐挳鍖哄煙 -->
<div class="main-btns">
<div class="main-btns-left">
- <el-button icon="el-icon-download">涓嬭浇鍥剧墖</el-button>
+<!-- <el-button icon="el-icon-download">涓嬭浇鍥剧墖</el-button>-->
<el-button icon="el-icon-folder" @click="exportTableData">瀵煎嚭</el-button>
</div>
<div class="main-btns-right">
@@ -346,4 +346,4 @@
border: none;
background-color: #09152f;
}}}}}}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue
index 70710da..6b983fd 100644
--- a/src/views/intelligentPatrol/studyJudge/index.vue
+++ b/src/views/intelligentPatrol/studyJudge/index.vue
@@ -1,161 +1,202 @@
<template>
<div class="study-judge">
- <div class="study-judge-header">
- <span
- >鎮ㄦ湁<span @click="openDialogTable">{{ countData.review }}</span
- >鏉″緟瀹℃牳鎶ヨ淇℃伅,浠婃棩绔嬫{{ countData.register }}鏉�,鍐嶅涔爗{
- countData.study
- }}鏉�</span
- >
- </div>
+ <!-- <div class="study-judge-header">-->
+ <!-- <span-->
+ <!-- >鎮ㄦ湁{{ countData.review }}鏉″緟瀹℃牳鎶ヨ淇℃伅,浠婃棩绔嬫{{-->
+ <!-- countData.register-->
+ <!-- }}鏉�,鍐嶅涔爗{ countData.study }}鏉�</span-->
+ <!-- >-->
+ <!-- </div>-->
<div class="study-judge-main">
- <div class="sjm-header">
- <div class="sjm-header-left">
- <span class="moni-name">鐩戞帶鐐逛綅鍚嶇О: {{ currentEvent.name }} </span>
- <span class="moni-area">{{ currentEvent.street }}</span>
- <span>{{ currentEvent.address }}</span>
- </div>
- <div class="sjm-header-right">
- <el-button size="small" @click="createVideo(currentEvent, 'live')"
- >瀹炴椂棰勮
- </el-button>
- <el-button size="small" @click="createVideo(currentEvent, 'playback')"
- >褰曞儚鍥炴斁
- </el-button>
- </div>
- </div>
+ <!-- <div class="sjm-header">-->
+ <!-- <div class="sjm-header-left">-->
+ <!-- <span class="moni-name">鐩戞帶鐐逛綅鍚嶇О: {{ currentEvent.name }} </span>-->
+ <!-- <span class="moni-area">{{ currentEvent.street }}</span>-->
+ <!-- <span>{{ currentEvent.address }}</span>-->
+ <!-- </div>-->
+ <!-- <div class="sjm-header-right">-->
+ <!-- <el-button size="small" @click="createVideo(currentEvent, 'live')"-->
+ <!-- >瀹炴椂棰勮</el-button-->
+ <!-- >-->
+ <!-- <el-button size="small" @click="createVideo(currentEvent, 'playback')"-->
+ <!-- >褰曞儚鍥炴斁</el-button-->
+ <!-- >-->
+ <!-- </div>-->
+ <!-- </div>-->
<div class="sjm-content">
<div class="sjm-content-left">
+ <!-- <div class="sjm-header-left">-->
+ <!-- <span class="moni-name">鐩戞帶鐐逛綅鍚嶇О: {{ currentEvent.name }} </span>-->
+ <!-- <span class="moni-area">{{ currentEvent.street }}</span>-->
+ <!-- <span>{{ currentEvent.address }}</span>-->
+ <!-- </div>-->
+ <span
+ >鎮ㄦ湁{{ countData.review }}鏉″緟瀹℃牳鎶ヨ淇℃伅,浠婃棩绔嬫{{
+ countData.register
+ }}鏉�,鍐嶅涔爗{ countData.study }}鏉�</span
+ >
+ <div class="sjm-header-left">
+ <span class="moni-name">鐩戞帶鐐逛綅鍚嶇О: {{ currentEvent.name }} </span>
+ <span class="moni-area">{{ currentEvent.street }}</span>
+ <span>{{ currentEvent.address }}</span>
+ </div>
<div
- class="img-item"
- v-for="(item, index) in imageList"
- :key="item.id"
+ class="img-item"
+ v-for="(item, index) in imageList"
+ :key="item.id"
>
<span>鎶ヨ鍥剧墖</span>
<img :src="item" />
<span v-if="index === 0"
- >鎶ヨ鏃堕棿锛歿{ currentEvent.alarmTime }}</span
+ >鎶ヨ鏃堕棿锛歿{ currentEvent.alarmTime }}</span
>
</div>
<div class="img-item" v-for="item in imageList" :key="item.id">
<img :src="item" />
</div>
- </div>
- <div class="sjm-content-center">
- <div class="map">
- <MyMap :point="point" :zoom="zoom" :mark="mark"></MyMap>
-
- <!-- <iframe
- style="height: 488px; min-width: 460px"
- src="https://183.245.159.161:8282/OneMap/index.html#/OneMap?code=2&clientVersion=&skin=white&locale=zh&otherAuthor=allowable"
- ></iframe> -->
- </div>
- </div>
- <div class="sjm-content-right">
- <div class="card-box">
- <div class="card-header">
- <span>鎶ヨ璁板綍--{{ currentEvent.algoName }}</span>
- </div>
- <el-form
+ <el-form
ref="currentEvent"
label-width="120px"
:model="eventInfoData"
:rules="rules"
+ label-position="left"
+ class="left-form">
+ <el-form-item label="浜嬩欢缂栧彿:">
+ <span>{{ currentEvent.code }}</span>
+ </el-form-item>
+ <el-form-item label="浜嬩欢绛夌骇:">
+ <span>{{ currentEvent.grade }}</span>
+ </el-form-item>
+ <el-form-item label="棣栨鎶ヨ鏃堕棿:">
+ <span>{{ currentEvent.alarmTime }}</span>
+ </el-form-item>
+ <el-form-item label="鏈�杩戞姤璀︽椂闂�:">
+ <span>{{ currentEvent.currentAlarmTime }}</span>
+ </el-form-item>
+ <el-form-item label="鎸佺画鏃堕棿:">
+ <span>{{ currentEvent.conntinueTime }}</span>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="sjm-content-center">
+ <div class="map">
+ <MyMap></MyMap>
+ </div>
+ <!-- <iframe src="https://183.245.159.161:8282/OneMap/index.html#/OneMap?code=2&clientVersion=&skin=white&locale=zh&otherAuthor=allowable"></iframe> -->
+ </div>
+ <div class="sjm-content-right">
+ <div class="card-box">
+ <div class="but-live">
+ <el-button size="small" @click="createVideo(currentEvent, 'live')"
+ >瀹炴椂棰勮</el-button
+ >
+ <el-button size="small" @click="createVideo(currentEvent, 'playback')"
+ >褰曞儚鍥炴斁</el-button
+ >
+ </div>
+ <div class="card-header">
+ <span>鎶ヨ璁板綍--{{ currentEvent.algoName }}</span>
+ </div>
+ <el-form
+ ref="currentEvent"
+ label-width="120px"
+ :model="eventInfoData"
+ :rules="rules"
>
- <el-form-item label="浜嬩欢缂栧彿:">
- <span>{{ currentEvent.code }}</span>
- </el-form-item>
- <el-form-item label="浜嬩欢绛夌骇:">
- <span>{{ currentEvent.grade }}</span>
- </el-form-item>
- <el-form-item label="棣栨鎶ヨ鏃堕棿:">
- <span>{{ currentEvent.alarmTime }}</span>
- </el-form-item>
- <el-form-item label="鏈�杩戞姤璀︽椂闂�:">
- <span>{{ currentEvent.currentAlarmTime }}</span>
- </el-form-item>
- <el-form-item label="鎸佺画鏃堕棿:">
- <span>{{ currentEvent.conntinueTime }}</span>
- </el-form-item>
+ <!-- <el-form-item label="浜嬩欢缂栧彿:">-->
+ <!-- <span>{{ currentEvent.code }}</span>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="浜嬩欢绛夌骇:">-->
+ <!-- <span>{{ currentEvent.grade }}</span>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="棣栨鎶ヨ鏃堕棿:">-->
+ <!-- <span>{{ currentEvent.alarmTime }}</span>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鏈�杩戞姤璀︽椂闂�:">-->
+ <!-- <span>{{ currentEvent.currentAlarmTime }}</span>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鎸佺画鏃堕棿:">-->
+ <!-- <span>{{ currentEvent.conntinueTime }}</span>-->
+ <!-- </el-form-item>-->
<el-form-item label="鍏宠仈搴楅摵" prop="store">
<el-select
- v-model="eventInfoData.store"
- clearable
- @change="selectStoreChange"
- placeholder="璇烽�夋嫨鍏宠仈搴楅摵"
+ v-model="eventInfoData.store"
+ clearable
+ @change="selectStoreChange"
+ placeholder="璇烽�夋嫨鍏宠仈搴楅摵"
>
<el-option
- v-for="store in storeList"
- :value="store.id"
- :label="store.storeName"
- :key="store.id"
+ v-for="store in storeList"
+ :value="store.id"
+ :label="store.storeName"
+ :key="store.id"
/>
</el-select>
</el-form-item>
<el-form-item v-if="eventInfoData.store" label="搴楅摵寰楀垎:">
<span>{{
- selectStoreChange(eventInfoData.store).storeScore
- }}</span>
+ selectStoreChange(eventInfoData.store).storeScore
+ }}</span>
</el-form-item>
<el-form-item label="澶勭悊鎰忚:" prop="state">
<el-radio-group v-model="eventInfoData.state">
<el-radio
- :label="item.id"
- v-for="item in stateList"
- :key="item.id"
- >{{ item.label }}
- </el-radio>
+ :label="item.id"
+ v-for="item in stateList"
+ :key="item.id"
+ >{{ item.label }}</el-radio
+ >
</el-radio-group>
</el-form-item>
<el-form-item label="澶х被鍚嶇О:" prop="categoryId">
<el-select
- v-model="eventInfoData.categoryId"
- placeholder="璇烽�夋嫨澶х被鍚嶇О"
- @change="categoryChange"
+ v-model="eventInfoData.categoryId"
+ placeholder="璇烽�夋嫨澶х被鍚嶇О"
+ @change="categoryChange"
>
<el-option
- v-for="category in categoryOptions"
- :key="category.id"
- :value="category.id"
- :label="category.name"
+ v-for="category in categoryOptions"
+ :key="category.id"
+ :value="category.id"
+ :label="category.name"
/>
</el-select>
</el-form-item>
<el-form-item label="灏忕被鍚嶇О:" prop="typeId">
<el-select
- v-model="eventInfoData.typeId"
- placeholder="璇烽�夋嫨灏忕被鍚嶇О"
+ v-model="eventInfoData.typeId"
+ placeholder="璇烽�夋嫨灏忕被鍚嶇О"
>
<el-option
- v-for="type in typeOptions"
- :key="type.id"
- :value="type.id"
- :label="type.name"
+ v-for="type in typeOptions"
+ :key="type.id"
+ :value="type.id"
+ :label="type.name"
/>
</el-select>
</el-form-item>
<el-form-item label="杞︾墝鍙�:" prop="carNumber">
<el-input
- v-model="eventInfoData.carNumber"
- placeholder="璇峰～鍐欒溅鐗屽彿鐮�"
+ v-model="eventInfoData.carNumber"
+ placeholder="璇峰～鍐欒溅鐗屽彿鐮�"
></el-input>
</el-form-item>
<el-form-item label="澶囨敞:" prop="description">
<el-input
- type="textarea"
- :rows="5"
- v-model="eventInfoData.description"
+ type="textarea"
+ :rows="5"
+ v-model="eventInfoData.description"
></el-input>
</el-form-item>
<el-form-item>
<el-button
- :disabled="currentPage === 1"
- @click="pageChange('prev')"
- >涓婁竴鏉�
- </el-button>
+ :disabled="currentPage === 1"
+ @click="pageChange('prev')"
+ >涓婁竴鏉�</el-button
+ >
<el-button @click.native.prevent="handleConfirm"
- >纭
- </el-button>
+ >纭</el-button
+ >
<el-button @click="pageChange('next')">涓嬩竴鏉�</el-button>
</el-form-item>
</el-form>
@@ -165,25 +206,22 @@
</div>
<el-dialog :visible="isShowDialog" title="璋冨害淇℃伅">
<MyDispatch
- v-if="isShowDialog"
- :mytype="1"
- @getDispatchData="confirmInspection"
- :isGetData="true"
- @changeDialog="closeDialog"
+ v-if="isShowDialog"
+ :mytype="1"
+ @getDispatchData="confirmInspection"
+ :isGetData="true"
+ @changeDialog="closeDialog"
></MyDispatch>
</el-dialog>
<el-dialog
- :visible.sync="dialogCreate"
- title="鏌ョ湅瑙嗛"
- v-show="dialogCreate"
- :before-close="handleClose2"
+ :visible.sync="dialogCreate"
+ title="鏌ョ湅瑙嗛"
+ v-show="dialogCreate"
+ :before-close="handleClose2"
>
<div class="dom" style="width: 100%; height: 600px; position: relative">
<div id="dom1" class="dom1"></div>
</div>
- </el-dialog>
- <el-dialog :visible.sync="isShowTable" title="鎶ヨ淇℃伅" width="1200px">
- <inspection-table />
</el-dialog>
</div>
</template>
@@ -195,43 +233,42 @@
import { FILE_ORIGINAL_URL } from "@/utils";
import { validateCarNum } from "@/utils/validate";
import MyDispatch from "@/components/dispatch";
-import InspectionTable from "@/views/intelligentPatrol/studyJudge/inspectionTable/index.vue";
import MyMap from "@/components/map";
export default {
- components: { MyDispatch, MyMap, InspectionTable },
+ components: { MyDispatch, MyMap },
created() {
this.getInspectionData();
this.initEventParams();
basecase
- .getInspectionCountData()
- .then((res) => {
- this.countData = res;
- })
- .catch((err) => this.$message.error(err));
+ .getInspectionCountData()
+ .then((res) => {
+ this.countData = res;
+ })
+ .catch((err) => this.$message.error(err));
getStoreInfoList({ current: 1, size: 100 })
- .then(({ list }) => {
- this.storeList = list;
- })
- .catch((err) => {
- this.$message.error(err);
- });
+ .then(({ list }) => {
+ this.storeList = list;
+ })
+ .catch((err) => {
+ this.$message.error(err);
+ });
baseInfo
- .getCategoryList()
- .then((res) => {
- this.categoryOptions = res;
- })
- .catch((err) => this.$message.error(err));
+ .getCategoryList()
+ .then((res) => {
+ this.categoryOptions = res;
+ })
+ .catch((err) => this.$message.error(err));
baseInfo
- .getTypeList()
- .then((res) => {
- this.typeList = res;
- })
- .catch((err) => this.$message.error(err));
+ .getTypeList()
+ .then((res) => {
+ this.typeList = res;
+ })
+ .catch((err) => this.$message.error(err));
},
mounted() {
this.timer = setInterval(() => {
@@ -257,7 +294,6 @@
review: 0,
register: 0,
},
- isShowTable: false,
currentEvent: {},
stateList: [
{
@@ -323,15 +359,9 @@
domId: "dom1",
ctrl: "ctrl1",
playType: "live",
- point: null,
- mark: null,
- zoom: null,
};
},
methods: {
- openDialogTable() {
- this.isShowTable = true;
- },
pageChange(type) {
if (type === "next") {
this.currentPage += 1;
@@ -343,38 +373,32 @@
getInspectionData() {
basecase
- .getInspectionData({ current: this.currentPage })
- .then(({ records }) => {
- this.currentEvent = records[0];
- this.point = {
- x: this.currentEvent.longitude,
- y: this.currentEvent.latitude,
- };
- this.zoom = 19;
- this.mark = { title: this.currentEvent.address };
- if (this.currentEvent?.picData) {
- this.imageList = this.currentEvent.picData
- .split(",")
- .map((item) => `${FILE_ORIGINAL_URL}${item}`);
- }
- if (
- this.currentEvent?.alarmTime ||
- this.currentEvent?.currentAlarmTime
- ) {
- const { alarmTime, currentAlarmTime } = this.currentEvent;
- const continueAlarmTime =
- new Date().getTime() -
- (currentAlarmTime
- ? new Date(currentAlarmTime).getTime()
- : new Date(alarmTime).getTime());
- const CONTINUE_DAY = continueAlarmTime / 1000 / 60 / 60 / 24;
- const CONTINUE_HOURS = (CONTINUE_DAY - parseInt(CONTINUE_DAY)) * 24;
- this.currentEvent.conntinueTime = `${parseInt(
- CONTINUE_DAY
- )}澶�${parseInt(CONTINUE_HOURS)}灏忔椂`;
- }
- })
- .catch((err) => this.$message.error(err));
+ .getInspectionData({ current: this.currentPage })
+ .then(({ records }) => {
+ this.currentEvent = records[0];
+ if (this.currentEvent?.picData) {
+ this.imageList = this.currentEvent.picData
+ .split(",")
+ .map((item) => `${FILE_ORIGINAL_URL}${item}`);
+ }
+ if (
+ this.currentEvent?.alarmTime ||
+ this.currentEvent?.currentAlarmTime
+ ) {
+ const { alarmTime, currentAlarmTime } = this.currentEvent;
+ const continueAlarmTime =
+ new Date().getTime() -
+ (currentAlarmTime
+ ? new Date(currentAlarmTime).getTime()
+ : new Date(alarmTime).getTime());
+ const CONTINUE_DAY = continueAlarmTime / 1000 / 60 / 60 / 24;
+ const CONTINUE_HOURS = (CONTINUE_DAY - parseInt(CONTINUE_DAY)) * 24;
+ this.currentEvent.conntinueTime = `${parseInt(
+ CONTINUE_DAY
+ )}澶�${parseInt(CONTINUE_HOURS)}灏忔椂`;
+ }
+ })
+ .catch((err) => this.$message.error(err));
},
// 纭鐐瑰嚮浜嬩欢
@@ -417,13 +441,13 @@
const eventParams = Object.assign({}, this.eventInfoData);
delete eventParams.store;
basecase
- .confirmInspection({ ...eventParams, ...data })
- .then(() => {
- this.$message.success("鎿嶄綔鎴愬姛");
- this.getInspectionData();
- this.initEventParams();
- })
- .catch((err) => this.$message.error(err));
+ .confirmInspection({ ...eventParams, ...data })
+ .then(() => {
+ this.$message.success("鎿嶄綔鎴愬姛");
+ this.getInspectionData();
+ this.initEventParams();
+ })
+ .catch((err) => this.$message.error(err));
},
closeDialog() {
@@ -515,14 +539,14 @@
// });
_this.ws
- .createCtrl(params)
- .then((res) => {
- this.$message.success("鍒涘缓鎴愬姛");
- console.log("res", res);
- })
- .catch((e) => {
- console.log("error;", e);
- });
+ .createCtrl(params)
+ .then((res) => {
+ this.$message.success("鍒涘缓鎴愬姛");
+ console.log("res", res);
+ })
+ .catch((e) => {
+ console.log("error;", e);
+ });
if (ctrlType == "playback") {
const end = new Date();
@@ -625,6 +649,7 @@
margin-left: 4vw;
}
}
+
.sjm-header-right {
flex: 1;
display: flex;
@@ -643,11 +668,12 @@
.sjm-content-left {
line-height: 4.8vh;
-
+ .left-form> ::v-deep.el-form-item__label{
+ font-size: 16px!important;
+ }
.img-item {
display: flex;
flex-direction: column;
-
img {
width: 15vw;
height: 20vh;
@@ -659,11 +685,12 @@
}
}
- .sjm-content-center {
- width: calc(100% - 800px);
- }
.sjm-content-right {
.card-box {
+ .but-live{
+ padding-left: 48px;
+ line-height: 4.8vh;
+ }
.card-header {
padding-left: 48px;
line-height: 4.8vh;
@@ -675,7 +702,7 @@
.el-form {
::v-deep .el-form-item {
- margin-bottom: 15px;
+ margin-bottom: 5px;
}
::v-deep .el-form-item__label {
@@ -689,7 +716,7 @@
}
.map {
- height: 100%;
+ height: 488px;
min-width: 460px;
}
</style>
diff --git a/src/views/operate/images/index.vue b/src/views/operate/images/index.vue
index 00c70e7..cd6a454 100644
--- a/src/views/operate/images/index.vue
+++ b/src/views/operate/images/index.vue
@@ -276,7 +276,7 @@
},
// 鎵ц涓嬫媺妗嗘搷浣�
selectChange(list) {
- debugger
+ // debugger
if (this.tempList.length !== 0) {
this.preMyIdx = list;
this.mulDelete(this.tempList);
@@ -577,4 +577,4 @@
background-color: #09152f;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/systemSetting/baseSetting/user/components/createUser/index.vue b/src/views/systemSetting/baseSetting/user/components/createUser/index.vue
index 70e1bfc..7d1cbe8 100644
--- a/src/views/systemSetting/baseSetting/user/components/createUser/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/createUser/index.vue
@@ -1,559 +1,571 @@
<template>
- <div class="createUser">
- <main>
- <div class="mainContent">
- <el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
- label-position="right">
- <!-- 鐢ㄦ埛鍚嶇О -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="鐢ㄦ埛鍚嶇О:" prop="username">
- <el-input v-model="user.username" placeholder="濉啓鐢ㄦ埛鍚嶇О" autoComplete="new-username">
- </el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 鐢ㄦ埛瀵嗙爜 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItems" label="鐢ㄦ埛瀵嗙爜:" prop="password">
- <el-input v-model="user.password" type="password" autoComplete="new-password"
- placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�"></el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- <!-- 閲嶆柊杈撳叆瀵嗙爜鍗充负淇敼锛屽瘑鐮佹湁鏁堟湡榛樿涓�3涓湀 -->
- </div>
- <!-- 鎵�灞炵敤鎴峰鍚� -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="鎵�灞炵敤鎴峰鍚�:" prop="nickName">
- <el-input v-model="user.nickName" placeholder="璇峰～鍐欑敤鎴峰鍚�"></el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 鎬у埆 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="鎬у埆:" prop="sex">
- <el-radio-group v-model="user.sex">
- <el-radio :label="1">鐢�</el-radio>
- <el-radio :label="0">濂�</el-radio>
- </el-radio-group>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 鏄惁鍏氬憳 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="鏄惁鍏氬憳:" prop="isDy">
- <el-radio-group v-model="user.isDy">
- <el-radio :label="1">鏄�</el-radio>
- <el-radio :label="0">鍚�</el-radio>
- </el-radio-group>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 鎵�灞炴墜鏈哄彿鐮� -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="鎵�灞炴墜鏈哄彿鐮�:" prop="mobile">
- <el-input v-model="user.mobile" maxlength="11" placeholder="璇峰～鍐欐墜鏈哄彿鐮�"></el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 閭鍦板潃 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="閭鍦板潃:" prop="email">
- <el-input v-model="user.email" placeholder="璇峰～鍐欓偖绠卞湴鍧�"></el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 閫夋嫨瑙掕壊 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="閫夋嫨瑙掕壊:" prop="role">
- <el-select v-model="user.role" placeholder="璇烽�夋嫨鎵�灞炶鑹�" multiple collapse-tags>
- <el-option v-for="item in roleList" :key="item.id" :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 鐢ㄦ埛绫诲瀷 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="鐢ㄦ埛绫诲瀷:" prop="userType">
- <el-select v-model="user.userType" placeholder="璇烽�夋嫨鐢ㄦ埛绫诲瀷">
- <el-option v-for="item in typeList" :key="item.id" :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 搴ф満/鍒嗘満 -->
- <div class="user-item sp-item">
- <div class="item-left">
- <el-form-item label="搴ф満/鍒嗘満:" prop="zjarea">
- <el-input v-model="user.zjarea" placeholder="鐢佃瘽鍖哄彿">
- </el-input>
- </el-form-item>
- <el-form-item prop="zjnumber" class="left-px">
- <el-input v-model="user.zjnumber" placeholder="鐢佃瘽鍙风爜">
- </el-input>
- </el-form-item>
- <el-form-item prop="zjother" class="left-px">
- <el-input v-model="user.zjother" placeholder="鍒嗘満鍙风爜">
- </el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 鎵�灞為儴闂� -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="鎵�灞為儴闂�:" prop="departmentId">
- <el-select v-model="user.departmentId" placeholder="璇烽�夋嫨鎵�灞為儴闂�" @change="getDepartName">
- <el-option :value="mylabel">
- <el-tree ref="tree" :check-strictly="true" :data="departList"
- :props="defaultProps" show-checkbox @check-change="handleCheck"
- default-expand-all node-key="id">
- </el-tree>
- </el-option>
- </el-select>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 褰撳墠鑱屽姟 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="褰撳墠鑱屽姟:" prop="jobTitle">
- <el-input v-model="user.jobTitle" placeholder="璇疯緭鍏ュ綋鍓嶈亴鍔�"></el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 濉啓鎵�灞瀖ac鍦板潃 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="濉啓鎵�灞瀖ac鍦板潃:" prop="mac">
- <el-input v-model="user.mac" placeholder="璇峰～鍐欐墍灞瀖ac鍦板潃"></el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <!-- 濉啓鎵�灞瀒p鍦板潃 -->
- <div class="user-item">
- <div class="item-left">
- <el-form-item class="optionItem" label="濉啓鎵�灞瀒p鍦板潃:" prop="ip">
- <el-input v-model="user.ip" placeholder="璇峰～鍐欐墍灞瀒p鍦板潃"></el-input>
- </el-form-item>
- </div>
- <div class="item-right"></div>
- </div>
- <el-form-item>
- <div class="optionBtn">
- <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">鎻愪氦
- </el-button>
- <el-button class="btn reset" @click.native.prevent="resetForm">閲嶇疆</el-button>
- </div>
- </el-form-item>
- </el-form>
-
+ <div class="createUser">
+ <main>
+ <div class="mainContent">
+ <el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
+ label-position="right">
+ <!-- 鐢ㄦ埛鍚嶇О -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="鐢ㄦ埛鍚嶇О:" prop="username">
+ <el-input v-model="user.username" placeholder="濉啓鐢ㄦ埛鍚嶇О" autoComplete="new-username">
+ </el-input>
+ </el-form-item>
</div>
- </main>
- </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 鐢ㄦ埛瀵嗙爜 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItems" label="鐢ㄦ埛瀵嗙爜:" prop="password" >
+ <el-input v-model="user.password" type="password" autoComplete="new-password"
+ placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�"></el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ <!-- 閲嶆柊杈撳叆瀵嗙爜鍗充负淇敼锛屽瘑鐮佹湁鏁堟湡榛樿涓�3涓湀 -->
+ </div>
+ <!-- 鎵�灞炵敤鎴峰鍚� -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="鎵�灞炵敤鎴峰鍚�:" prop="nickName">
+ <el-input v-model="user.nickName" placeholder="璇峰～鍐欑敤鎴峰鍚�"></el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 鎬у埆 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="鎬у埆:" prop="sex">
+ <el-radio-group v-model="user.sex">
+ <el-radio :label="1">鐢�</el-radio>
+ <el-radio :label="0">濂�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 鏄惁鍏氬憳 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="鏄惁鍏氬憳:" prop="isDy">
+ <el-radio-group v-model="user.isDy">
+ <el-radio :label="1">鏄�</el-radio>
+ <el-radio :label="0">鍚�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 鎵�灞炴墜鏈哄彿鐮� -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="鎵�灞炴墜鏈哄彿鐮�:" prop="mobile">
+ <el-input v-model="user.mobile" maxlength="11" placeholder="璇峰～鍐欐墜鏈哄彿鐮�"></el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 閭鍦板潃 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="閭鍦板潃:" prop="email">
+ <el-input v-model="user.email" placeholder="璇峰～鍐欓偖绠卞湴鍧�"></el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 閫夋嫨瑙掕壊 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="閫夋嫨瑙掕壊:" prop="role">
+ <el-select v-model="user.role" placeholder="璇烽�夋嫨鎵�灞炶鑹�" multiple collapse-tags>
+ <el-option v-for="item in roleList" :key="item.id" :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 鐢ㄦ埛绫诲瀷 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="鐢ㄦ埛绫诲瀷:" prop="userType">
+ <el-select v-model="user.userType" placeholder="璇烽�夋嫨鐢ㄦ埛绫诲瀷">
+ <el-option v-for="item in typeList" :key="item.id" :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 搴ф満/鍒嗘満 -->
+ <div class="user-item sp-item">
+ <div class="item-left">
+ <el-form-item label="搴ф満/鍒嗘満:" prop="zjarea">
+ <el-input v-model="user.zjarea" placeholder="鐢佃瘽鍖哄彿">
+ </el-input>
+ </el-form-item>
+ <el-form-item prop="zjnumber" class="left-px">
+ <el-input v-model="user.zjnumber" placeholder="鐢佃瘽鍙风爜">
+ </el-input>
+ </el-form-item>
+ <el-form-item prop="zjother" class="left-px">
+ <el-input v-model="user.zjother" placeholder="鍒嗘満鍙风爜">
+ </el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 鎵�灞為儴闂� -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="鎵�灞為儴闂�:" prop="departmentId">
+ <el-select v-model="user.departmentId" placeholder="璇烽�夋嫨鎵�灞為儴闂�" @change="getDepartName">
+ <el-option :value="mylabel">
+ <el-tree ref="tree" :check-strictly="true" :data="departList"
+ :props="defaultProps" show-checkbox @check-change="handleCheck"
+ default-expand-all node-key="id">
+ </el-tree>
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 褰撳墠鑱屽姟 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="褰撳墠鑱屽姟:" prop="jobTitle">
+ <el-input v-model="user.jobTitle" placeholder="璇疯緭鍏ュ綋鍓嶈亴鍔�"></el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 濉啓鎵�灞瀖ac鍦板潃 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="濉啓鎵�灞瀖ac鍦板潃:" prop="mac">
+ <el-input v-model="user.mac" placeholder="璇峰～鍐欐墍灞瀖ac鍦板潃"></el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <!-- 濉啓鎵�灞瀒p鍦板潃 -->
+ <div class="user-item">
+ <div class="item-left">
+ <el-form-item class="optionItem" label="濉啓鎵�灞瀒p鍦板潃:" prop="ip">
+ <el-input v-model="user.ip" placeholder="璇峰～鍐欐墍灞瀒p鍦板潃"></el-input>
+ </el-form-item>
+ </div>
+ <div class="item-right"></div>
+ </div>
+ <el-form-item>
+ <div class="optionBtn">
+ <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">鎻愪氦
+ </el-button>
+ <el-button class="btn reset" @click.native.prevent="resetForm">閲嶇疆</el-button>
+ </div>
+ </el-form-item>
+ </el-form>
+
+ </div>
+ </main>
+ </div>
</template>
<script>
import { getTypeList } from '@/utils/helper'
export default {
- data() {
- const validateNickname = (rule, value, callback) => {
- if (!value) {
- callback(new Error("鎵�灞炲鍚嶄笉鑳戒负绌�"));
- } else {
- callback();
- }
- };
- const validatePass = (rule, value, callback) => {
- if (!value) {
- callback(new Error("鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖"));
- } else {
- if (value.length < 6 || value.length > 16){
- callback(new Error("鐢ㄦ埛瀵嗙爜闀垮害涓嶅悎娉�"));
- }else {
- const rep = /^\w+$/;
- if (!rep.test(value)) {
- callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆"));
- } else {
- callback();
- }
- }
- }
- };
- const validateTruename = (rule, value, callback) => {
- if (!value) {
- callback(new Error("鐢ㄦ埛濮撳悕涓嶈兘涓虹┖"));
- } else {
- callback();
- }
- };
- const validatePhone = (rule, value, callback) => {
- if (!value) {
- callback(new Error("鎵嬫満鍙风爜涓嶈兘涓虹┖"));
- } else {
- const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/
- if (!rep.test(value)) {
- callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜");
- } else {
- callback();
- }
- }
- };
- const validateMail = (rule, value, callback) => {
- if (value) {
- const rep = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
- if (!rep.test(value)) {
- callback(new Error("璇疯緭鍏ユ纭殑閭"))
- } else {
- callback();
- }
- } else {
- callback();
- }
- };
- const validateRole = (rule, value, callback) => {
- if (!value) {
- callback(new Error("鎵�灞炶鑹蹭笉鑳戒负绌�"));
- } else {
- callback()
- }
- };
- const validateType = (rule, value, callback) => {
- if (!value) {
- callback(new Error("鐢ㄦ埛绫诲瀷涓嶈兘涓虹┖"));
- } else {
- callback()
- }
- };
- const validateDepartment = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇烽�夋嫨鐢ㄦ埛閮ㄩ棬"));
- } else {
- callback()
- }
- };
- const validateWork = (rule, value, callback) => {
- if (!value) {
- callback(new Error("鐢ㄦ埛褰撳墠鑱屽姟涓嶈兘涓虹┖"));
- } else {
- callback();
- }
- };
- const validateMac = (rule, value, callback) => {
- if (value) {
- callback();
- } else {
- callback()
- }
- };
- const validateIp = (rule, value, callback) => {
- if (value) {
- callback();
- } else {
- callback()
- }
- };
- return {
- user: {
- nickName: '',
- password: '',
- username: '',
- sex: 1,
- isDy: 0,
- mobile: '',
- email: '',
- role: null,
- userType: null,
- zjarea: '',
- zjnumber: '',
- zjother: '',
- departmentId: null,
- jobTitle: null,
- mac: '',
- ip: '',
- },
- createUserRules: {
- nickName: [
- { required: true, trigger: "blur", validator: validateNickname },
- ],
- password: [
- { required: true, trigger: "blur", validator: validatePass },
- ],
- username: [
- { required: true, trigger: "blur", validator: validateTruename },
- ],
- sex: [
- { required: true, trigger: "blur" },
- ],
- isDy: [
- { required: true, trigger: "blur" },
- ],
- mobile: [
- { required: true, trigger: "blur", validator: validatePhone },
- ],
- email: [
- { required: true, trigger: "blur", validator: validateMail },
- ],
- role: [
- { required: true, trigger: "change", validator: validateRole },
- ],
- userType: [
- { required: true, trigger: "change", validator: validateType },
- ],
- zj: [
- { required: false, trigger: "blur" },
- ],
- departmentId: [
- { required: true, trigger: "change", validator: validateDepartment },
- ],
- jobTitle: [
- { required: true, trigger: "blur", validator: validateWork },
- ],
- mac: [
- { required: false, trigger: "blur", validator: validateMac },
- ],
- ip: [
- { required: false, trigger: "blur", validator: validateIp },
- ],
- },
- roleList: [
+ data() {
+ const validateNickname = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("鎵�灞炲鍚嶄笉鑳戒负绌�"));
+ } else {
+ callback();
+ }
+ };
+ const validatePass = (rule, value, callback) => {
+ //蹇呴』鍖呭惈瀛楁瘝銆佹暟瀛椼�侀暱搴﹀啀6-16浣嶄箣闂�
+ var regex = new RegExp("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$");
+ if (value === "") {
+ callback(new Error("鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖"));
+ } else if (value.length < 6 || value.length > 16) {
+ callback(new Error("璇疯緭饧�6~16浣嶅瘑鐮�"));
+ } else if (!regex.test(value)) {
+ callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶇粍鎴愮殑瀛楃涓�"));
+ } else {
+ callback();
+ }
- ],
- typeList: [
-
- ],
- departList: [],
- mylabel: '',
- defaultProps: {
- children: 'children',
- label: 'departName',
- disabled: (data, node) => {
- if (node.level === 1 && node.childNodes.length !== 0) {
- return !data.leaf
- }
- }
- },
- selectOrg: {
- orgsid: []
- },
+ // if (!value) {
+ // callback(new Error("鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖"));
+ // } else {
+ // if (value.length < 6 || value.length > 16){
+ // callback(new Error("鐢ㄦ埛瀵嗙爜闀垮害涓嶅悎娉�"));
+ // }else {
+ // const rep = /^\w+$/;
+ // if (!rep.test(value)) {
+ // callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆"));
+ // } else {
+ // callback();
+ // }
+ // }
+ // }
+ };
+ const validateTruename = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("鐢ㄦ埛濮撳悕涓嶈兘涓虹┖"));
+ } else {
+ callback();
+ }
+ };
+ const validatePhone = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("鎵嬫満鍙风爜涓嶈兘涓虹┖"));
+ } else {
+ const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/
+ if (!rep.test(value)) {
+ callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜");
+ } else {
+ callback();
}
- },
- created() {
- // 鑾峰彇瑙掕壊鍒楄〃
- this.getRoleList();
- // 鑾峰彇鐢ㄦ埛绫诲瀷
- this.getUserTypeList();
- // 鑾峰彇閮ㄩ棬
- this.getDepartList();
- },
- methods: {
- // 鎻愪氦娉ㄥ唽
- handleUser() {
- this.$refs['user'].validate((valid) => {
- console.log(valid);
- if (valid) {
- const { user, selectOrg } = this;
- console.log(user);
- this.$axios.post('sccg/admin/register', {
- departmentId: selectOrg.orgsid[0],
- email: user.email,
- icon: '',
- isDy: `${user.isDy}`,
- jobTitle: user.jobTitle,
- mobile: user.mobile,
- note: '',
- roleIds: user.role,
- // nickName: user.nickName,
- sex: `${user.sex}`,
- password: user.password,
- userType: user.userType,
- username: user.username,
- zj: user.zjarea + `${user.zjnumber}` + user.zjother,
- nickName: user.nickName
- // departName:user.departName,
- }).then(res => {
- if (res.code === 200) {
- console.log(1);
- this.$message({
- type: 'success',
- message: res.message,
- })
- this.$emit('sendDialog', { flag: false });
- } else if (res.code === 500 && res.message === "鎿嶄綔澶辫触") {
- this.$message({
- type: 'warning',
- message: '璇ョ敤鎴峰凡娉ㄥ唽'
- })
- } else {
- this.$message({
- type: 'warning',
- message: res.message
- })
- }
- })
- } else {
- return false
- }
- })
- },
- // 鑾峰彇瑙掕壊鍒楄〃
- getRoleList() {
- this.$axios({
- method: 'get',
- url: 'sccg/role/listAll',
- })
- .then(res => {
- this.roleList = res.data;
- })
- },
- // 閲嶇疆琛ㄥ崟
- resetForm() {
- this.$refs['user'].resetFields();
- },
- // 鑾峰緱閮ㄩ棬鍚嶇О
- getDepartName(data) {
- this.departList.forEach(item => {
- if (item.id === data) {
- this.user.departName = item.departName
- }
- })
- },
- // 鑾峰彇鐢ㄦ埛绫诲瀷
- async getUserTypeList() {
- this.typeList = await getTypeList(1, '07');
- },
- // 鑾峰彇閮ㄩ棬鏍�
- getDepartList() {
- this.$axios({
- method: 'get',
- url: 'sccg/depart/tree'
- })
- .then(res => {
- this.departList = res.data;
- })
- },
- handleCheck(data, checked) {
- this.user.departmentId = data.departName;
- // 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮�
- const indexs = this.selectOrg.orgsid.indexOf(data.id)
- // 濡傛灉涓嶅瓨鍦ㄦ暟缁勪腑锛屽苟涓旀暟缁勪腑宸茬粡鏈変竴涓猧d骞朵笖checked涓簍rue鐨勬椂鍊欙紝浠ｈ〃涓嶈兘鍐嶆閫夋嫨銆�
- if (indexs < 0 && this.selectOrg.orgsid.length === 1 && checked) {
- this.$message({
- message: '鍙兘閫夋嫨涓�涓儴闂紒',
- type: 'warning',
- showClose: true
- })
- // 璁剧疆宸查�夋嫨鐨勮妭鐐逛负false 寰堥噸瑕�
- this.$refs.tree.setChecked(data, false)
- } else if (this.selectOrg.orgsid.length === 0 && checked) {
- // 鍙戠幇鏁扮粍涓虹┖ 骞朵笖鏄凡閫夋嫨
- // 闃叉鏁扮粍鏈夊�硷紝棣栧厛娓呯┖锛屽啀push
- this.selectOrg.orgsid = []
- this.selectOrg.orgsid.push(data.id)
- } else if (
- indexs >= 0 &&
- this.selectOrg.orgsid.length === 1 &&
- !checked
- ) {
- // 鍐嶆鐩存帴杩涜璧嬪�间负绌烘搷浣�
- this.selectOrg.orgsid = []
- this.user.departmentId = '';
+ }
+ };
+ const validateMail = (rule, value, callback) => {
+ if (value) {
+ const rep = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
+ if (!rep.test(value)) {
+ callback(new Error("璇疯緭鍏ユ纭殑閭"))
+ } else {
+ callback();
+ }
+ } else {
+ callback();
+ }
+ };
+ const validateRole = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("鎵�灞炶鑹蹭笉鑳戒负绌�"));
+ } else {
+ callback()
+ }
+ };
+ const validateType = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("鐢ㄦ埛绫诲瀷涓嶈兘涓虹┖"));
+ } else {
+ callback()
+ }
+ };
+ const validateDepartment = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("璇烽�夋嫨鐢ㄦ埛閮ㄩ棬"));
+ } else {
+ callback()
+ }
+ };
+ const validateWork = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error("鐢ㄦ埛褰撳墠鑱屽姟涓嶈兘涓虹┖"));
+ } else {
+ callback();
+ }
+ };
+ const validateMac = (rule, value, callback) => {
+ if (value) {
+ callback();
+ } else {
+ callback()
+ }
+ };
+ const validateIp = (rule, value, callback) => {
+ if (value) {
+ callback();
+ } else {
+ callback()
+ }
+ };
+ return {
+ user: {
+ nickName: '',
+ password: '',
+ username: '',
+ sex: 1,
+ isDy: 0,
+ mobile: '',
+ email: '',
+ role: null,
+ userType: null,
+ zjarea: '',
+ zjnumber: '',
+ zjother: '',
+ departmentId: null,
+ jobTitle: null,
+ mac: '',
+ ip: '',
+ },
+ createUserRules: {
+ nickName: [
+ { required: true, trigger: "blur", validator: validateNickname },
+ ],
+ password: [
+ { required: true, trigger: "blur", validator: validatePass },
+ ],
+ username: [
+ { required: true, trigger: "blur", validator: validateTruename },
+ ],
+ sex: [
+ { required: true, trigger: "blur" },
+ ],
+ isDy: [
+ { required: true, trigger: "blur" },
+ ],
+ mobile: [
+ { required: true, trigger: "blur", validator: validatePhone },
+ ],
+ email: [
+ { required: true, trigger: "blur", validator: validateMail },
+ ],
+ role: [
+ { required: true, trigger: "change", validator: validateRole },
+ ],
+ userType: [
+ { required: true, trigger: "change", validator: validateType },
+ ],
+ zj: [
+ { required: false, trigger: "blur" },
+ ],
+ departmentId: [
+ { required: true, trigger: "change", validator: validateDepartment },
+ ],
+ jobTitle: [
+ { required: true, trigger: "blur", validator: validateWork },
+ ],
+ mac: [
+ { required: false, trigger: "blur", validator: validateMac },
+ ],
+ ip: [
+ { required: false, trigger: "blur", validator: validateIp },
+ ],
+ },
+ roleList: [
+
+ ],
+ typeList: [
+
+ ],
+ departList: [],
+ mylabel: '',
+ defaultProps: {
+ children: 'children',
+ label: 'departName',
+ disabled: (data, node) => {
+ if (node.level === 1 && node.childNodes.length !== 0) {
+ return !data.leaf
+ }
+ }
+ },
+ selectOrg: {
+ orgsid: []
+ },
+ }
+ },
+ created() {
+ // 鑾峰彇瑙掕壊鍒楄〃
+ this.getRoleList();
+ // 鑾峰彇鐢ㄦ埛绫诲瀷
+ this.getUserTypeList();
+ // 鑾峰彇閮ㄩ棬
+ this.getDepartList();
+ },
+ methods: {
+ // 鎻愪氦娉ㄥ唽
+ handleUser() {
+ this.$refs['user'].validate((valid) => {
+ console.log(valid);
+ if (valid) {
+ const { user, selectOrg } = this;
+ console.log(user);
+ this.$axios.post('sccg/admin/register', {
+ departmentId: selectOrg.orgsid[0],
+ email: user.email,
+ icon: '',
+ isDy: `${user.isDy}`,
+ jobTitle: user.jobTitle,
+ mobile: user.mobile,
+ note: '',
+ roleIds: user.role,
+ // nickName: user.nickName,
+ sex: `${user.sex}`,
+ password: user.password,
+ userType: user.userType,
+ username: user.username,
+ zj: user.zjarea + `${user.zjnumber}` + user.zjother,
+ nickName: user.nickName
+ // departName:user.departName,
+ }).then(res => {
+ if (res.code === 200) {
+ console.log(1);
+ this.$message({
+ type: 'success',
+ message: res.message,
+ })
+ this.$emit('sendDialog', { flag: false });
+ } else if (res.code === 500 && res.message === "鎿嶄綔澶辫触") {
+ this.$message({
+ type: 'warning',
+ message: '璇ョ敤鎴峰凡娉ㄥ唽'
+ })
+ } else {
+ this.$message({
+ type: 'warning',
+ message: res.message
+ })
}
- },
+ })
+ } else {
+ return false
+ }
+ })
},
- props: ['sendDialog']
+ // 鑾峰彇瑙掕壊鍒楄〃
+ getRoleList() {
+ this.$axios({
+ method: 'get',
+ url: 'sccg/role/listAll',
+ })
+ .then(res => {
+ this.roleList = res.data;
+ })
+ },
+ // 閲嶇疆琛ㄥ崟
+ resetForm() {
+ this.$refs['user'].resetFields();
+ },
+ // 鑾峰緱閮ㄩ棬鍚嶇О
+ getDepartName(data) {
+ this.departList.forEach(item => {
+ if (item.id === data) {
+ this.user.departName = item.departName
+ }
+ })
+ },
+ // 鑾峰彇鐢ㄦ埛绫诲瀷
+ async getUserTypeList() {
+ this.typeList = await getTypeList(1, '07');
+ },
+ // 鑾峰彇閮ㄩ棬鏍�
+ getDepartList() {
+ this.$axios({
+ method: 'get',
+ url: 'sccg/depart/tree'
+ })
+ .then(res => {
+ this.departList = res.data;
+ })
+ },
+ handleCheck(data, checked) {
+ this.user.departmentId = data.departName;
+ // 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮�
+ const indexs = this.selectOrg.orgsid.indexOf(data.id)
+ // 濡傛灉涓嶅瓨鍦ㄦ暟缁勪腑锛屽苟涓旀暟缁勪腑宸茬粡鏈変竴涓猧d骞朵笖checked涓簍rue鐨勬椂鍊欙紝浠ｈ〃涓嶈兘鍐嶆閫夋嫨銆�
+ if (indexs < 0 && this.selectOrg.orgsid.length === 1 && checked) {
+ this.$message({
+ message: '鍙兘閫夋嫨涓�涓儴闂紒',
+ type: 'warning',
+ showClose: true
+ })
+ // 璁剧疆宸查�夋嫨鐨勮妭鐐逛负false 寰堥噸瑕�
+ this.$refs.tree.setChecked(data, false)
+ } else if (this.selectOrg.orgsid.length === 0 && checked) {
+ // 鍙戠幇鏁扮粍涓虹┖ 骞朵笖鏄凡閫夋嫨
+ // 闃叉鏁扮粍鏈夊�硷紝棣栧厛娓呯┖锛屽啀push
+ this.selectOrg.orgsid = []
+ this.selectOrg.orgsid.push(data.id)
+ } else if (
+ indexs >= 0 &&
+ this.selectOrg.orgsid.length === 1 &&
+ !checked
+ ) {
+ // 鍐嶆鐩存帴杩涜璧嬪�间负绌烘搷浣�
+ this.selectOrg.orgsid = []
+ this.user.departmentId = '';
+ }
+ },
+ },
+ props: ['sendDialog']
}
</script>
<style lang="scss" scoped>
.createUser {
- border-radius: 1px;
+ border-radius: 1px;
+ background-color: #09152f;
+
+ main {
+ text-align: left;
+ padding: 0 55px;
background-color: #09152f;
+ padding-bottom: 50px;
+ padding-top: 20px;
- main {
- text-align: left;
- padding: 0 55px;
+ .mainContent {
+ display: flex;
+ // justify-content: center;
+ margin-top: 50px;
+ width: 100%;
+ &::v-deep .el-form-item__label {
+ color: #4b9bb7;
+ }
+
+ &::v-deep .el-input__inner {
background-color: #09152f;
- padding-bottom: 50px;
- padding-top: 20px;
+ border: 1px solid #17324c;
+ }
- .mainContent {
- display: flex;
- // justify-content: center;
- margin-top: 50px;
- width: 100%;
- &::v-deep .el-form-item__label {
- color: #4b9bb7;
- }
-
- &::v-deep .el-input__inner {
- background-color: #09152f;
- border: 1px solid #17324c;
- }
-
- .el-form-item__content {
- width: 400px;
- .el-select {
- width: 100%;
- }
- }
-
- .sp-item {
- .item-left{
- display: flex;
- }
- }
-
- .user-item {
- display: flex;
- justify-content: space-between;
- .item-left {
- width: 500px;
- }
- .item-right {
- line-height: 40px;
- color: #4b9bb7;
- font-size: 12px;
- // margin-left: 16px;
- }
-
- .left-px :deep(.el-form-item__content) {
- margin-left: 0px !important;
- }
- }
-
- .optionBtn {
- display: flex;
- margin-top: 20px;
-
- .btn {
- padding: 12px 50px;
- }
- }
-
+ .el-form-item__content {
+ width: 400px;
+ .el-select {
+ width: 100%;
}
+ }
+
+ .sp-item {
+ .item-left{
+ display: flex;
+ }
+ }
+
+ .user-item {
+ display: flex;
+ justify-content: space-between;
+ .item-left {
+ width: 500px;
+ }
+ .item-right {
+ line-height: 40px;
+ color: #4b9bb7;
+ font-size: 12px;
+ // margin-left: 16px;
+ }
+
+ .left-px :deep(.el-form-item__content) {
+ margin-left: 0px !important;
+ }
+ }
+
+ .optionBtn {
+ display: flex;
+ margin-top: 20px;
+
+ .btn {
+ padding: 12px 50px;
+ }
+ }
+
}
+ }
}
</style>
--
Gitblit v1.8.0