1、修改可视化页面modbus名称显示问题

industry-admin/src/layout/components/Sidebar/Logo.vue

@@ -26,8 +26,8 @@ export default {
   },
   data() {
     return {
-      //title: '工业实时数据可视化管理系统',
-      title: '工业实时数据报表软件',
+      title: '工业数据平台',
+      //title: '工业实时数据报表软件',
       logo: logoImg
     }
   },

industry-admin/src/settings.js

@@ -1,6 +1,6 @@
 module.exports = {
-  // title: '工业实时数据可视化管理系统',
-  title: '工业实时数据报表软件',
+  title: '工业数据平台',
+  //title: '工业实时数据报表软件',
 
   /**
    * @type {boolean} true | false

industry-admin/src/views/largeScreen/pageAnimation/index.vue

@@ -59,7 +59,7 @@ export default {
         {key: 'ztfj', name: '整图风机', operatorShow: true, describe: '时转动'},
         {key: 'ztfjqql', name: '整图风机前气流', operatorShow: true,describe: '时显示'},
         {key: 'ztzcql', name: '整图座舱气流', operatorShow: true,describe: '时显示'},
-        {key: 'ztzcqlys', name: '整图座舱气流颜色', operatorShow: true,describe: '时显示蓝色'},
+        {key: 'ztzcqlys', name: '整图座舱气流颜色', operatorShow: true,describe: '时显示蓝色,反之显示橘红色'},
         {key: 'fjzxtzfj', name: '风机子系统左风机', operatorShow: true,describe: '时转动'},
         {key: 'fjzxtyfj', name: '风机子系统右风机', operatorShow: true,describe: '时转动'},
         {key: 'ydgdx_L', name: '液氮罐动效(左)', operatorShow: false,describe: '时显示'},

industry-admin/vue.config.js

@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '工业实时数据可视化管理系统' // page title
+const name = defaultSettings.title || '工业实时数据平台' // page title
 
 // If your port is set to 80,
 // use administrator privileges to execute the command line.

industry-system/industry-da/src/main/resources/mapper/DeviceDataItemDao.xml

@@ -93,8 +93,8 @@
     <select id="getDeviceDataItemPage" resultType="com.example.opc_common.entity.DeviceDataItem">
         select
             tddi.id,tddi.item_id,tddi.sort_num,tddi.create_time,
-            ti.item_read_name,
             ti.item_group_id,
+            case when POSITION('modbus_' IN ti.item_read_name)>0 then ti.item_name else ti.item_read_name end item_read_name,
             tig.group_name as item_group_name,
             ti.describe,
             ti.unit

industry-system/industry-da/src/main/resources/mapper/DeviceLedgerDao.xml

@@ -522,7 +522,7 @@
         tdli.device_ledger_id,
         tdli.ledger_item_type,
         tdli.item_id,
-        ti.item_read_name,
+        case when POSITION('modbus_' IN ti.item_read_name)>0 then ti.item_name else ti.item_read_name end item_read_name,
         ti.item_group_id,
         tig.group_name as item_group_name,
         ti.describe,

industry-system/industry-da/src/main/resources/mapper/ItemGroupDao.xml

@@ -416,7 +416,7 @@
             a.item_group_id,
             b.group_name as item_group_name,
             a.item_name,
-            a.item_read_name,
+            case when POSITION('modbus_' IN a.item_read_name)>0 then a.item_name else a.item_read_name end item_read_name,
             a.upper_limit,
             a.lower_limit,
             a.scale,

industry-system/industry-da/src/main/resources/mapper/MainRunDao.xml

@@ -86,7 +86,7 @@
         select a.id
              , a.main_run_id
              , a.item_id
-             , b.item_read_name
+             , case when POSITION('modbus_' IN b.item_read_name)>0 then b.item_name else b.item_read_name end item_read_name
              , d.data_source_id
              , b.describe
              , b.unit