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

src/views/bigScreen/index_enm.vue

@@ -102,11 +102,11 @@
         <div class="chart" id="chart1"></div>
       </div>
       <div class="panel">
-        <div class="panel_title">原煤消耗趋势图</div>
+        <div class="panel_title">工业水/原煤消耗趋势图</div>
         <div class="chart" id="chart2"></div>
       </div>
       <div class="panel">
-        <div class="panel_title">工业水/压缩空气消耗趋势图</div>
+        <div class="panel_title">压缩空气消耗趋势图</div>
         <div class="chart" id="chart3"></div>
       </div>
     </div>

src/views/login/index.vue

@@ -1,7 +1,8 @@
 <template>
 	<div class="login_bg">
 		<!-- <div class="right-con" :style="{backgroundImage: 'url(' + baseConfig.base_logo + ')'}"></div> -->
-		<div class="login_adv" :style="{'background-image':baseConfig.base_logo_side==''?'url(img/logo_side.png)':'url('+baseConfig.base_logo_side+')'}">
+		<div class="login_adv"
+			:style="{ 'background-image': baseConfig.base_logo_side == '' ? 'url(img/logo_side.png)' : 'url(' + baseConfig.base_logo_side + ')' }">
 			<div class="login_adv__title">
 				<h2 v-if="baseConfig.base_name">{{ baseConfig.base_name }}</h2>
 			</div>
@@ -12,7 +13,8 @@
 		</div>
 		<div class="login_main">
 			<div class="login_config">
-				<el-button :icon="config.dark?'el-icon-sunny':'el-icon-moon'" circle type="info" @click="configDark"></el-button>
+				<el-button :icon="config.dark ? 'el-icon-sunny' : 'el-icon-moon'" circle type="info"
+					@click="configDark"></el-button>
 
 			</div>
 			<div class="login-form">
@@ -44,7 +46,8 @@
 				<div class="login-oauth" v-if="baseConfig.base_name == '曲阳金隅安全智能管控平台'">
 					<el-button type="default" @click="appDown">安卓APP</el-button>
 					<el-button type="default" @click="h5Show">H5访问</el-button>
-					<el-button type="primary" @click="MonitorOpen" style="background-color:orange;border-color:orange">监控视频</el-button>
+					<el-button type="primary" @click="MonitorOpen"
+						style="background-color:orange;border-color:orange">监控视频</el-button>
 				</div>
 				<!-- <div class="login-oauth" v-else>
 					<el-button type="default" @click="faceLogin">刷脸登录</el-button>
@@ -57,7 +60,8 @@
 			<sc-qr-code class="qrCode" :text="WechatLoginCode" :size="200"></sc-qr-code>
 			<p class="msg">{{ $tc('login.wechatLoginMsg', 1) }}<br />{{ $tc('login.wechatLoginMsg', 2) }}</p>
 			<div class="qrCodeLogin-result" v-if="isWechatLoginResult">
-				<el-result icon="success" :title="$tc('login.wechatLoginResult', 1)" :sub-title="$tc('login.wechatLoginResult', 2)"></el-result>
+				<el-result icon="success" :title="$tc('login.wechatLoginResult', 1)"
+					:sub-title="$tc('login.wechatLoginResult', 2)"></el-result>
 			</div>
 		</div>
 	</el-dialog>
@@ -147,7 +151,7 @@
 		//console.log('%c SCUI %c Gitee: https://gitee.com/lolicode/scui', 'background:#666;color:#fff;border-radius:3px;', '')
 	},
 	mounted() {
-			let url1 = window.location.origin;
+		let url1 = window.location.href;
 		this.project_code = url1.split('/')[3];
 		this.getDept();
 	},
@@ -205,67 +209,246 @@
 </script>
 
 <style scoped>
-	.login_bg {width: 100%;height: 100%;background: #fff;display: flex;}
+.login_bg {
-	.login_adv {width: 33.33333%;background-color: #555;background-size: cover;background-position: center center;background-repeat: no-repeat;position: relative;}
+	width: 100%;
-	.login_adv__title {color: #fff;padding: 40px;position: absolute;top:0px;left:0px;right: 0px;z-index: 2;}
+	height: 100%;
-	.login_adv__title h2 {font-size: 30px;}
+	background: #fff;
-	.login_adv__title h4 {font-size: 18px;margin-top: 10px;font-weight: normal;}
+	display: flex;
-	.login_adv__title p {font-size: 14px;margin-top:10px;line-height: 1.8;color: rgba(255,255,255,0.6);}
+}
-	.login_adv__title div {margin-top: 10px;display: flex;align-items: center;}
+
-	.login_adv__title div span {margin-right: 15px;}
+.login_adv {
-	.login_adv__title div i {font-size: 40px;}
+	width: 33.33333%;
-	.login_adv__title div i.add {font-size: 20px;color: rgba(255,255,255,0.6);}
+	background-color: #555;
-	.login_adv__bottom {position: absolute;left:0px;right: 0px;bottom: 0px;color: #fff;padding: 40px;background-image:linear-gradient(transparent, #000);z-index: 3;}
+	background-size: cover;
-	.login_adv__mask {position: absolute;top:0px;left:0px;right: 0px;bottom: 0px;z-index: 1;}
+	background-position: center center;
+	background-repeat: no-repeat;
+	position: relative;
+}
+
+.login_adv__title {
+	color: #fff;
+	padding: 40px;
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	right: 0px;
+	z-index: 2;
+}
+
+.login_adv__title h2 {
+	font-size: 30px;
+}
+
+.login_adv__title h4 {
+	font-size: 18px;
+	margin-top: 10px;
+	font-weight: normal;
+}
+
+.login_adv__title p {
+	font-size: 14px;
+	margin-top: 10px;
+	line-height: 1.8;
+	color: rgba(255, 255, 255, 0.6);
+}
+
+.login_adv__title div {
+	margin-top: 10px;
+	display: flex;
+	align-items: center;
+}
+
+.login_adv__title div span {
+	margin-right: 15px;
+}
+
+.login_adv__title div i {
+	font-size: 40px;
+}
+
+.login_adv__title div i.add {
+	font-size: 20px;
+	color: rgba(255, 255, 255, 0.6);
+}
+
+.login_adv__bottom {
+	position: absolute;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	color: #fff;
+	padding: 40px;
+	background-image: linear-gradient(transparent, #000);
+	z-index: 3;
+}
+
+.login_adv__mask {
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	z-index: 1;
+}
+
+.login_main {
+	flex: 1;
+	overflow: auto;
+	display: flex;
+}
+
+.login-form {
+	width: 410px;
+	margin: auto;
+	padding: 20px 0;
+}
+
+.login-header {
+	margin-bottom: 40px;
+	width: 460px;
+}
+
+.login-header .logo {
+	display: flex;
+	align-items: center;
+}
 
-	.login_main {flex: 1;overflow: auto;display:flex;}
-	.login-form {width: 410px;margin: auto;padding:20px 0;}
-	.login-header {margin-bottom: 40px;    width: 460px;}
-	.login-header .logo {display: flex;align-items: center;}
 /* .login-header .logo img {width: 130px;vertical-align: bottom;margin-right: 10px;} */
-	.login-header .logo img {width: 60px;height: 60px;vertical-align: bottom;margin-right: 10px;}
+.login-header .logo img {
-	.login-header .logo label {font-size: 26px;font-weight: bold;}
+	width: 60px;
-	.login-oauth {display: flex;justify-content:space-around;}
+	height: 60px;
-	.login-form .el-divider {margin-top:40px;}
+	vertical-align: bottom;
+	margin-right: 10px;
+}
+
+.login-header .logo label {
+	font-size: 26px;
+	font-weight: bold;
+}
+
+.login-oauth {
+	display: flex;
+	justify-content: space-around;
+}
+
+.login-form .el-divider {
+	margin-top: 40px;
+}
 
 .login-form {}
-	.login-form:deep(.el-tabs) .el-tabs__header {margin-bottom: 25px;}
-	.login-form:deep(.el-tabs) .el-tabs__header .el-tabs__item {font-size: 14px;}
 
-	.login-form:deep(.login-forgot) {text-align: right;}
+.login-form:deep(.el-tabs) .el-tabs__header {
-	.login-form:deep(.login-forgot) a {color: var(--el-color-primary);}
+	margin-bottom: 25px;
-	.login-form:deep(.login-forgot) a:hover {color: var(--el-color-primary-light-3);}
+}
-	.login-form:deep(.login-reg) {font-size: 14px;color: var(--el-text-color-primary);}
-	.login-form:deep(.login-reg) a {color: var(--el-color-primary);}
-	.login-form:deep(.login-reg) a:hover {color: var(--el-color-primary-light-3);}
 
-	.login_config {position: absolute;top:20px;right: 20px;}
+.login-form:deep(.el-tabs) .el-tabs__header .el-tabs__item {
+	font-size: 14px;
+}
 
-	.login-form:deep(.login-msg-yzm) {display: flex;width: 100%;}
+.login-form:deep(.login-forgot) {
-	.login-form:deep(.login-msg-yzm) .el-button {margin-left: 10px;--el-button-size:42px;}
+	text-align: right;
+}
 
-	.qrCodeLogin {text-align: center;position: relative;padding: 20px 0;}
+.login-form:deep(.login-forgot) a {
-	.qrCodeLogin img.qrCode {background: #fff;padding:20px;border-radius:10px;}
+	color: var(--el-color-primary);
-	.qrCodeLogin p.msg {margin-top: 15px;}
+}
-	.qrCodeLogin .qrCodeLogin-result {position: absolute;top:0;left:0;right: 0;bottom: 0;text-align: center;background: var(--el-mask-color);}
+
+.login-form:deep(.login-forgot) a:hover {
+	color: var(--el-color-primary-light-3);
+}
+
+.login-form:deep(.login-reg) {
+	font-size: 14px;
+	color: var(--el-text-color-primary);
+}
+
+.login-form:deep(.login-reg) a {
+	color: var(--el-color-primary);
+}
+
+.login-form:deep(.login-reg) a:hover {
+	color: var(--el-color-primary-light-3);
+}
+
+.login_config {
+	position: absolute;
+	top: 20px;
+	right: 20px;
+}
+
+.login-form:deep(.login-msg-yzm) {
+	display: flex;
+	width: 100%;
+}
+
+.login-form:deep(.login-msg-yzm) .el-button {
+	margin-left: 10px;
+	--el-button-size: 42px;
+}
+
+.qrCodeLogin {
+	text-align: center;
+	position: relative;
+	padding: 20px 0;
+}
+
+.qrCodeLogin img.qrCode {
+	background: #fff;
+	padding: 20px;
+	border-radius: 10px;
+}
+
+.qrCodeLogin p.msg {
+	margin-top: 15px;
+}
+
+.qrCodeLogin .qrCodeLogin-result {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	text-align: center;
+	background: var(--el-mask-color);
+}
 
 @media (max-width: 1200px) {
-		.login-form {width: 340px;}
+	.login-form {
+		width: 340px;
 	}
+}
+
 @media (max-width: 1000px) {
-		.login_main {display: block;}
+	.login_main {
-		.login_main .login_config {position: static;padding:20px 20px 0 20px;text-align: right;}
+		display: block;
-		.login-form {width:100%;padding:20px 40px;}
-		.login_adv {display: none;}
 	}
+
+	.login_main .login_config {
+		position: static;
+		padding: 20px 20px 0 20px;
+		text-align: right;
+	}
+
+	.login-form {
+		width: 100%;
+		padding: 20px 40px;
+	}
+
+	.login_adv {
+		display: none;
+	}
+}
+
 #loginFaceWrap {
 	width: 664px !important;
 }
+
 .testTracking {
 	width: 600px;
 	height: 500px;
 	margin-left: 20px;
 }
+
 #photonImg {
 	width: 100%;
 }

src/views/wpm/mlog_dept10.vue

@@ -258,9 +258,10 @@
                 </el-main>
             </el-container>
         </el-main>
-        <save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup"
+        <save-dialog v-if="dialogSave" ref="saveDialog" :mtask="currentMtask.id" :mgroup="mgroup" :mtaskDate="mtaskDate"
-            :material_out="material_out" :material_model="material_model" :brothersList="brothersList" :material_in="material_in" :activeType="activeName"
+            :material_out="material_out" :material_model="material_model" :brothersList="brothersList"
-            @success="handleSaveSuccess" @closed="dialogSave = false"></save-dialog>
+            :material_in="material_in" :activeType="activeName" @success="handleSaveSuccess"
+            @closed="dialogSave = false"></save-dialog>
         <showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false">
         </showDrawer>
         <el-dialog title="编辑任务" v-model="addMtaskInfoVisible">
@@ -313,6 +314,7 @@ export default {
             paramsWm: {},
             mgroup: '',
             mlogId: '',
+            mtaskDate: '',
             material_out: '',
             material_model: '',
         }
@@ -400,6 +402,7 @@ export default {
             let that = this;
             if (that.currentMtask && that.currentMtask.id) {
                 that.mgroup = that.currentMtask.mgroup;
+                that.mtaskDate = that.currentMtask.start_date;
                 that.material_out = that.currentMtask.material_out;
                 that.material_model = that.currentMtask.material_out_.model;
                 let arr = [];

src/views/wpm/worktask_form.vue

@@ -479,7 +479,8 @@
           <el-col :md="12" :sm="24">
             <el-form-item label="生产任务">
               <el-select v-model="item.material_out" placeholder="产品名称" disabled style="width: 100%">
-                <el-option v-for="item in materialOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                <el-option v-for="item in materialOptions" :key="item.id" :label="item.full_name"
+                  :value="item.id"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -576,6 +577,7 @@ export default {
     material_out: { type: String, default: "" },
     material_model: { type: String, default: "" },
     brothersList: { type: Array, default: () => [] },
+    mtaskDate: { type: String, default: "" }
   },
   data() {
     return {
@@ -644,7 +646,15 @@ export default {
     this.form.mtask = this.mtask;
     this.form.mgroup = this.mgroup;
     this.form.handle_date = handle_date;
-    this.form.batch = this.material_model + '-' + dateNow;
+    let batchDate = '';
+    console.log(this.mtaskDate);
+    if (this.mtaskDate !== '') {
+      batchDate = this.mtaskDate.split('-').join('');
+      console.log(batchDate);
+    } else {
+      batchDate = dateNow;
+    }
+    this.form.batch = this.material_model + '-' + batchDate;
     this.getMaterial();
     this.getUserList();
     this.getEquipment();
@@ -776,7 +786,7 @@ export default {
             for (var i = 0; i < res.length; i++) {
               mOptions.push({
                 id: res[i].material_out,
-                name: res[i].material_out_name,
+                full_name: res[i].material_out_name,
                 material_in: res[i].material_in
               });
             }
@@ -786,6 +796,7 @@ export default {
         let obj = {};
         obj.page = 0;
         obj.is_hidden = false;
+        obj.type__in = '10,20,30';
         this.$API.mtm.material.list.req(obj).then((res) => {
           this.materialOptions = res;
         });