Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/config/route.js

@@ -1401,11 +1401,21 @@ const routes = [
 						},
 						component: "wpm_gx/qiepian",
 					},
+					{
+						name: "baipianpao",
+						path: "/wpm_gx/baipianpao",
+						meta: {
+							title: "白片抛",
+							// icon: "el-icon-files",
+							perms: ["wpm_bpp"],
+						},
+						component: "wpm_gx/baipianpao",
+					},
 					{
 						name: "saobian",
 						path: "/wpm_gx/saobian",
 						meta: {
-							title: "扫边",
+							title: "扫边A",
 							// icon: "el-icon-cellphone",
 							perms: ["wpm_sb"],
 						},
@@ -1422,25 +1432,45 @@ const routes = [
 						component: "wpm_gx/heihua",
 					},
 					{
-						name: "shaojie",
+						name: "tuihuo",
-						path: "/wpm_gx/shaojie",
+						path: "/wpm_gx/tuihuo",
 						meta: {
-							title: "烧结",
+							title: "退火",
 							// icon: "el-icon-cellphone",
 							perms: ["wpm_sj"],
 						},
-						component: "wpm_gx/shaojie",
+						component: "wpm_gx/tuihuo",
 					},
 					{
 						name: "jianbo",
 						path: "/wpm_gx/jianbo",
 						meta: {
-							title: "减薄",
+							title: "减薄A",
 							// icon: "el-icon-cellphone",
 							perms: ["wpm_jb"],
 						},
 						component: "wpm_gx/jianbo",
 					},
+					{
+						name: "jianbob",
+						path: "/wpm_gx/jianbob",
+						meta: {
+							title: "减薄B",
+							// icon: "el-icon-cellphone",
+							perms: ["wpm_jbb"],
+						},
+						component: "wpm_gx/jianbob",
+					},
+					{
+						name: "pingmo",
+						path: "/wpm_gx/pingmo",
+						meta: {
+							title: "平磨",
+							// icon: "el-icon-cellphone",
+							perms: ["wpm_mp"],
+						},
+						component: "wpm_gx/pingmo",
+					},
 					{
 						name: "jingdiao",
 						path: "/wpm_gx/jingdiao",
@@ -1452,14 +1482,34 @@ const routes = [
 						component: "wpm_gx/jingdiao",
 					},
 					{
-						name: "mopao",
+						name: "yicipao",
-						path: "/wpm_gx/mopao",
+						path: "/wpm_gx/yicipao",
 						meta: {
-							title: "磨抛",
+							title: "一次抛",
 							// icon: "el-icon-cellphone",
-							perms: ["wpm_mp"],
+							perms: ["wpm_ycp"],
 						},
-						component: "wpm_gx/mopao",
+						component: "wpm_gx/yicipao",
+					},
+					{
+						name: "saobianb",
+						path: "/wpm_gx/saobianb",
+						meta: {
+							title: "扫边B",
+							// icon: "el-icon-cellphone",
+							perms: ["wpm_sbb"],
+						},
+						component: "wpm_gx/saobianb",
+					},
+					{
+						name: "chengpinpao",
+						path: "/wpm_gx/chengpinpao",
+						meta: {
+							title: "成品抛",
+							// icon: "el-icon-cellphone",
+							perms: ["wpm_cpp"],
+						},
+						component: "wpm_gx/chengpinpao",
 					},
 					{
 						name: "daojiao",

src/views/userCenter/user/pushSettings.vue

@@ -13,7 +13,7 @@
       <div class="el-form-item-msg">必须提供当前登录用户密码才能进行更改</div>
   </el-form-item>
   <el-form-item label="新密码" prop="new_password1">
-    <el-input v-model="formData.new_password1" placeholder="请输入包含英文、数字、特殊符号（ @#$%^&.+=! ）的8位以上密码" clearable show-password
+    <el-input v-model="formData.new_password1" placeholder="请输入包含英文、数字、特殊符号（ @#$%^&+=! ）的8位以上密码" clearable show-password
       :style="{width: '100%'}"></el-input>
   </el-form-item>
   <el-form-item label="确认新密码" prop="new_password2">
@@ -56,7 +56,7 @@ export default {
               if (reg1.test(value)) {
 								callback();
 							}else{	
-                callback(new Error('请输入包含英文、数字、特殊符号（ @#$%^&.+=! ）的8位以上密码'));
+                callback(new Error('请输入包含英文、数字、特殊符号（ @#$%^&+=! ）的8位以上密码'));
 							}
 						}}
 					],

src/views/wpm_gx/baipianpao.vue

@@ -0,0 +1,62 @@
+<template>
+	<el-container>
+		<el-header>
+			<el-segmented
+				v-model="values"
+				:options="options"
+				size="default"
+			></el-segmented>
+		</el-header>
+		<el-main id="elMain" class="nopadding">
+			<!-- 日志 -->
+			<mlogs
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 60%"
+			></mlogs>
+			<mtask
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 40%"
+			></mtask>
+			<!-- 交接记录 -->
+			<handover
+				v-else-if="values == '交接记录'"
+				:mgroupName="mgroupName"
+			></handover>
+			<!-- 库存 -->
+			<inm v-else :mgroupName="mgroupName"></inm>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+import inm from "./inm.vue";
+import mlogs from "./mlogs.vue";
+import mtask from "./mtask.vue";
+import handover from "./handover.vue";
+export default {
+	components: { inm, mlogs, mtask, handover },
+	data() {
+		return {
+			tableHieght: 200,
+			options: ["日志", "交接记录", "库存"],
+			values: "日志",
+			mgroupName: "白片抛",
+			mgroupId: "",
+		};
+	},
+	created() {},
+	mounted() {
+		let that = this;
+		let height = document.getElementById("elMain").clintHeight / 2;
+		that.tableHieght = height;
+	},
+	methods: {
+		handleChange(value) {
+			this.value = value;
+			console.log("Selected value:", value);
+		},
+	},
+};
+</script>

src/views/wpm_gx/chengpinpao.vue

@@ -0,0 +1,62 @@
+<template>
+	<el-container>
+		<el-header>
+			<el-segmented
+				v-model="values"
+				:options="options"
+				size="default"
+			></el-segmented>
+		</el-header>
+		<el-main id="elMain" class="nopadding">
+			<!-- 日志 -->
+			<mlogs
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 60%"
+			></mlogs>
+			<mtask
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 40%"
+			></mtask>
+			<!-- 交接记录 -->
+			<handover
+				v-else-if="values == '交接记录'"
+				:mgroupName="mgroupName"
+			></handover>
+			<!-- 库存 -->
+			<inm v-else :mgroupName="mgroupName"></inm>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+import inm from "./inm.vue";
+import mlogs from "./mlogs.vue";
+import mtask from "./mtask.vue";
+import handover from "./handover.vue";
+export default {
+	components: { inm, mlogs, mtask, handover },
+	data() {
+		return {
+			tableHieght: 200,
+			options: ["日志", "交接记录", "库存"],
+			values: "日志",
+			mgroupName: "成品抛",
+			mgroupId: "",
+		};
+	},
+	created() {},
+	mounted() {
+		let that = this;
+		let height = document.getElementById("elMain").clintHeight / 2;
+		that.tableHieght = height;
+	},
+	methods: {
+		handleChange(value) {
+			this.value = value;
+			console.log("Selected value:", value);
+		},
+	},
+};
+</script>

src/views/wpm_gx/handover.vue

@@ -259,7 +259,7 @@ export default {
 			that.$API.mtm.mgroup.list
 			.req({ page: 0, search: that.mgroupName })
 			.then((res) => {
-				if (res.length != 1) {
+				if (res.length < 1) {
 					that.$message.error("获取工段错误");
 					return;
 				}

src/views/wpm_gx/inm.vue

@@ -186,7 +186,7 @@ export default {
 			that.$API.mtm.mgroup.list
 			.req({ page: 0, search: that.mgroupName })
 			.then((res) => {
-				if (res.length != 1) {
+				if (res.length < 1) {
 					that.$message.error("获取工段错误");
 					return;
 				}

src/views/wpm_gx/jianbo.vue

@@ -42,7 +42,7 @@ export default {
 			tableHieght: 200,
 			options: ["日志", "交接记录", "库存"],
 			values: "日志",
-			mgroupName: "减薄",
+			mgroupName: "减薄A",
 			mgroupId: "",
 		};
 	},

src/views/wpm_gx/jianbob.vue

@@ -0,0 +1,62 @@
+<template>
+	<el-container>
+		<el-header>
+			<el-segmented
+				v-model="values"
+				:options="options"
+				size="default"
+			></el-segmented>
+		</el-header>
+		<el-main id="elMain" class="nopadding">
+			<!-- 日志 -->
+			<mlogs
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 60%"
+			></mlogs>
+			<mtask
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 40%"
+			></mtask>
+			<!-- 交接记录 -->
+			<handover
+				v-else-if="values == '交接记录'"
+				:mgroupName="mgroupName"
+			></handover>
+			<!-- 库存 -->
+			<inm v-else :mgroupName="mgroupName"></inm>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+import inm from "./inm.vue";
+import mlogs from "./mlogs.vue";
+import mtask from "./mtask.vue";
+import handover from "./handover.vue";
+export default {
+	components: { inm, mlogs, mtask, handover },
+	data() {
+		return {
+			tableHieght: 200,
+			options: ["日志", "交接记录", "库存"],
+			values: "日志",
+			mgroupName: "减薄B",
+			mgroupId: "",
+		};
+	},
+	created() {},
+	mounted() {
+		let that = this;
+		let height = document.getElementById("elMain").clintHeight / 2;
+		that.tableHieght = height;
+	},
+	methods: {
+		handleChange(value) {
+			this.value = value;
+			console.log("Selected value:", value);
+		},
+	},
+};
+</script>

src/views/wpm_gx/mlogs.vue

@@ -182,7 +182,7 @@ export default {
 		that.$API.mtm.mgroup.list
 			.req({ page: 0, search: that.mgroupName })
 			.then((res) => {
-				if (res.length != 1) {
+				if (res.length < 1) {
 					that.$message.error("获取工段错误");
 					return;
 				}

src/views/wpm_gx/pingmo.vue

@@ -42,7 +42,7 @@ export default {
 			tableHieght: 200,
 			options: ["日志", "交接记录", "库存"],
 			values: "日志",
-			mgroupName: "磨抛",
+			mgroupName: "平磨",
 			mgroupId: "",
 		};
 	},

src/views/wpm_gx/saobian.vue

@@ -42,7 +42,7 @@ export default {
 			tableHieght: 200,
 			options: ["日志", "交接记录", "库存"],
 			values: "日志",
-			mgroupName: "扫边",
+			mgroupName: "扫边A",
 			mgroupId: "",
 		};
 	},

src/views/wpm_gx/saobianb.vue

@@ -0,0 +1,62 @@
+<template>
+	<el-container>
+		<el-header>
+			<el-segmented
+				v-model="values"
+				:options="options"
+				size="default"
+			></el-segmented>
+		</el-header>
+		<el-main id="elMain" class="nopadding">
+			<!-- 日志 -->
+			<mlogs
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 60%"
+			></mlogs>
+			<mtask
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 40%"
+			></mtask>
+			<!-- 交接记录 -->
+			<handover
+				v-else-if="values == '交接记录'"
+				:mgroupName="mgroupName"
+			></handover>
+			<!-- 库存 -->
+			<inm v-else :mgroupName="mgroupName"></inm>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+import inm from "./inm.vue";
+import mlogs from "./mlogs.vue";
+import mtask from "./mtask.vue";
+import handover from "./handover.vue";
+export default {
+	components: { inm, mlogs, mtask, handover },
+	data() {
+		return {
+			tableHieght: 200,
+			options: ["日志", "交接记录", "库存"],
+			values: "日志",
+			mgroupName: "扫边B",
+			mgroupId: "",
+		};
+	},
+	created() {},
+	mounted() {
+		let that = this;
+		let height = document.getElementById("elMain").clintHeight / 2;
+		that.tableHieght = height;
+	},
+	methods: {
+		handleChange(value) {
+			this.value = value;
+			console.log("Selected value:", value);
+		},
+	},
+};
+</script>

src/views/wpm_gx/tuihuo.vue

@@ -42,7 +42,7 @@ export default {
 			tableHieght: 200,
 			options: ["日志", "交接记录", "库存"],
 			values: "日志",
-			mgroupName: "烧结",
+			mgroupName: "退火",
 			mgroupId: "",
 		};
 	},

src/views/wpm_gx/yicipao.vue

@@ -0,0 +1,62 @@
+<template>
+	<el-container>
+		<el-header>
+			<el-segmented
+				v-model="values"
+				:options="options"
+				size="default"
+			></el-segmented>
+		</el-header>
+		<el-main id="elMain" class="nopadding">
+			<!-- 日志 -->
+			<mlogs
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 60%"
+			></mlogs>
+			<mtask
+				v-if="values == '日志'"
+				:mgroupName="mgroupName"
+				style="height: 40%"
+			></mtask>
+			<!-- 交接记录 -->
+			<handover
+				v-else-if="values == '交接记录'"
+				:mgroupName="mgroupName"
+			></handover>
+			<!-- 库存 -->
+			<inm v-else :mgroupName="mgroupName"></inm>
+		</el-main>
+	</el-container>
+</template>
+
+<script>
+import inm from "./inm.vue";
+import mlogs from "./mlogs.vue";
+import mtask from "./mtask.vue";
+import handover from "./handover.vue";
+export default {
+	components: { inm, mlogs, mtask, handover },
+	data() {
+		return {
+			tableHieght: 200,
+			options: ["日志", "交接记录", "库存"],
+			values: "日志",
+			mgroupName: "一次抛",
+			mgroupId: "",
+		};
+	},
+	created() {},
+	mounted() {
+		let that = this;
+		let height = document.getElementById("elMain").clintHeight / 2;
+		that.tableHieght = height;
+	},
+	methods: {
+		handleChange(value) {
+			this.value = value;
+			console.log("Selected value:", value);
+		},
+	},
+};
+</script>