派生自 HangZhouMes
UI-Project/src/views/LoginView.vue
@@ -1,11 +1,10 @@ <script lang="ts" setup> import {onMounted, onUnmounted, reactive, ref} from "vue" import {onMounted, onUnmounted, reactive, ref} from 'vue' import {useRoute, useRouter} from 'vue-router' import type {FormInstance, FormRules} from 'element-plus' import {ElMessage} from "element-plus"; import {ElMessage} from 'element-plus' import request from '@/utils/request' import userInfo from '@/stores/userInfo' const store=userInfo() let ruleFormRef = ref<FormInstance>() @@ -13,11 +12,11 @@ const route = useRoute() const userForm = reactive({ userId: '', pass: '' userName: '', password: '', }) if (typeof(route.query.id) != "undefined"){ if (typeof route.query.id != 'undefined') { userForm.userId = <string>route.query.id } @@ -39,7 +38,7 @@ const rules = reactive<FormRules<typeof userForm>>({ userId: [{ validator: validateUser, trigger: 'blur' }], pass: [{ validator: validatePass, trigger: 'blur' }] pass: [{validator: validatePass, trigger: 'blur'}], }) //登陆方法 @@ -62,8 +61,9 @@ loginLoadings.value = false return false } }).catch(error => { ElMessage.error("服务器连接失败") }) .catch((error) => { ElMessage.error('服务器连接失败') loginLoadings.value=false return false }) @@ -72,7 +72,6 @@ } function register() { router.push({ path:'/register', }) @@ -93,7 +92,6 @@ onUnmounted(() => { window.removeEventListener('keydown', keyDown) }) </script> <template> @@ -112,53 +110,43 @@ </div> </div> <div id="div-login"> <el-form @submit.native.prevent <el-form @submit.native.prevent ref="ruleFormRef" :model="userForm" status-icon :rules="rules" > :rules="rules"> <div id="center"> <div style="color: rgba(78, 89, 105, 1);margin-bottom: 10px;">账号</div> <el-form-item prop="userId"> <el-input style="width: 340px;" v-model="userForm.userId" <el-input style="width: 340px;" v-model="userForm.userName" type="text" autocomplete="off" :prefix-icon="Avatar" placeholder="请输入账号" /> placeholder="请输入账号"/> </el-form-item> <div style="color: rgba(78, 89, 105, 1);margin-bottom: 10px;">密码</div> <el-form-item prop="pass"> <el-input style="width: 340px;" v-model="userForm.pass" <el-input style="width: 340px;" v-model="userForm.password" type="password" autocomplete="off" :prefix-icon="Lock" show-password placeholder="请输入密码" /> placeholder="请输入密码"/> </el-form-item> <el-form-item id="submitForm"> <el-button :loading="loginLoadings" <el-button :loading="loginLoadings" type="primary" native-type="submit" @click="submitForm(ruleFormRef)" @keyup.enter.native="keyDown(e)" plain >登录 plain>登录 </el-button> <el-button :loading="registerLoadings" <el-button :loading="registerLoadings" type="primary" @click="register" plain >注册 plain>注册 </el-button> </el-form-item> @@ -174,14 +162,15 @@ .mainDiv{ overflow: hidden; min-width: 718px; background-image: url("../../src/assets/background.jpg"); background-image: url('../../src/assets/background.jpg'); } #main-login{ margin: 150px auto 0 auto; height: 70vh; width: 80vw; } #img-div{ width: 55%; height: 100%; @@ -190,10 +179,12 @@ align-items: center; float: left; } #img-pic{ max-height: 90%; max-width: 100%; } #div-login{ margin-top: 5%; /* margin-top: 20%; */ @@ -206,20 +197,23 @@ border-radius: 4px; box-shadow: 0 8px 16px 0 rgba(0,0,0,0), 0 6px 5px 0 rgba(0,0,0,0.19); } #center{ margin-top: -30px; } .el-form{ width: 60%; margin: 20% auto auto; } #submitForm { display: flex; justify-content: space-evenly; margin-top: 2rem; } :deep(.el-form-item__content){ flex: unset :deep(.el-form-item__content) { flex: unset; } </style> hangzhoumesParent/common/springsecurity/src/main/resources/application.yml
@@ -2,23 +2,10 @@ port: 8089 spring: datasource: dynamic: primary: hangzhoumes #设置默认的数据源或者数据源组,默认值即为master strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: hangzhoumes: url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8 driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver slave_1: #配置数据源类型 type: com.zaxxer.hikari.HikariDataSource #配置连接数据库的信息 driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver url: jdbc:sqlserver://10.153.19.150:1433;databasename=mybatisTest username: sa password: 'beibo.123/' cloud: nacos: discovery: hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -2,23 +2,10 @@ port: 8081 spring: datasource: dynamic: primary: hangzhoumes #设置默认的数据源或者数据源组,默认值即为master strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: hangzhoumes: url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8 driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver slave_1: #配置数据源类型 type: com.zaxxer.hikari.HikariDataSource #配置连接数据库的信息 driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver url: jdbc:sqlserver://10.153.19.150:1433;databasename=mybatisTest username: sa password: 'beibo.123/' cloud: nacos: discovery: hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -3,23 +3,10 @@ spring: datasource: dynamic: primary: hangzhoumes #设置默认的数据源或者数据源组,默认值即为master strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: hangzhoumes: url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8 driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver slave_1: #配置数据源类型 type: com.zaxxer.hikari.HikariDataSource #配置连接数据库的信息 driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver url: jdbc:sqlserver://10.153.19.150:1433;databasename=mybatisTest username: sa password: 'beibo.123/' cloud: nacos: discovery: hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
@@ -3,23 +3,10 @@ spring: datasource: dynamic: primary: hangzhoumes #设置默认的数据源或者数据源组,默认值即为master strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: hangzhoumes: url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8 driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver slave_1: #配置数据源类型 type: com.zaxxer.hikari.HikariDataSource #配置连接数据库的信息 driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver url: jdbc:sqlserver://10.153.19.150:1433;databasename=mybatisTest username: sa password: 'beibo.123/' cloud: nacos: discovery: hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/mapper/TemperingMapper.java
@@ -1,33 +1,34 @@ package com.mes.temperingglass.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.temperingglass.entity.GlassInfo; import com.mes.temperingglass.entity.TemperingGlassInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import java.util.List; import org.apache.ibatis.annotations.*; @Mapper public interface TemperingMapper extends BaseMapper<TemperingGlassInfo> { //查询该玻璃的尺寸和坐标 @Select("select *from glass_info where id=#{glassid};") GlassInfo SelectGlass(String glassid); //@Select("select *from glass_info where id=#{glassid};") //GlassInfo SelectGlass(String glassid); //是否可以发送进炉信号 @Select("select count(*) from glass_info where id=#{glassid};") int SelectTempering(String glassid); //查询等待中的钢化版图玻璃信息 @Select("select*from tempering_glass_info a left join (select flowcard_id,count(state)state from tempering_glass_info GROUP BY flowcard_id,state)b on a.flowcard_id=b.flowcard_id where b.state=2") List<TemperingGlassInfo> SelectWaitingGlass(); //查询进炉中的钢化版图玻璃信息 @Select("select*from tempering_glass_info a left join (select flowcard_id,min(state)state1 from tempering_glass_info GROUP BY flowcard_id having state1=1)b on a.flowcard_id=b.flowcard_id where b.state1=1") List<TemperingGlassInfo> SelectInGlass(); //查询钢化后的钢化版图信息 @Select("select*from tempering_glass_info a left join (select flowcard_id,min(state)state1 from tempering_glass_info GROUP BY flowcard_id having state1=2)b on a.flowcard_id=b.flowcard_id where b.state1=2") List <TemperingGlassInfo> SelectOutGlass(); } hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -2,23 +2,10 @@ port: 8084 spring: datasource: dynamic: primary: hangzhoumes #设置默认的数据源或者数据源组,默认值即为master strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: hangzhoumes: url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8 driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver slave_1: #配置数据源类型 type: com.zaxxer.hikari.HikariDataSource #配置连接数据库的信息 driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver url: jdbc:sqlserver://10.153.19.150:1433;databasename=mybatisTest username: sa password: 'beibo.123/' cloud: nacos: discovery: hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application.yml
@@ -12,14 +12,6 @@ username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver slave_1: #配置数据源类型 type: com.zaxxer.hikari.HikariDataSource #配置连接数据库的信息 driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver url: jdbc:sqlserver://10.153.19.150:1433;databasename=mybatisTest username: sa password: 'beibo.123/' cloud: nacos: discovery:
