@@ -19,7 +19,7 @@
+}
+
diff --git a/src/views/Temp/Tufting/component/left.vue b/src/views/Temp/Tufting/component/left.vue
index f630f2e..92d2e93 100644
--- a/src/views/Temp/Tufting/component/left.vue
+++ b/src/views/Temp/Tufting/component/left.vue
@@ -33,11 +33,11 @@ let list1 = [
},
{
name: "装配组",
- value: "上工富怡"
+ value: "再登科技"
},
{
name: "电装组",
- value: "上工富怡"
+ value: "再登软件"
},
]
diff --git a/src/views/Temp/Winding/component/center.vue b/src/views/Temp/Winding/component/center.vue
index 0167bc4..e2ec39e 100644
--- a/src/views/Temp/Winding/component/center.vue
+++ b/src/views/Temp/Winding/component/center.vue
@@ -23,16 +23,16 @@
diff --git a/src/views/intelligentShelves/components/ShelfPanel.vue b/src/views/intelligentShelves/components/ShelfPanel.vue
index 0129eb8..e546d9f 100644
--- a/src/views/intelligentShelves/components/ShelfPanel.vue
+++ b/src/views/intelligentShelves/components/ShelfPanel.vue
@@ -6,7 +6,7 @@
-
货架利用率 {{ data.rate }}
+
货架利用率 {{ data.rate }}%
传感器&集成器状态
diff --git a/src/views/intelligentShelves/index.vue b/src/views/intelligentShelves/index.vue
index a24736b..7ca44f3 100644
--- a/src/views/intelligentShelves/index.vue
+++ b/src/views/intelligentShelves/index.vue
@@ -9,10 +9,10 @@
-
-
-
-
+
+
+
+
@@ -20,15 +20,15 @@
-
-
+
+
-
-
-
-
+
+
+
+
@@ -41,6 +41,7 @@ import header2 from "@/components/headerBox/header2.vue";
import ShelfPanel from "./components/ShelfPanel.vue";
import CenterPanel from "./components/CenterPanel.vue";
import TipBox from "./components/TipBox.vue";
+import {Tobj} from "./temp"
import { useI18n } from 'vue-i18n'
let { t } = useI18n();
@@ -49,8 +50,8 @@ let panelConfig = ref({
height:244,
})
let centerConfig = ref({
- width:803,
- height:600
+ width:953,
+ height:714
})
function getGoodsShelvesList() {
diff --git a/src/views/intelligentShelves/temp.ts b/src/views/intelligentShelves/temp.ts
new file mode 100644
index 0000000..60a8afd
--- /dev/null
+++ b/src/views/intelligentShelves/temp.ts
@@ -0,0 +1,389 @@
+let list: any = [
+ ["减速机", "T-0101-01", "4"],
+ ["减速机", "T-0101-02", "1"],
+ ["减速机", "T-0101-03", "7"],
+ ["减速机", "T-0101-04", "2"],
+ ["400W松下驱动器（A5系列）", "T-0101-05", "1"],
+ ["减速机", "T-0101-06", "1"],
+ ["安川M2总线100W驱动器", "T-0102-01", "1"],
+ ["高压伺服电机", "T-0102-02", "2"],
+ ["调速器", "T-0102-03", "2"],
+ ["三相步进电机", "T-0102-04", "1"],
+ ["减速机（电脑裁床机）", "T-0102-05", "1"],
+ ["安川100w不带制动增量电机", "T-0102-06", "1"],
+ ["直流电机调速器", "T-0103-01", "7"],
+ ["光电开关", "T-0103-02", "8"],
+ ["固态继电器", "T-0103-03", "15"],
+ ["直流伺服驱动器 (MCDC506) 老式（Y轴）", "T-0103-04", "2"],
+ ["步进电机驱动器", "T-0103-05", "2"],
+ ["雷赛驱动器", "T-0103-06", "22"],
+ ["M25侧出线上壳", "T-0104-01", "3"],
+ ["M32侧出线上壳", "T-0104-02", "3"],
+ ["8点继电器输出单元", "T-0104-03", "1"],
+ ["压线钳", "T-0104-04", "1"],
+ ["研华工业交换机", "T-0104-05", "2"],
+ ["编码器插头", "T-0105-01", "2"],
+ ["线缆", "T-0105-02", "7"],
+ ["磁碟机电源.7608", "T-0105-03", "9"],
+ ["普尔世开关电源", "T-0105-04", "1"],
+ ["动力插头", "T-0105-05", "2"],
+ ["单网口 RS232/485转WIFI模块", "T-0201-01", "4"],
+ ["扩展模块", "T-0201-02", "3"],
+ ["西门子S71500前连接器（35mm模块）", "T-0201-03", "13"],
+ ["安全模块(施耐德）", "T-0201-04", "1"],
+ ["通讯模块", "T-0201-05", "2"],
+ ["通讯模块", "T-0201-06", "6"],
+ ["导轨式RS232串口服务器", "T-0202-01", "4"],
+ ["电源断路器", "T-0202-02", "6"],
+ ["断路器", "T-0202-03", "2"],
+ ["西克 系统插头", "T-0202-04", "0"],
+ ["编码器", "T-0202-05", "0"],
+ ["断路器", "T-0202-06", "0"],
+ ["4孔按钮盒", "T-0203-01", "0"],
+ ["急停开关配套的单孔盒", "T-0203-02", "2"],
+ ["3孔按钮盒", "T-0203-03", "2"],
+ ["6孔按钮盒", "T-0203-04", "1"],
+ ["3孔按钮盒", "T-0203-05", "4"],
+ ["TY按钮盒", "T-0203-06", "5"],
+ ["M32双口出线上壳", "T-0204-01", "1"],
+ ["断路器(CTM机用）", "T-0204-02", "2"],
+ ["菲尼克斯端子", "T-0204-03", "30"],
+ ["三相四线缺相保护器", "T-0204-04", "1"],
+ ["过滤网组", "T-0204-05", "14"],
+ ["激光定位灯", "T-0205-01", "2"],
+ ["N3-1接线盒成品组件", "T-0205-02", "5"],
+ ["绕线电阻 ", "T-0205-03", "4"],
+ ["欧姆龙柱塞型微动开关", "T-0205-04", "1"],
+ ["欧姆龙传感器", "T-0205-05", "1"],
+ ["开关电源", "T-0301-01", "7"],
+ ["开关电源", "T-0301-02", "0"],
+ ["开关电源（平板切割机用）", "T-0301-03", "1"],
+ ["直流开关电源", "T-0301-04", "1"],
+ ["开关电源", "T-0301-05", "3"],
+ ["开关电源", "T-0301-06", "1"],
+ ["开关电源", "T-0302-01", "2"],
+ ["开关电源", "T-0302-02", "1"],
+ ["开关电源 NES-350-36", "T-0302-03", "2"],
+ ["开关电源", "T-0302-04", "2"],
+ ["开关电源(维修或测试用)", "T-0302-05", "1"],
+ ["开关电源", "T-0302-06", "0"],
+ ["开关电源HF240W-SF-24", "T-0303-01", "4"],
+ ["开关电源", "T-0303-02", "2"],
+ ["开关电源（24V/1A15V/3A）HF70W-DF-E", "T-0303-03", "3"],
+ ["开关电源", "T-0303-04", "2"],
+ ["插头壳", "T-0303-05", "4"],
+ ["开关电源", "T-0303-06", "44"],
+ ["M32双口出线底座", "T-0304-01", "4"],
+ ["M25侧出线底座", "T-0304-02", "1"],
+ ["D-C15B板安装架", "T-0304-03", "4"],
+ ["M32侧出线底座", "T-0304-04", "2"],
+ ["编码器", "T-0304-05", "3"],
+ ["活动框架", "T-0305-01", "8"],
+ ["交流接触器", "T-0305-02", "2"],
+ ["扫码器（品牌:ScanHome）", "T-0305-03", "4"],
+ ["速度控制器", "T-0305-04", "2"],
+ ["三相固态继电器散热器", "T-0305-05", "2"],
+ ["公牛插排", "T-0401-01", "9"],
+ ["插排", "T-0401-02", "2"],
+ ["公牛插排", "T-0401-03", "1"],
+ ["2KW伺服(带抱闸)插头包(欧姆龙)", "T-0401-04", "0"],
+ ["3KW伺服插头包(欧姆龙)", "T-0401-05", "0"],
+ ["公牛插排", "T-0401-06", "15"],
+ ["公牛插排", "T-0402-01", "0"],
+ ["带线公牛插排", "T-0402-02", "0"],
+ ["公牛插座", "T-0402-03", "1"],
+ ["插线板（公牛）", "T-0402-04", "1"],
+ ["导轨插座", "T-0402-05", "1"],
+ ["编程器", "T-0402-06", "3"],
+ ["3孔按钮盒", "T-0403-01", "2"],
+ ["急停按钮盒（黄色）", "T-0403-02", "2"],
+ ["按钮盒1孔（灰色）", "T-0403-03", "2"],
+ ["触摸按钮（品牌：邦纳）", "T-0403-04", "2"],
+ ["按钮控制盒", "T-0403-05", "5"],
+ ["单孔按钮盒(灰色)", "T-0403-06", "12"],
+ ["单孔按钮盒（黄色）", "T-0404-01", "1"],
+ ["单孔按钮盒（黄色）", "T-0404-02", "7"],
+ ["按钮盒", "T-0404-03", "1"],
+ ["天逸单孔按钮盒", "T-0404-04", "10"],
+ ["2孔按钮盒", "T-0404-05", "2"],
+ ["电源适配器", "T-0405-01", "1"],
+ ["传感器", "T-0405-02", "4"],
+ ["集成网口", "T-0405-03", "3"],
+ ["热过载继电器1-1.6A（CTM机用)", "T-0405-04", "1"],
+ ["交流接触器", "T-0405-05", "3"],
+ ["H6B开孔安装单扣", "T-0501-01", "29"],
+ ["16B侧出2耳上壳PG21螺纹", "T-0501-02", "2"],
+ ["24芯底座(魏德米勒)", "T-0501-03", "13"],
+ ["H24B侧出高结构4耳开孔", "T-0501-04", "3"],
+ ["16B顶部高进线外壳M25", "T-0501-05", "2"],
+ ["魏德米勒外壳", "T-0501-06", "32"],
+ ["减速机", "T-0502-01", "6"],
+ ["6B顶部高进线外壳M25", "T-0502-02", "15"],
+ ["32芯外壳（魏德米勒）", "T-0502-03", "1"],
+ ["6芯外壳（魏德米勒）", "T-0502-04", "1"],
+ ["24顶出2耳上壳PG21螺纹", "T-0502-05", "1"],
+ ["10B顶部高进线外壳M25", "T-0502-06", "19"],
+ ["开关电源", "T-0503-01", "4"],
+ ["24芯外壳", "T-0503-02", "10"],
+ ["H24B侧出高结构4耳开孔", "T-0503-03", "3"],
+ ["24B开孔单扣底座", "T-0503-04", "12"],
+ ["10芯外壳", "T-0503-05", "2"],
+ ["开关电源", "T-0503-06", "9"],
+ ["86电机驱动器", "T-0504-01", "0"],
+ ["断路器", "T-0504-02", "4"],
+ ["安全继电器", "T-0504-03", "3"],
+ ["镀锌支架", "T-0504-04", "1"],
+ ["雷赛驱动器", "T-0504-05", "5"],
+ ["公牛插头", "T-0505-01", "1"],
+ ["4孔按钮盒", "T-0505-02", "2"],
+ ["雷赛电机", "T-0505-03", "3"],
+ ["射灯（衣车灯）", "T-0505-04", "6"],
+ ["Cabinet side connectors", "T-0505-05", "11"],
+ ["空气开关", "T-0601-01", "3"],
+ ["四极接触器，直流24V控制电压", "T-0601-02", "3"],
+ ["断路器", "T-0601-03", "2"],
+ ["安全继电器（载床用）", "T-0601-04", "2"],
+ ["交流接触器", "T-0601-05", "4"],
+ ["交流接触器", "T-0601-06", "5"],
+ ["负荷开关附件", "T-0602-01", "4"],
+ ["脱扣器GVAS225", "T-0602-02", "3"],
+ ["交流接触器", "T-0602-03", "2"],
+ ["固态继电器", "T-0602-04", "5"],
+ ["施耐德断路器", "T-0602-05", "6"],
+ ["施耐德断路器", "T-0602-06", "5"],
+ ["安全继电器", "T-0603-01", "1"],
+ ["万向式开关", "T-0603-02", "3"],
+ ["编码器. (CTM用)", "T-0603-03", "2"],
+ ["交流接触器", "T-0603-04", "2"],
+ ["FUZUKI前置面板接口", "T-0603-05", "2"],
+ ["断路器", "T-0603-06", "0"],
+ ["断路器(CTM机用）", "T-0604-01", "7"],
+ ["断路器(CTM机用）", "T-0604-02", "2"],
+ ["断路器", "T-0604-03", "11"],
+ ["断路器(CTM机用）", "T-0604-04", "4"],
+ ["施耐德漏电断路器", "T-0604-05", "2"],
+ ["微型断路器", "T-0605-01", "1"],
+ ["M8 3孔5米灰色PVC线", "T-0605-02", "1"],
+ ["断线检测传感器", "T-0605-03", "14"],
+ ["工业相机延长线", "T-0605-04", "1"],
+ ["时间继电器（带底座）", "T-0605-05", "41"],
+ ["KAKU通风过滤网组", "T-0701-01", "6"],
+ ["母排（1进12出）", "T-0701-02",],
+ ["电磁门锁", "T-0701-03", "2"],
+ ["百能堡通风过虑网组", "T-0701-04", "2"],
+ ["施耐德空开汇流排", "T-0701-05", "1"],
+ ["百能堡风扇", "T-0701-06", "2"],
+ ["研华工业交换机", "T-0702-01", "4"],
+ ["工业网线", "T-0702-02", "1"],
+ ["欧姆龙光纤", "T-0702-03", "3"],
+ ["分布式IO DP", "T-0702-04", "1"],
+ ["kaku风扇(含罩)120", "T-0702-05",],
+ ["抱闸电缆3M", "T-0702-06", "2"],
+ ["报警灯", "T-0703-01", "2"],
+ ["简易伺服电机", "T-0703-02", "1"],
+ ["剥线钳", "T-0703-03", "1"],
+ ["行程开关", "T-0703-04", "13"],
+ ["直流无刷伺服电机", "T-0703-05", "2"],
+ ["红色旋转式警示灯", "T-0703-06", "2"],
+ ["USB编程电缆", "T-0704-01", "14"],
+ ["负荷开关", "T-0704-02", "3"],
+ ["雷赛通用型闭环步进驱动器", "T-0704-03", "4"],
+ ["雷赛驱动器", "T-0704-04", "7"],
+ ["电源模块", "T-0704-05", "7"],
+ ["施耐德漏电断路器", "T-0705-01", "10"],
+ ["开关电源", "T-0705-02", "3"],
+ ["开关电源", "T-0705-03", "1"],
+ ["开关电源", "T-0705-04", "2"],
+ ["开关电源", "T-0705-05", "7"],
+ ["冷风枪", "T-0801-01", "7"],
+ ["表面安装式总开关", "T-0801-02", "1"],
+ ["脚踏开关踏板(2档三位置型带线脚控制开关)", "T-0801-03", "5"],
+ ["无刷减速电机", "T-0801-04",],
+ ["行程开关", "T-0801-05", "19"],
+ ["风扇 FP-108B 绗绣机专用", "T-0801-06", "6"],
+ ["脚踏开关", "T-0802-01", "4"],
+ ["编码器.拉布机用", "T-0802-02", "1"],
+ ["穆勒转换开关", "T-0802-03", "1"],
+ ["框架a", "T-0802-04", "3"],
+ ["欧姆龙光电传感器", "T-0802-05", "2"],
+ ["7寸触摸屏", "T-0802-06", "1"],
+ ["传感器", "T-0803-01", "24"],
+ ["控制盒", "T-0803-02", "3"],
+ ["KAKU风扇温控器", "T-0803-03", "1"],
+ ["西门子S71500DI 32*24VDC HF", "T-0803-04", "3"],
+ ["西门子S71500DQ 32*24VDC/0.5A BA", "T-0803-05", "2"],
+ ["护齿（电控箱用）", "T-0803-06", "19.2"],
+ ["小型断路器", "T-0804-01", "3"],
+ ["BANNER颜色传感器", "T-0804-02", "17"],
+ ["智能网关", "T-0804-03", "1"],
+ ["加长轴", "T-0804-04", "1"],
+ ["雷赛驱动器编码器线", "T-0804-05", "11"],
+ ["直流电机", "T-0805-01", "4"],
+ ["急停按钮盒", "T-0805-02", "3"],
+ ["微型电主轴", "T-0805-03", "2"],
+ ["站点传感器", "T-0805-04", "1"],
+ ["环形光源", "T-0805-05", "1"],
+ ["成品网线", "T-0901-01", "7"],
+ ["USB2.0转串口线", "T-0901-02", "1"],
+ ["富士驱动器调试线", "T-0901-03", "0"],
+ ["天诚6类网线", "T-0901-04", "2"],
+ ["西门子线缆", "T-0901-05", "1"],
+ ["USB2.0转串口线", "T-0901-06", "4"],
+ ["USB转RS485/422", "T-0902-01", "1"],
+ ["三菱MT500-FX(3M)通讯线", "T-0902-02", "4"],
+ ["成品网线", "T-0902-03", "1"],
+ ["HDMI高清线", "T-0902-04", "2"],
+ ["延长线", "T-0902-05", "4"],
+ ["USB转RS232串口线", "T-0902-06", "16"],
+ ["恒温电烙铁", "T-0903-01",],
+ ["光电开关（欧姆龙）", "T-0903-02", "1"],
+ ["红外传感器", "T-0903-03", "3"],
+ ["附件", "T-0903-04", "1"],
+ ["拉绳开关", "T-0903-05", "1"],
+ ["雷赛57CME系列步进电机编码器线缆1米5款", "T-0903-06", "1"],
+ ["电缆", "T-0904-01", "5"],
+ ["M8 3针直转3孔直带5M灰色PVC线", "T-0904-02", "14"],
+ ["成品网线（禁用）", "T-0904-03", "5"],
+ ["断路器1", "T-0904-04", "7"],
+ ["西克传感器线", "T-0904-05", "12"],
+ ["双边缝外部线缆", "T-0905-01", "1"],
+ ["上海乐驰-模拟电压表【500V】", "T-0905-02", "1"],
+ ["双边缝外部线缆", "T-0905-03", "4"],
+ ["增量编码器电缆3M", "T-0905-04", "2"],
+ ["双边缝外部线缆", "T-0905-05", "4"],
+ ["断路器", "T-1001-01", "11"],
+ ["PLC下载线", "T-1001-02", "2"],
+ ["施耐德断路器", "T-1001-03", "3"],
+ ["断路器3", "T-1001-04", "1"],
+ ["断路器", "T-1001-05", "10"],
+ ["过欠压保护器", "T-1001-06", "11"],
+ ["成品网线", "T-1002-01", "5"],
+ ["PLC 模块", "T-1002-02", "1"],
+ ["安全继电器", "T-1002-03", "1"],
+ ["断路器", "T-1002-04", "3"],
+ ["IM155-6 PN ST标准型, 含服务模块和总线适配器 BA 2X RJ45", "T-1002-05", "1"],
+ ["成品网线", "T-1002-06", "2"],
+ ["温度控制器", "T-1003-01", "9"],
+ ["接线托", "T-1003-02", "5"],
+ ["两相固态继电器", "T-1003-03", "2"],
+ ["面板式总开关", "T-1003-04", "2"],
+ ["接线托", "T-1003-05", "3"],
+ ["接线盖", "T-1003-06", "1"],
+ ["滤波器(L2000用）（三项四线滤波器）", "T-1004-01", "4"],
+ ["接触器", "T-1004-02", "10"],
+ ["工业PDU插排", "T-1004-03", "2"],
+ ["16B开孔单扣底座", "T-1004-04", "3"],
+ ["西门子精致面板 TP700Comfort", "T-1004-05",],
+ ["施耐德漏电断路器", "T-1005-01", "12"],
+ ["漏电保护附件（品牌：施耐德）", "T-1005-02", "1"],
+ ["施耐德断路器", "T-1005-03", "1"],
+ ["急停按钮控制盒", "T-1005-04", "1"],
+ ["面板式总开关", "T-1005-05", "1"],
+]
+
+let Tobj = {
+ t01: {
+ name: "T-01",
+ rate: 100,
+ num: 28,
+ total: 28,
+ sensor: true,
+ integrator: true,
+ emptyList: [],
+ tip: false
+ },
+ t02: {
+ name: "T-02",
+ rate: 100,
+ num: 25,
+ total: 28,
+ sensor: true,
+ integrator: true,
+ emptyList: ['2-4','2-5','2-6',],
+ tip: false
+ },
+ t03: {
+ name: "T-03",
+ rate: 100,
+ num: 26,
+ total: 28,
+ sensor: true,
+ integrator: true,
+ emptyList: ['1-2','2-6'],
+ tip: false
+ },
+ t04: {
+ name: "T-04",
+ rate: 100,
+ num: 24,
+ total: 28,
+ sensor: true,
+ integrator: true,
+ emptyList: ['1-4','1-5','2-1','2-2'],
+ tip: false
+ },
+ t05: {
+ name: "T-05",
+ rate: 100,
+ num: 27,
+ total: 28,
+ sensor: true,
+ integrator: true,
+ emptyList: ['4-1'],
+ tip: false
+ },
+ t06: {
+ name: "T-06",
+ rate: 100,
+ num: 27,
+ total: 28,
+ sensor: true,
+ integrator: true,
+ emptyList: ['3-6'],
+ tip: false
+ },
+ t07: {
+ name: "T-07",
+ rate: 100,
+ num: 28,
+ total: 28,
+ sensor: true,
+ integrator: true,
+ emptyList: [],
+ tip: false
+ },
+ t08: {
+ name: "T-08",
+ rate: 100,
+ num: 28,
+ total: 28,
+ sensor: true,
+ integrator: true,
+ emptyList: [],
+ tip: false
+ },
+ t09: {
+ name: "T-09",
+ rate: 100,
+ num: 27,
+ total: 28,
+ sensor: true,
+ integrator: true,
+ emptyList: ['1-3'],
+ tip: false
+ },
+ t10: {
+ name: "T-10",
+ rate: 100,
+ num: 28,
+ total: 28,
+ sensor: true,
+ integrator: true,
+ emptyList: [],
+ tip: false
+ },
+
+
+}
+
+export { list,Tobj }
\ No newline at end of file
diff --git a/src/views/realtimeSecurity/index.vue b/src/views/realtimeSecurity/index.vue
index b0909e4..24882b6 100644
--- a/src/views/realtimeSecurity/index.vue
+++ b/src/views/realtimeSecurity/index.vue
@@ -76,14 +76,15 @@ function getWebsocket(val) {
//燃气监测
if (data.type == "Gas") {
- store.changepaintingGas(data.msg);
+ // store.changepaintingGas(data.msg);
+
let verticalData = {name:data.msg.devName,val:data.msg.methane.value,devId:data.msg.devId}
store.changeNewVerticalNum({type:'Methane',data:verticalData})
}
//甲醛TVOC
if (data.type == "TVOC_CH2O") {
- store.changeTVOC_CH2O(data.msg);
+ // store.changeTVOC_CH2O(data.msg);
let verticalData_TVOC = {name:data.msg.TVOC.name,val:data.msg.TVOC.value,devId:data.msg.TVOC.devId}
store.changeNewVerticalNum({type:'TVOC',data:verticalData_TVOC})
let verticalData_CH2O = {name:data.msg.CH2O.name,val:data.msg.CH2O.value,devId:data.msg.CH2O.devId}
+ 
+ 
+ 
+ 
+ 
+