From ea7143b55e02d98efe1367e376d2a20f742b879c Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 21 八月 2024 10:11:18 +0800
Subject: [PATCH] 修改数据库连接
---
Web/src/views/device/deviceInfo/index.vue | 83 ++++++++++++++++++++++++++++++++++-------
Admin.NET/WCS.Application/Configuration/Database.json | 2
2 files changed, 70 insertions(+), 15 deletions(-)
diff --git a/Admin.NET/WCS.Application/Configuration/Database.json b/Admin.NET/WCS.Application/Configuration/Database.json
index ae5c372..a17735f 100644
--- a/Admin.NET/WCS.Application/Configuration/Database.json
+++ b/Admin.NET/WCS.Application/Configuration/Database.json
@@ -11,7 +11,7 @@
//"ConnectionString": "PORT=5432;DATABASE=xxx;HOST=localhost;PASSWORD=xxx;USER ID=xxx", // PostgreSQL 搴撹繛鎺ュ瓧绗︿覆
//"ConnectionString": "Server=localhost;Database=xxx;Uid=xxx;Pwd=xxx;SslMode=None;", // MySql 搴撹繛鎺ュ瓧绗︿覆",
//"ConnectionString": "User Id=xxx; Password=xxx; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)))", // Oracle 搴撹繛鎺ュ瓧绗︿覆
- "ConnectionString": "Server=localhost;Database=WCS_JC26;User Id=sa;Password=******;", // SqlServer 搴撹繛鎺ュ瓧绗︿覆
+ "ConnectionString": "Server=192.168.62.200;Database=WCSnet6;User Id=sa;Password=sql2019;", // SqlServer 搴撹繛鎺ュ瓧绗︿覆
//"SlaveConnectionConfigs": [ // 璇诲啓鍒嗙/涓讳粠
// {
diff --git a/Web/src/views/device/index.vue b/Web/src/views/device/deviceInfo/index.vue
similarity index 95%
rename from Web/src/views/device/index.vue
rename to Web/src/views/device/deviceInfo/index.vue
index 02a5d32..d27d80c 100644
--- a/Web/src/views/device/index.vue
+++ b/Web/src/views/device/deviceInfo/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="sys-user-container">
<splitpanes>
- <pane size="10">
+ <pane size="14">
<el-collapse v-model="activeName">
<el-collapse-item title="璁惧鎺у埗" name="1">
<el-card
@@ -53,7 +53,14 @@
</el-collapse-item>
</el-collapse>
</pane>
- <pane size="90" style="position: relative;background-color: #fff;">
+ <pane size="86" style="position: relative;background-color: #fff;">
+ <el-card shadow="hover" :body-style="{ paddingBottom: '0', padding: '10px' }">
+ <div class="card-page">
+ <el-button type="primary" :plain="isPlain1" @click="floorTogglePlain(1)">涓�灞傚钩闈�</el-button>
+ <el-button type="primary" :plain="isPlain2" @click="floorTogglePlain(2)">浜屽眰骞抽潰</el-button>
+ <el-button type="primary" :plain="isPlain3" @click="floorTogglePlain(3)">涓夊眰骞抽潰</el-button>
+ </div>
+ </el-card>
<el-card shadow="hover" :body-style="{ paddingBottom: '0', padding: '10px' }" class="card-line">
<div class="grid-container-line">
<div
@@ -95,9 +102,9 @@
import { ref, reactive } from 'vue';
import { Splitpanes, Pane } from 'splitpanes';
import 'splitpanes/dist/splitpanes.css';
-import { he } from 'element-plus/es/locale';
-import { LineEdge } from '@logicflow/core';
-
+ import { Vue2 } from 'vue-demi';
+
+
const activeName = ['1', '2', '3'];
const value1 = ref(false);
const value2 = ref(false);
@@ -121,6 +128,7 @@
]);
+ //鍫嗗灈鏈烘暟鎹�
const cellsDataLine=[
{ Id: 1, Code: '001', LineCode:'',EndLocat:'',IsShow: 1, IsUse: 0,BoxHeight:10 },
{ Id: 2, Code: '002', LineCode:'01',EndLocat:'01010101',IsShow: 0, IsUse: 0,BoxHeight:190 },
@@ -144,7 +152,7 @@
{ Id: 20, Code: '020', LineCode:'',EndLocat:'',IsShow: 1, IsUse: 0,BoxHeight:10 },
{ Id: 21, Code: '021', LineCode:'',EndLocat:'',IsShow: 1, IsUse: 0,BoxHeight:10 },
{ Id: 22, Code: '022', LineCode:'',EndLocat:'',IsShow: 1, IsUse: 0,BoxHeight:10 },
- { Id: 23, Code: '023', LineCode:'05',EndLocat:'',IsShow: 0, IsUse: 0,BoxHeight:315 },
+ { Id: 23, Code: '023', LineCode:'05',EndLocat:'',IsShow: 0, IsUse: 0,BoxHeight:300 },
{ Id: 24, Code: '024', LineCode:'',EndLocat:'',IsShow: 1, IsUse: 0,BoxHeight:10},
{ Id: 25, Code: '025', LineCode:'',EndLocat:'',IsShow: 1, IsUse: 0,BoxHeight:10 },
{ Id: 26, Code: '026', LineCode:'',EndLocat:'',IsShow: 1, IsUse: 0,BoxHeight:10 },
@@ -175,10 +183,11 @@
{ Id: 51, Code: '051', LineCode:'',EndLocat:'',IsShow: 1, IsUse: 0,BoxHeight:10 },
];
- const cellsData = [
- { Id: 1, Code: '001', IsShow: 0, IsUse: 0,PointCode:'147' },
- { Id: 2, Code: '002', IsShow: 1, IsUse: 0,PointCode:'' },
- { Id: 3, Code: '003', IsShow: 0, IsUse: 0,PointCode:'' },
+ //涓�灞傝緭閫佺嚎鏁版嵁
+ const cellsDataOne = [
+ { Id: 1, Code: '001', IsShow: 0, IsUse: 0 },
+ { Id: 2, Code: '002', IsShow: 1, IsUse: 0 },
+ { Id: 3, Code: '003', IsShow: 0, IsUse: 0 },
{ Id: 4, Code: '004', IsShow: 1, IsUse: 0 },
{ Id: 5, Code: '005', IsShow: 0, IsUse: 0 },
{ Id: 6, Code: '006', IsShow: 1, IsUse: 0 },
@@ -789,22 +798,66 @@
{ Id:611 , Code: '611', IsShow: 1, IsUse: 0 },
{ Id:612 , Code: '612', IsShow: 1, IsUse: 0 },
];
+ //浜屽眰杈撻�佺嚎鏁版嵁
+ const cellsDataTwo = [];
+ //涓夊眰杈撻�佺嚎鏁版嵁
+ const cellsDataThree = [];
-
+
+ //杈撻�佺嚎鏁版嵁
+ let cellsData= ref(cellsDataOne);;
+
+ const isPlain1 = ref(false);
+ const isPlain2 = ref(true);
+ const isPlain3 = ref(true);
+
+ function floorTogglePlain(buttonNumber) {
+ if (buttonNumber === 1) {
+ isPlain1.value = !isPlain1.value;
+ isPlain2.value =true;
+ isPlain3.value =true;
+
+ cellsData.value=cellsDataOne;
+ } else if (buttonNumber === 2) {
+ isPlain2.value = !isPlain2.value;
+ isPlain1.value =true;
+ isPlain3.value =true;
+
+ cellsData.value=cellsDataTwo;
+ } else if (buttonNumber === 3) {
+ isPlain3.value = !isPlain3.value;
+ isPlain1.value =true;
+ isPlain2.value =true;
+
+ cellsData.value=cellsDataThree;
+ }
+ }
</script>
<style scoped>
+ .card-page{
+ width: 100%;
+ height: 30px;
+ display: flex;
+ text-align: center;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ }
+ .card-page>button{
+ width: 150px;
+ height: 30px;
+ }
.card-line{
border: none;
background-color: transparent;
position:absolute;
z-index: 99;
- margin-top: 10px;
}
.grid-container-line{
display: grid;
grid-template-columns: repeat(51, 30px); /* 姣忓垪瀹藉害 */
- grid-template-rows: repeat(1, 325px); /* 姣忚楂樺害 */
+ grid-template-rows: repeat(1, 310px); /* 姣忚楂樺害 */
gap: 0px; /* Gap between cells */
margin-top: 25px;
}
@@ -853,12 +906,14 @@
}
.card{
+ width: 100%;
position:absolute;
border-top: none;
z-index: 90;
- margin-top: 330px;
+ margin-top: 310px;
}
.grid-container {
+ width: 100%;
display: grid;
grid-template-columns: repeat(51, 30px); /* 姣忓垪瀹藉害 */
grid-template-rows: repeat(12, 35px); /* 姣忚楂樺害 */
--
Gitblit v1.8.0