修改曹莉记录的一些问题

industry-admin/src/views/device/deviceLedger/index.vue

@@ -4,7 +4,8 @@
             <el-col :span="4">
                 <el-button v-if="treeData.length === 0" type="primary" plain icon="el-icon-circle-plus-outline" size="mini"
                     @click="addDeviceDirectoryEvent">新增设备目录</el-button>
-                <el-tree v-if="treeData.length !== 0" :data="treeData" :props="defaultProps" node-key="id"
+                <el-tree ref="directoryTree" :data="treeData" :props="defaultProps" node-key="id"
+                         :current-node-key="currentNodeKey" :highlight-current="true"
                     default-expand-all @node-click="handleNodeClick" @node-contextmenu="handleRightClick">
                     <span class="custom-tree-node" slot-scope="{ node, data }">
 <!--                        <i class="el-icon-box" style="color: #DFBA49; margin-right: 5px;"></i>-->
@@ -134,6 +135,9 @@ export default {
     created() {
         this.getDeviceDirectoryTree()
     },
+  mounted(){
+
+  },
     data() {
         return {
             //设备目录树参数
@@ -149,6 +153,7 @@ export default {
             optionData: [],
             node: null,
             tree: null,
+            currentNodeKey:0,
             //表格参数
             isShowCheckbox: false,
             isShowIndex: false,
@@ -308,12 +313,12 @@ export default {
         searchEvent() {
             this.queryParams.page = 1
             this.queryParams.limit = 10
-            this.getDeviceLedgerPage()
+            this.getDeviceLedgerPage();
         },
         /** 重置按钮操作 */
         resetQuery(event) {
-            this.$refs['queryForm'].resetFields();
-            this.searchEvent();
+          this.$refs['queryForm'].resetFields();
+          this.searchEvent();
         },
         /** 点击除菜单以外其他区域，菜单隐藏 */
         optionCardClose(event) {
@@ -377,6 +382,8 @@ export default {
                     this.treeData = res.data
                     if(this.treeData[0].children.length>0){
                       this.queryParams.directoryId = this.treeData[0].children[0].id;
+                      this.currentNodeKey = this.treeData[0].children[0].id;
+                      this.$refs.directoryTree.setCurrentKey(this.treeData[0].children[0].id);
                       this.getDeviceLedgerPage();
                     }
                 }
@@ -385,6 +392,7 @@ export default {
         /** 处理节点点击 */
         handleNodeClick(event, data, node) {
             this.queryParams.directoryId = event.id
+            this.currentNodeKey = event.id
             this.getDeviceLedgerPage()
         },
         /** 处理节点右键点击 */
@@ -425,6 +433,7 @@ export default {
                 }
                 this.tableTotal = res.data.count
                 this.tableData = res.data.deviceLedgerList
+              this.$refs['directoryTree'].setCurrentKey(this.currentNodeKey);
             })
         },
         /** 新增设备台账事件 */

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

@@ -52,7 +52,7 @@ export default {
             options: [],
             deviceTypeRules: {
                 parentId: [
-                    { required: true, message: '上级设备类别不能为空', trigger: 'blur' },
+                    { required: false, message: '上级设备类别不能为空', trigger: 'blur' },
                 ],
                 deviceType: [
                     { required: true, message: '设备类别不能为空', trigger: 'blur' },

industry-admin/src/views/report/runConfig/printConfigList.vue

@@ -148,6 +148,7 @@ export default {
         },
         /** 新增打印配置事件 */
         addPrintConfigEvent() {
+            this.$refs.printConfig.printConfigForm.id=0
             this.$refs.printConfig.title = '新增打印配置'
             this.$refs.printConfig.isDisable = false
             this.$refs.printConfig.visible = true

industry-admin/src/views/source/dataQuery/index.vue

@@ -212,6 +212,9 @@ export default {
             },
             schemeVisible: false,
             chartFormRules: {
+              itemListTitile: [
+                  { required: true, message: '点位不能为空', trigger: 'blur' }
+                ],
                 frequencyValue: [
                     { required: true, message: '更新频率值不能为空', trigger: 'blur' }
                 ],

industry-admin/src/views/source/dataSource/index.vue

@@ -140,7 +140,7 @@
               style="float: right;width: 80px;margin-top: 4px;">获取驱动</el-button>
           </el-form-item>
           <el-form-item label='从站：' prop="slaveId" v-if="dataSourceForm.type == 'modbus_real'">
-            <el-input v-model='dataSourceForm.slaveId' type="text" auto-complete="off" placeholder="请输入从站id" onkeyup="value=value.replace(/[^\d]/g,'')"></el-input>
+            <el-input v-model='dataSourceForm.slaveId' type="text" auto-complete="off" placeholder="请输入从站id" maxlength="2" onkeyup="value=value.replace(/[^\d]/g,'')"></el-input>
           </el-form-item>
         </el-form>
         <div slot="footer" style="text-align: right">

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

@@ -580,7 +580,10 @@ public class ItemGroupServiceImpl implements ItemGroupService {
         ExcelWriter writer = null;
         try {
             writer = ExcelUtil.getWriter(true);
-            //writer.getSheet().setColumnWidth(0,1000);
+            for(int i=0;i<itemList.size()+1;i++){
+                writer.getSheet().setColumnWidth(i,8000);
+            }
+
             writer.write(rows, true);
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
             response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(