Browse Source

rev:logo

modbus_client
gengby 6 months ago
parent
commit
6bb18a3312
  1. 81
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/shangdianke/ItemProtocol.java
  2. BIN
      acs/nladmin-ui/public/favicon.ico
  3. BIN
      acs/nladmin-ui/src/assets/images/logo.png
  4. BIN
      acs/nladmin-ui/src/assets/logo/logo.png
  5. BIN
      lms/nladmin-ui/public/favicon.ico
  6. BIN
      lms/nladmin-ui/src/assets/images/logo.png
  7. BIN
      lms/nladmin-ui/src/assets/logo/logo.png
  8. 2
      lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue

81
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/shangdianke/ItemProtocol.java

@ -1,81 +0,0 @@
package org.nl.acs.device_driver.shangdianke;
import lombok.Getter;
import lombok.Setter;
/**
* @author zhangjiangwei
*/
@Getter
@Setter
public class ItemProtocol {
/**
* 心跳
*/
public static final String ITEM_HEARTBEAT = "heartbeat";
/**
* 工作模式
*/
public static final String ITEM_MODE = "mode";
/**
* 光电信号
*/
public static final String ITEM_MOVE = "move";
/**
* 动作信号
*/
public static final String ITEM_ACTION = "action";
/**
* 报警信号
*/
public static final String ITEM_ERROR = "error";
/**
* 下发命令
*/
public static final String ITEM_TO_COMMAND = "to_command";
boolean isOnline;
private final PhotoelectricDetectionDeviceDriver driver;
public ItemProtocol(PhotoelectricDetectionDeviceDriver driver) {
this.driver = driver;
}
public int getOpcIntegerValue(String protocol) {
Integer value = this.driver.getIntegeregerValue(protocol);
if (value == null) {
this.isOnline = false;
return 0;
} else {
this.isOnline = true;
return value;
}
}
public int getHeartbeat() {
return this.getOpcIntegerValue(ItemProtocol.ITEM_HEARTBEAT);
}
public int getMode() {
return this.getOpcIntegerValue(ItemProtocol.ITEM_MODE);
}
public int getMove() {
return this.getOpcIntegerValue(ItemProtocol.ITEM_MOVE);
}
public int getAction() {
return this.getOpcIntegerValue(ItemProtocol.ITEM_ACTION);
}
public int getError() {
return this.getOpcIntegerValue(ItemProtocol.ITEM_ERROR);
}
public int getToCommand() {
return this.getOpcIntegerValue(ItemProtocol.ITEM_TO_COMMAND);
}
}

BIN
acs/nladmin-ui/public/favicon.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 125 KiB

BIN
acs/nladmin-ui/src/assets/images/logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 125 KiB

BIN
acs/nladmin-ui/src/assets/logo/logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 125 KiB

BIN
lms/nladmin-ui/public/favicon.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 125 KiB

BIN
lms/nladmin-ui/src/assets/images/logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 125 KiB

BIN
lms/nladmin-ui/src/assets/logo/logo.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 125 KiB

2
lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue

@ -14,7 +14,7 @@
</template> </template>
<script> <script>
import Logo from '@/assets/images/logo2.png' import Logo from '@/assets/images/logo.png'
import variables from '@/assets/styles/variables.scss' import variables from '@/assets/styles/variables.scss'
export default { export default {
name: 'SidebarLogo', name: 'SidebarLogo',

Loading…
Cancel
Save