.env.dev

@@ -31,6 +31,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

.env.front

@@ -14,6 +14,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

.env.prod

@@ -28,6 +28,9 @@ VUE_APP_APP_NAME ='yudao-admin'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = false
 

.env.stage

@@ -15,6 +15,9 @@ PUBLIC_PATH = 'http://static.yudao.iocoder.cn/'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = false
 

.env.static

@@ -17,6 +17,9 @@ VUE_APP_APP_NAME ='/admin-ui-vue2/'
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
 
+# 验证码的开关
+VUE_APP_CAPTCHA_ENABLE = true
+
 # 文档的开关
 VUE_APP_DOC_ENABLE = true
 

src/utils/ruoyi.js

@@ -187,6 +187,19 @@ export function getTenantEnable() {
   return process.env.VUE_APP_TENANT_ENABLE || true;
 }
 
+/**
+ * 获得验证码功能是否开启
+ */
+export function getCaptchaEnable() {
+  if (process.env.VUE_APP_CAPTCHA_ENABLE === "true") {
+    return true;
+  }
+  if (process.env.VUE_APP_CAPTCHA_ENABLE === "false") {
+    return false;
+  }
+  return process.env.VUE_APP_CAPTCHA_ENABLE || true;
+}
+
 /**
  * 获得文档是否开启
  */

src/views/core/analysis/balanceAnalysis/chart.vue

@@ -1,228 +0,0 @@
-<!-- 
-    filename: chart.vue
-    author: liubin
-    date: 2023-11-29 09:03:01
-    description: 
--->
-
-<template>
-	<div class="analysis-chart">
-		<!-- tt ct 选择  -->
-		<el-button
-			v-for="(item, index) in ['设备CT', '设备TT', '产线CT', '产线TT']"
-			:key="index"
-			:class="[index == activeIndex ? 'activeButton' : '']"
-			@click="activeIndex = index">
-			{{ item }}
-		</el-button>
-		<!-- chart  -->
-		<div id="chart" ref="chartDiv" class="chart" style="margin-top: 12px" />
-	</div>
-</template>
-
-<script>
-import * as echarts from 'echarts';
-
-export default {
-	name: 'AnalysisChart',
-	components: {},
-	props: ['daterange', 'tableData'],
-	data() {
-		return {
-			activeIndex: 0,
-			chart: null,
-			templateOption: {
-				tooltip: {
-					trigger: 'axis',
-				},
-				legend: {
-					icon: 'roundRect',
-					itemWidth: 12,
-					itemHeight: 12,
-				},
-				grid: {
-					top: '12%',
-					left: '6%',
-					right: '6%',
-					bottom: '12%',
-				},
-				xAxis: {
-					name: '时间',
-					axisLabel: {
-						margin: 12,
-						rotate: -8,
-					},
-					axisTicks: {
-						show: false,
-					},
-					data: this.daterange || [
-						'2020-01-02',
-						'2020-02-02',
-						'2020-03-02',
-						'2020-04-02',
-					],
-				},
-				yAxis: {
-					name: ['设备CT', '设备TT', '产线CT', '产线TT'][this.activeIndex],
-					nameLocation: 'end',
-					nameGap: 28,
-					nameTextStyle: {
-						fontSize: 14,
-						align: 'right',
-					},
-					axisLine: {
-						show: true,
-						lineStyle: {
-							color: '#333',
-							opacity: 0.6,
-						},
-					},
-				},
-				series: [
-					{
-						name: 'der Hund',
-						type: 'line',
-						data: [15, undefined, 36, 11],
-					},
-					{
-						name: 'die Katze',
-						type: 'line',
-						data: [5, 2, 6, 3],
-					},
-					{
-						name: 'die Maus',
-						type: 'line',
-						data: [11, 12, 13, 10],
-					},
-				],
-			},
-		};
-	},
-	mounted() {
-		this.initChart();
-	},
-	deactivated() {},
-	watch: {
-		activeIndex(val) {
-			this.initChart(val);
-		},
-	},
-	methods: {
-		/**
-		 *
-		 * @param {object} row 表格的每一列
-		 * @param {string} key 表格列prop的后缀
-		 */
-		getListFromTableRow(row, key = '_eq_ct') {
-			const list = [];
-			for (const prop of Object.keys(row).sort()) {
-				if (prop.endsWith(key)) {
-					list.push(row[prop]);
-				}
-			}
-			return list;
-		},
-		/** 初始化/设置 图表 */
-		initChart(val) {
-			console.log('tableData', this.tableData);
-			if (!this.chart) this.chart = echarts.init(this.$refs.chartDiv);
-			switch (val) {
-				case 0:
-					const eqCt = this.tableData.map((row) => ({
-						name: row.equName,
-						type: 'line',
-						symbol: 'circle',
-						symbolSize: 8,
-						data: this.getListFromTableRow(row, '_eq_ct'),
-					}));
-					this.chart.setOption({
-						...this.templateOption,
-						yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
-						series: eqCt,
-					});
-					break;
-				case 1:
-					const eqTt = this.tableData.map((row) => ({
-						name: row.equName,
-						type: 'line',
-						symbol: 'circle',
-						symbolSize: 8,
-						data: this.getListFromTableRow(row, '_eq_tt'),
-					}));
-					this.chart.setOption({
-						...this.templateOption,
-						yAxis: { ...this.templateOption.yAxis, name: '设备TT' },
-						series: eqTt,
-					});
-					break;
-				case 2:
-					const plCt = this.tableData.map((row) => ({
-						name: row.equName,
-						type: 'line',
-						symbol: 'circle',
-						symbolSize: 8,
-						data: this.getListFromTableRow(row, '_pl_ct'),
-					}));
-					this.chart.setOption({
-						...this.templateOption,
-						yAxis: { ...this.templateOption.yAxis, name: '产线CT' },
-						series: plCt,
-					});
-					break;
-				case 3:
-					const plTt = this.tableData.map((row) => ({
-						name: row.equName,
-						type: 'line',
-						symbol: 'circle',
-						symbolSize: 8,
-						data: this.getListFromTableRow(row, '_pl_tt'),
-					}));
-					this.chart.setOption({
-						...this.templateOption,
-						yAxis: { ...this.templateOption.yAxis, name: '产线TT' },
-						series: plTt,
-					});
-					break;
-				default:
-					const eqCt2 = this.tableData.map((row) => ({
-						name: row.equName,
-						type: 'line',
-						symbol: 'circle',
-						symbolSize: 8,
-						data: this.getListFromTableRow(row, '_eq_ct'),
-					}));
-					this.chart.setOption({
-						...this.templateOption,
-						yAxis: { ...this.templateOption.yAxis, name: '设备CT' },
-						series: eqCt2,
-					});
-			}
-		},
-	},
-};
-</script>
-
-<style scoped>
-.analysis-chart {
-	width: 100%;
-	height: 100%;
-}
-
-.analysis-chart >>> .el-button {
-	background: #f1f1f1;
-	color: #333;
-	transition: all 0.3s;
-	border: none;
-
-	&.activeButton,
-	&:hover {
-		background: #0b58ff;
-		color: #fff;
-	}
-}
-
-#chart {
-	height: 100%;
-	/* background: #ccc; */
-}
-</style>

src/views/core/analysis/balanceAnalysis/index.vue

@@ -1,56 +1,51 @@
 <template>
-	<div class="app-container" style="flex: 1; height: 1px">
+	<div class="app-container">
 		<search-bar
 			:formConfigs="formConfig"
 			ref="searchBarForm"
 			@headBtnClick="handleSearchBarBtnClick" />
 
 		<!-- <div v-if="tableData.length"> -->
-		<div class="custom-tabs" style="">
 		<el-tabs
 			v-model="activeName"
 			@tab-click="handleTabClick"
 			style="height: 100%">
 			<el-tab-pane :label="'\u2002数据列表\u2002'" name="table">
+				<!-- @emitFun="handleEmitFun"> -->
 				<base-table
-						v-if="activeName == 'table' && ready"
+					v-if="activeName == 'table'"
-						:span-method="mergeRow"
+					:span-method="mergeColumnHandler"
 					:page="1"
 					:limit="999"
 					:table-props="tableProps"
 					:table-data="tableData" />
-					<div v-if="tableData.length == 0" class="no-data-bg"></div>
 			</el-tab-pane>
 			<el-tab-pane :label="'\u3000产线平衡分析图\u3000'" name="graph">
-					<div class="graph" style="height: 800px">
+				<div class="graph" style="height: 100%">
 					<!-- graph  -->
-						<AnalysisChart
-							v-if="activeName == 'graph'"
-							:table-data="tableData"
-							:daterange="dateArr"></AnalysisChart>
-						<!-- <div v-else class="no-data-bg"></div> -->
 					<!-- <Graph
 										v-if="list.length"
 										:equipment-list="list"
 										:render="renderKey" /> -->
 					<!-- <BalanceChart ref="lineChart" /> -->
-						<!-- <div v-if="list.length == 0" class="no-data-bg"></div> -->
+					<div v-if="list.length == 0" class="no-data-bg"></div>
 				</div>
 			</el-tab-pane>
 		</el-tabs>
-		</div>
+
+		<!-- <SearchBar :formConfigs="[{ label: '产线平衡分析图', type: 'title' }]" /> -->
+		<!-- </div>
+		<div v-else class="no-data-bg"></div> -->
 	</div>
 </template>
 
 <script>
 import BalanceChart from '../balanceChart';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
-import AnalysisChart from './chart.vue';
 
 export default {
 	components: {
 		BalanceChart,
-		AnalysisChart,
 	},
 	mixins: [basicPageMixin],
 	data() {
@@ -103,13 +98,6 @@ export default {
 				startTime: null,
 				endTime: null,
 			},
-			sectionMap: {},
-			lastSection: null,
-			currRowIndex: 0,
-			spanArr: [],
-			// 保存时间列表
-			dateArr: [],
-			ready: false,
 		};
 	},
 
@@ -168,19 +156,11 @@ export default {
 			const { data, nameData } = await this.getCT();
 			await this.buildProps(nameData);
 			await this.buildTableData(data);
-			this.tableData = this.tableData.sort((a, b) => {
+			const xxxx = this.tableData;
-				if (a.sectionName < b.sectionName) return -1;
+			debugger;
-				return 1;
-			});
-			// const p = this.tableProps
-			// const d = this.tableData
-			// debugger;
-			this.ready = true;
 		},
 
 		buildProps(nameData) {
-			this.initTableProps();
-			this.dateArr = [];
 			return new Promise((resolve, reject) => {
 				try {
 					const dateArr = Array.from(
@@ -219,7 +199,7 @@ export default {
 							],
 						});
 					});
-					this.dateArr = dateArr;
+
 					resolve();
 				} catch (err) {
 					reject(err);
@@ -228,69 +208,39 @@ export default {
 		},
 
 		async buildTableData(data) {
-			this.tableData = [];
-			const sectionArr = Array.from(
-				new Set(data.map((item) => item.sectionName))
-			).sort();
-
-			const sectionMap = sectionArr.reduce(
-				(sum, curr) => ({ ...sum, [curr]: 0 }),
-				{}
-			);
-
-			console.log('sectionArr', sectionArr);
-			console.log('sectionMap', sectionMap);
-			let spanArr = Array.from(sectionArr, () => 0);
-
-			return new Promise((resolve, reject) => {
 			/** 处理 工段 分组  */
-				data.map((item) => {
+			const sectionList = data.map((item) => {});
-					sectionMap[item.sectionName]++;
+		},
-					/** 处理 设备  */
-					const row = {
-						equName: item.equName,
-						sectionName: item.sectionName,
-					};
-					item.data.forEach((eq) => {
-						const date = eq.dynamicName;
-						eq.children.forEach((sub) => {
-							if (sub.dynamicName == '设备CT')
-								row[date + '_eq_ct'] = sub.dynamicValue;
-							if (sub.dynamicName == '设备TT')
-								row[date + '_eq_tt'] = sub.dynamicValue;
-							if (sub.dynamicName == '产线CT')
-								row[date + '_pl_ct'] = sub.dynamicValue;
-							if (sub.dynamicName == '产线TT')
-								row[date + '_pl_tt'] = sub.dynamicValue;
-						});
-					});
-					this.tableData.push(row);
-				});
 
-				/** 生成span数组 */
+		setRowSpan(arr) {
-				const tmp = [...spanArr];
+			let count = 0;
-				for (const [index, key] of sectionArr.entries()) {
+			arr.forEach((item, index) => {
-					tmp[index + 1] = tmp[index] + sectionMap[key];
+				if (index === 0) {
+					this.spanArr.push(1);
+				} else {
+					if (item === arr[index - 1]) {
+						this.spanArr[count] += 1;
+						this.spanArr.push(0);
+					} else {
+						count = index;
+						this.spanArr.push(1);
+					}
 				}
-
-				console.log('tep', tmp);
-				spanArr = tmp;
-
-				this.sectionMap = sectionMap;
-				this.spanArr = spanArr;
-				resolve();
 			});
 		},
 
-		mergeRow({ row, column, rowIndex, columnIndex }) {
+		/** 合并table列的规则 */
-			if (columnIndex == 1) {
+		mergeColumnHandler({ row, column, rowIndex, columnIndex }) {
-				const span = this.sectionMap[row.sectionName];
+			if (columnIndex == 0) {
-				if (this.spanArr.includes(rowIndex)) {
+				if (this.spanArr[rowIndex]) {
-					console.log('span...');
+					return [
-					return [span, 1];
+						this.spanArr[rowIndex], // row span
-				}
+						1, // col span
+					];
+				} else {
 					return [0, 0];
 				}
+			}
 		},
 
 		getData() {
@@ -369,7 +319,6 @@ export default {
 				// this.dataListLoading = false;
 			});
 		},
-
 		handleSearchBarBtnClick(btn) {
 			switch (btn.btnName) {
 				case 'search':
@@ -432,23 +381,3 @@ export default {
 	},
 };
 </script>
-<style scoped>
-.custom-tabs >>> .el-tabs__header {
-	margin-bottom: 8px;
-	display: inline-block;
-	transform: translateY(-12px);
-}
-.custom-tabs >>> .el-tabs__item {
-	padding-left: 0px !important;
-	padding-right: 0px !important;
-	line-height: 36px !important;
-	height: 36px;
-}
-
-.custom-tabs >>> .el-tabs__content {
-	height: calc(100% - 42px);
-}
-.custom-tabs >>> .el-tab-pane {
-	height: 100%;
-}
-</style>

src/views/equipment/timing-diagram/status/index.vue

@@ -80,8 +80,6 @@
 			<el-select
 				v-if="open"
 				style="width: 100%"
-				filterable
-				clearable
 				v-model="queryParams.equipmentId"
 				placeholder="请选择一个设备">
 				<el-option

src/views/login.vue

@@ -80,6 +80,13 @@
 
 				<!-- 表单 -->
 				<div class="form-cont">
+					<el-tabs
+						class="form"
+						v-model="loginForm.loginType"
+						style="float: none">
+						<el-tab-pane label="账号密码登录" name="uname"></el-tab-pane>
+						<el-tab-pane label="短信验证码登录" name="sms"></el-tab-pane>
+					</el-tabs>
 					<div style="">
 						<el-form
 							ref="loginForm"
@@ -99,7 +106,7 @@
 								</el-input>
 							</el-form-item>
 							<!-- 账号密码登录 -->
-							<div>
+							<div v-if="loginForm.loginType === 'uname'">
 								<el-form-item prop="username">
 									<el-input
 										v-model="loginForm.username"
@@ -132,6 +139,56 @@
 								</el-checkbox>
 							</div>
 
+							<!-- 短信验证码登录 -->
+							<div v-if="loginForm.loginType === 'sms'">
+								<el-form-item prop="mobile">
+									<el-input
+										v-model="loginForm.mobile"
+										type="text"
+										auto-complete="off"
+										placeholder="请输入手机号">
+										<!-- <svg-icon
+											slot="prefix"
+											icon-class="phone"
+											class="el-input__icon input-icon" /> -->
+									</el-input>
+								</el-form-item>
+								<el-form-item prop="mobileCode">
+									<el-input
+										v-model="loginForm.mobileCode"
+										type="text"
+										auto-complete="off"
+										placeholder="短信验证码"
+										class="sms-login-mobile-code-prefix"
+										@keyup.enter.native="handleLogin">
+										<!-- <template>
+											<svg-icon
+												slot="prefix"
+												icon-class="password"
+												class="el-input__icon input-icon" />
+										</template> -->
+										<template slot="suffix">
+											<span
+												v-if="mobileCodeTimer <= 0"
+												class="getMobileCode"
+												@click="getSmsCode"
+												style="
+													cursor: pointer;
+													color: #0b58ff;
+													font-size: calc(12 * 0.12vh);
+													line-height: calc(54 * 0.12vh);
+													padding-right: calc(10 * 0.12vh);
+												">
+												获取验证码
+											</span>
+											<span v-if="mobileCodeTimer > 0" class="getMobileCode">
+												{{ mobileCodeTimer }}秒后可重新获取
+											</span>
+										</template>
+									</el-input>
+								</el-form-item>
+							</div>
+
 							<!-- 下方的登录按钮 -->
 							<el-form-item
 								id="button-form-item"
@@ -170,6 +227,13 @@
 				</div>
 			</div>
 		</div>
+
+		<!-- 图形验证码 -->
+		<Verify
+			ref="verify"
+			:captcha-type="'blockPuzzle'"
+			:img-size="{ width: '400px', height: '200px' }"
+			@success="handleLogin" />
 	</div>
 </template>
 
@@ -177,7 +241,7 @@
 import { sendSmsCode, socialAuthRedirect } from '@/api/login';
 import { getTenantIdByName } from '@/api/system/tenant';
 import { SystemUserSocialTypeEnum } from '@/utils/constants';
-import { getTenantEnable } from '@/utils/ruoyi';
+import { getCaptchaEnable, getTenantEnable } from '@/utils/ruoyi';
 import {
 	getPassword,
 	getRememberMe,
@@ -205,7 +269,7 @@ export default {
 	data() {
 		return {
 			codeUrl: '',
-			captchaEnable: false,
+			captchaEnable: true,
 			tenantEnable: true,
 			mobileCodeTimer: 0,
 			loginForm: {
@@ -283,6 +347,8 @@ export default {
 				}
 			});
 		}
+		// 验证码开关
+		this.captchaEnable = getCaptchaEnable();
 		// 重定向地址
 		this.redirect = this.$route.query.redirect
 			? decodeURIComponent(this.$route.query.redirect)
@@ -294,7 +360,15 @@ export default {
 	},
 	methods: {
 		getCode() {
+			// 情况一，未开启：则直接登录
+			if (!this.captchaEnable) {
 				this.handleLogin({});
+				return;
+			}
+
+			// 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录
+			// 弹出验证码
+			this.$refs.verify.show();
 		},
 		getCookie() {
 			const username = getUsername();
@@ -448,7 +522,4 @@ export default {
 		top: 22%;
 	}
 }
-.form-cont {
-	padding-top: 40px;
-}
 </style>

src/views/monitoring/equipmentFullParams/index.vue

@@ -115,12 +115,12 @@ export default {
 				vm.$set(
 					vm.searchBarFormConfig[0],
 					'defaultSelect',
-					to.params.equipmentName
+					to.params.equipmentCode
 				);
 				vm.$set(
 					vm.searchBarFormConfig[1],
 					'defaultSelect',
-					to.params.equipmentCode
+					to.params.equipmentName
 				);
 				vm.handleQuery();
 			});

src/views/monitoring/equipmentProcessAmount/index.vue

@@ -33,7 +33,7 @@
 							:data-value="fc.id"
 							class="factory-list__item"
 							:class="{ 'is-current': fc.id == currentFactory?.id }">
-							<span :data-value="fc.id">
+							<span>
 								{{ fc.label }}
 							</span>
 							<svg-icon
@@ -98,7 +98,9 @@
 								</base-table>
 							</el-tab-pane>
 							<el-tab-pane :label="'\u3000柱状图\u3000'" name="graph">
-								<div class="graph" style="height: 100%">
+								<div
+									class="graph"
+									style="height: 100%;">
 									<!-- graph  -->
 									<Graph
 										v-if="list.length"

src/views/quality/monitoring/currentData/index.vue

@@ -11,7 +11,7 @@
             <base-table class="base-table__margin" :table-props="productProps" :page="1" :limit="10" :table-data="list">
             </base-table>
             <div v-for="(item,index) in downProps" :key="index">
-              <div class="blue-title">工单名称:{{ list[index].workOrderName }}</div>
+              <div class="blue-title">工单:{{ list[index].workOrderName }}</div>
               <base-table class="base-table__margin" :table-props="item" :page="1" :limit="10"
                 :table-data="downList[index]">
               </base-table>
@@ -214,7 +214,7 @@ export default {
         {
           // width: 160,
           prop: 'workOrderName',
-          label: '工单名称',
+          label: '工单名',
         },
         ...this.dynamicProps,
         {

src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue

@@ -9,8 +9,8 @@
   <el-form ref="form" :model="innerDataForm" label-width="100px" v-loading="formLoading">
     <el-row :gutter="20">
       <el-col :span="12">
-        <el-form-item label="工单名称" prop="workOrderId" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
+        <el-form-item label="工单号" prop="workOrderId" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
-          <el-select v-model="innerDataForm.workOrderId" placeholder="请选择工单名称" filterable clearable>
+          <el-select v-model="innerDataForm.workOrderId" placeholder="请选择工单号" filterable clearable>
             <el-option v-for="opt in workOrderList" :key="opt.value" :label="opt.label" :value="opt.value" />
           </el-select>
         </el-form-item>

src/views/quality/monitoring/qualityInspectionRecord/index.vue

@@ -141,8 +141,8 @@ export default {
 			searchBarFormConfig: [
 				{
 					type: 'select',
-          label: '工单名称',
+					label: '工单号',
-          placeholder: '请选择工单名称',
+          placeholder: '请选择工单号',
 					param: 'workOrderId',
           selectOptions: [],
           filterable:true
@@ -215,7 +215,7 @@ export default {
         {
           // width: 128,
           prop: 'workOrderName',
-          label: '工单名称',
+          label: '工单Id',
         },
 				{
 					// width: 128,

src/views/quality/monitoring/statisticalData/index.vue

@@ -67,8 +67,8 @@ export default {
       searchBarFormConfig: [
         {
           type: 'select',
-          label: '工单名称',
+          label: '工单号',
-          placeholder: '请选择工单名称',
+          placeholder: '请选择工单号',
           param: 'workOrderIdList',
           selectOptions: [],
           multiple: true,
@@ -205,8 +205,8 @@ export default {
       return [
         {
           // width: 128,
-          prop: 'workOrderName',
+          prop: 'workOrderId',
-          label: '工单名称',
+          label: '工单号',
         },
         {
           // width: 128,