修改系统配置的删除提示

src/api/model/system.js

@@ -309,7 +309,7 @@ export default {
 			}
 		},
 		userCompanyList:{
-			url: `${config.API_URL}/company.user.list`,
+			url: `${config.API_URL}/organization.user.list`,
 			name: "查看公司用户列表",
 			get: async function (params) {
 				return await http.post(this.url, params);

src/api/model/user.js

@@ -51,6 +51,13 @@ export default {
 			return await http.post(this.url, params);
 		},
 	},
+	resetPass:{
+		url: `${config.API_URL}/user.reset.pwd`,
+		name: "重置个人密码",
+		post: async function (params) {
+			return await http.post(this.url, params);
+		},
+	},
 	timeoutConfig:{
 		url: `${config.API_URL}/system.login.timeout.config`,
 		name: "登录超时退出配置",

src/style/home.scss

@@ -129,6 +129,7 @@
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
+			flex-wrap: wrap;
 			.comMain{
 				.num{
 					color: var(--el-color-dark);
@@ -168,3 +169,34 @@
 }
 
 
+@media (max-width: 992px){
+	.consoleView{
+		.headerBox{
+
+		}
+		.middleBox{
+			.briefing{
+				.item{
+					.comMain{
+						margin-bottom: 10px;
+						.num{
+							height: 80px;
+						}
+					}
+				}
+			}
+		}
+		.footerBox{
+
+		}
+		.progressView{
+			height: 200px;
+		}
+		.chartView{
+			height: 460px;
+
+		}
+	}
+}
+
+

src/views/home/console/components/bar.vue

@@ -18,7 +18,7 @@ export default {
 					trigger: 'axis'
 				},
 				grid: {
-					left: '1%',
+					left: "1%",
 					right: '5%',
 					bottom: '3%',
 					top: "3%",
@@ -72,8 +72,8 @@ export default {
 							show:false,
 							smooth:false,
 						},
-						lineStyle: {
+						itemStyle: {
-							width: 2,
+							color: '#1367C1',
 						},
 						areaStyle: {
 							opacity: 0.4,
@@ -87,8 +87,8 @@ export default {
 						symbol: 'none',
 						labelLine:{
 						},
-						lineStyle: {
+						itemStyle: {
-							width: 2,
+							color: '#2A91C4',
 						},
 						areaStyle: {
 							opacity: 0.4,

src/views/home/console/index.vue

@@ -43,7 +43,7 @@
 						</div>
 					</el-col>
 					<el-col class="rightCol" :span="4" :md="4" :sm="24" :xs="24">
-						<div class="cardBox">
+						<div class="cardBox progressView">
 							<div class="cardTitle">不良率</div>
 							<div class="cardBody">
 								<progressBox />
@@ -74,7 +74,7 @@
 						</div>
 					</el-col>
 					<el-col class="rightCol" :span="8" :md="8" :sm="24" :xs="24">
-						<div class="cardBox">
+						<div class="cardBox chartView">
 							<div class="cardTitle">占位</div>
 							<div class="cardBody">
 								<pointBox />
@@ -86,7 +86,7 @@
 			<div class="footerBox">
 				<el-row class="colRow" :gutter="20">
 					<el-col class="leftCol" :span="8" :md="8" :sm="24" :xs="24">
-						<div class="cardBox">
+						<div class="cardBox chartView">
 							<div class="cardTitle">实时数据</div>
 							<div class="cardBody">
 								<barBox />
@@ -94,7 +94,7 @@
 						</div>
 					</el-col>
 					<el-col class="middleCol" :span="8" :md="8" :sm="24" :xs="24">
-						<div class="cardBox">
+						<div class="cardBox chartView">
 							<div class="cardTitle">占位</div>
 							<div class="cardBody">
 								<ringBox />
@@ -102,7 +102,7 @@
 						</div>
 					</el-col>
 					<el-col class="rightCol" :span="8" :md="8" :sm="24" :xs="24">
-						<div class="cardBox">
+						<div class="cardBox chartView">
 							<div class="cardTitle">占位</div>
 							<div class="cardBody">
 								<pointBox />

src/views/setting/company/index.vue

@@ -140,27 +140,18 @@ export default {
 		},
 		//删除
 		async table_del(row){
-			const reqData = {id: row.id};
+			this.$confirm(`确定删除 ${row.name} 吗？`, '提示', {
-			const res = await this.$API.system.company.delete.post(reqData);
-			if(res.code == 200){
-				this.$refs.table.refresh()
-				this.$message.success("删除成功")
-			}else{
-				await this.$alert(res.message, "提示", {type: 'error'})
-			}
-		},
-		//批量删除
-		async batch_del(){
-			this.$confirm(`确定删除选中的 ${this.selection.length} 项吗？如果删除项中含有子集将会被一并删除`, '提示', {
 				type: 'warning'
-			}).then(() => {
+			}).then(async () => {
-				const loading = this.$loading();
+				const reqData = {id: row.id};
-				this.$refs.table.refresh()
+				const res = await this.$API.system.company.delete.post(reqData);
-				loading.close();
+				if(res.code == 200){
-				this.$message.success("操作成功")
+					this.$refs.table.refresh()
-			}).catch(() => {
+					this.$message.success("删除成功")
-
+				}else{
-			})
+					await this.$alert(res.message, "提示", {type: 'error'})
+				}
+			}).catch(()=>{})
 		},
 		// 功能授权
 		table_empower(row){
@@ -174,14 +165,13 @@ export default {
 		},
 		// 公司用户列表
 		table_user_ist(row){
-			this.$message.warning(row.name+' 暂无接口')
+			this.$router.push({
-			// this.$router.push({
+				path: '/setting/user/company-user-list',
-			// 	path: '/setting/user/company-user-list',
+				query: {
-			// 	query: {
+					id: row.id,
-			// 		id: row.id,
+					name:row.name
-			// 		name:row.name
+				}
-			// 	}
+			})
-			// })
 		},
 		//表格选择后回调事件
 		selectionChange(selection){
@@ -208,7 +198,11 @@ export default {
 		},
 		reset(){
 			this.$refs.table.reload();
-		}
+		},
+
+		handleSaveSuccess(){
+			this.$refs.table.refresh();
+		},
 	}
 }
 </script>

src/views/setting/deptMag/index.vue

@@ -105,14 +105,19 @@
 			},
 			//删除
 			async table_del(row){
-				const reqData = {id: row.id};
+				this.$confirm(`确定删除 ${row.name} 吗？`, '提示', {
-				const res = await this.$API.system.dept.delete.post(reqData);
+					type: 'warning'
-				if(res.code == 200){
+				}).then(async () => {
-					this.$refs.table.refresh()
+					const reqData = {id: row.id};
-					this.$message.success("删除成功")
+					const res = await this.$API.system.dept.delete.post(reqData);
-				}else{
+					if(res.code == 200){
-					await this.$alert(res.message, "提示", {type: 'error'})
+						this.$refs.table.refresh()
-				}
+						this.$message.success("删除成功")
+					}else{
+						await this.$alert(res.message, "提示", {type: 'error'})
+					}
+				}).catch(()=>{})
+
 			},
 			//批量删除
 			async batch_del(){

src/views/setting/role/index.vue

@@ -96,12 +96,16 @@
 			},
 			//删除
 			async table_del(row){
-				const params = {ids: [row.id]};
+				this.$confirm(`确定删除 ${row.role_name} 吗？`, '提示', {
-				const res = await this.$API.system.role.delete.post(params);
+					type: 'warning'
-				if(res.code == 200){
+				}).then(async () => {
-					this.$refs.table.refresh()
+					const params = {ids: [row.id]};
-					this.$message.success("删除成功")
+					const res = await this.$API.system.role.delete.post(params);
-				}
+					if(res.code == 200){
+						this.$refs.table.refresh()
+						this.$message.success("删除成功")
+					}
+				}).catch(()=>{})
 			},
 			//批量删除
 			async batch_del(){

src/views/setting/user/rePwd.vue

@@ -1,11 +1,6 @@
 <template>
 	<el-dialog title="重置用户密码" v-model="visible" draggable :width="500">
-		<el-form :model="form" :rules="rules" :disabled="mode==='show'" ref="dialogForm" label-width="100px"
+		<el-form :model="form" :rules="rules" :disabled="mode==='show'" ref="dialogForm" label-width="100px" label-position="right">
-				 label-position="right">
-			<el-form-item label="当前密码" prop="old_pwd">
-				<el-input v-model="form.old_pwd" type="password" show-password
-						  placeholder="请输入当前密码"></el-input>
-			</el-form-item>
 			<el-form-item label="新密码" prop="new_pwd">
 				<el-input v-model="form.new_pwd" type="password" show-password placeholder="请输入新密码"></el-input>
 				<sc-password-strength v-model="form.new_pwd"></sc-password-strength>
@@ -44,9 +39,6 @@ export default {
 			isSave: false,
 			visible: false,
 			rules: {
-				old_pwd: [
-					{required: true, message: '请输入当前密码'}
-				],
 				new_pwd: [
 					{required: true, message: '请输入新密码'}
 				],
@@ -77,11 +69,10 @@ export default {
 			this.$refs.dialogForm.validate(async (valid) => {
 				if (valid) {
 					const reqData = {
-						user_id: this.form.id,
+						id: this.form.id,
-						old_pwd:this.form.old_pwd,
+						new_pwd: this.form.conf_pwd
-						conf_pwd: this.form.conf_pwd
 					};
-					const res = await this.$API.user.editPass.post(reqData);
+					const res = await this.$API.user.resetPass.post(reqData);
 					if (res.code === 200) {
 						this.visible = false;
 						this.$message.success("密码重置成功")