Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wuyouming666

2023-09-19 f89331b66bad4572dd4fc365774f12eac09492b3

Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

# Conflicts:
#	CanadaMes-ui/src/views/Electrical/Action.vue
#	CanadaMes-ui/src/views/Electrical/Parameter.vue

 CanadaMes-ui/src/views/Electrical/Action.vue

@@ -25,9 +25,9 @@
  </div>
</template>
 
<script >
import { SelectPassword } from "../../api/home";
<script > 
import LanguageMixin from '../../lang/LanguageMixin'
import { SelectPassword } from "../../api/home";
let socket;
export default {
  name: "Action",
@@ -109,9 +109,9 @@
    }
  },
  created () {
    this.init();
    this.isClickable = false;
   

    this.init(); 

  },
  methods: {
    setActiveButton(buttonName) {
@@ -171,7 +171,7 @@
    },
    send () {
      
      this.isClickable = true;
      
      SelectPassword().then(res => {
 this.password = res.data.password;
});

 CanadaMes-ui/src/views/Electrical/Parameter.vue

@@ -35,11 +35,11 @@
  

</template>



<script>

import { SelectPassword } from "../../api/home";

<script> 


let socket;

import LanguageMixin from '../../lang/LanguageMixin'

import { SelectPassword } from "../../api/home";

export default {

  name: "Parameter",

  mixins: [LanguageMixin],

@@ -79,9 +79,9 @@


  created () {

    this.initWebSocket();

    this.isButtonDisabled = true;

   
   


    this.isButtonDisabled = true; 


  },

  methods: {

   


 springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java

@@ -56,7 +56,7 @@
     */
    public static Connection getConn() throws SQLException {
        Connection conn = null;
        conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/canadames?serverTimezone=GMT%2B8&characterEncoding=utf-8", "root", "beibo.123/");
        conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/canadameserp?serverTimezone=GMT%2B8&characterEncoding=utf-8", "root", "beibo.123/");
        return conn;
    }