5、设备定义中选择设备类别时，弹窗内容显示不全 已改

6、删除设备定义时，sql报错 已改
7、设备定义中，点位列表中选择“实时曲线”或者“设备运行状态”后不能清空。 已改

industry-admin/src/components/CommonTable/index.vue

@@ -33,7 +33,7 @@
                     <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                 </el-select> -->
-                <el-select v-if="item.type == 'select'" v-model="scope.row[item.propName]"
+                <el-select v-if="item.type == 'select'" clearable v-model="scope.row[item.propName]"
                     @change="operateMethod(scope.row, item.methodName)">
                     <el-option v-for="i in item.options" :key="i.value" :label="i.label" :value="i.value">
                     </el-option>

industry-admin/src/views/device/deviceType/chooseDeviceType.vue

@@ -117,12 +117,11 @@ export default {
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
+<style rel="stylesheet/scss" lang="scss">
 .dialog-med {
-    height: 60vh;
-
+    height: 70vh;
     .el-dialog__body {
-        height: 50vh;
+        height: 60vh;
         overflow: hidden;
     }
 }

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/SystemServiceImpl.java

@@ -104,7 +104,7 @@ public class SystemServiceImpl implements SystemService {
                 if(influxdbIp.equals(localIp)){
                     jsonObject.put("tray",engine_path);
                 }else{
-                    String spath = "\\" + influxdbIp + engine_path.substring(2,engine_path.length());
+                    String spath = "\\" + influxdbIp + "\\" + engine_path;//engine_path.substring(2,engine_path.length());
                     jsonObject.put("tray",spath);
                 }
                 //获得磁盘可用空间和总空间
@@ -150,7 +150,8 @@ public class SystemServiceImpl implements SystemService {
             while ((resultSet1.next())) {
                 String value = resultSet1.getString("value");
                 jsonObject.put("path", value);
-                path = value.split("\\\\")[0];
+                //path = value.split("\\\\")[0];
+                path = value;
                 jsonObject.put("tray", path);
                 break;
             }

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

@@ -55,7 +55,8 @@
                           inner join t_item ti on ti.id = tddi.item_id
                           inner join t_device_ledger_item tdli on tdli.device_ledger_id =#{id} and tdli.item_id = tddi.item_id
              ) ti
-        ORDER BY ti.itemReadName
+        -- ORDER BY ti.itemReadName
+        union
         select ti.itemReadName
         from (
             select DISTINCT tpa.item_id,IF(IFNULL(ti.modbus_config,'') = '', ti.item_read_name, ti.item_name) itemReadName
@@ -63,6 +64,6 @@
             inner join t_item ti on ti.id = tpa.item_id
             inner join t_device_ledger_item tdli on tdli.device_ledger_id =#{id} and tdli.item_id = tpa.item_id
         ) ti
-        ORDER BY ti.itemReadName
+        -- ORDER BY ti.itemReadName
     </select>
 </mapper>