From 5792c72211dd35556ea2fa2e72f2e6d231f21c5f Mon Sep 17 00:00:00 2001
From: ldj_willow <ldj_willow@163.com>
Date: Tue, 16 Aug 2022 16:36:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 acs/hd/nladmin-system/pom.xml                 | 31 +++----------------
 .../service/impl/DeviceServiceImpl.java       |  7 -----
 acs/qd/src/views/acs/device/index.vue         | 10 ++----
 acs/qd/src/views/acs/instruction/index.vue    | 10 +++---
 acs/qd/src/views/acs/task/index.vue           | 12 +++----
 .../src/views/acs/task/taskFeedback/index.vue |  8 ++---
 6 files changed, 21 insertions(+), 57 deletions(-)

diff --git a/acs/hd/nladmin-system/pom.xml b/acs/hd/nladmin-system/pom.xml
index 26f5dcd..a6dc1ef 100644
--- a/acs/hd/nladmin-system/pom.xml
+++ b/acs/hd/nladmin-system/pom.xml
@@ -57,34 +57,11 @@
             <version>4.8.1</version>
         </dependency>
 
-        <!--lucene相关-->
         <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-core</artifactId>
-            <version>8.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-common</artifactId>
-            <version>8.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-smartcn</artifactId>
-            <version>8.4.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-queryparser</artifactId>
-            <version>8.4.0</version>
-        </dependency>
-
-        <!--        ip地址解析-->
-        <dependency>
-            <groupId>net.dreamlu</groupId>
-            <artifactId>mica-ip2region</artifactId>
-            <version>2.5.6</version>
+            <groupId>net.sf.json-lib</groupId>
+            <artifactId>json-lib</artifactId>
+            <version>2.4</version>
+            <classifier>jdk15</classifier>
         </dependency>
 
         <!--导入excel相关-->
diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
index a3a98a7..43205cc 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
@@ -40,8 +40,6 @@ import org.nl.wql.WQL;
 import org.nl.wql.core.bean.WQLObject;
 import org.nl.wql.util.WqlUtil;
 import org.openscada.opc.lib.da.Server;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -69,13 +67,8 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
     List<StorageCellDto> storageCells = new ArrayList<>();
     private Map<String, Integer> storage_address = new HashMap();
 
-    Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class);
-
-
     @Override
     public Map<String, Object> queryAll(Map whereJson, Pageable page) {
-        logger.info("Hello World");
-
         HashMap param = new HashMap();
         param.put("flag", "01");
         if (whereJson.get("blurry") != null) {
diff --git a/acs/qd/src/views/acs/device/index.vue b/acs/qd/src/views/acs/device/index.vue
index 1f85998..8595b47 100644
--- a/acs/qd/src/views/acs/device/index.vue
+++ b/acs/qd/src/views/acs/device/index.vue
@@ -93,14 +93,8 @@
           <el-form-item label="顺序号" prop="seq_num">
             <el-input-number v-model="form.seq_num" value="1" :min="1" label="描述文字" />
           </el-form-item>
-          <!--          <el-form-item label="生产厂家">-->
-          <!--            <el-input v-model="form.manufacturer" style="width: 370px;" />-->
-          <!--          </el-form-item>-->
-          <!--          <el-form-item label="厂家电话">-->
-          <!--            <el-input v-model="form.manufacturer_phone" style="width: 370px;" />-->
-          <!--          </el-form-item>-->
           <el-form-item label="描述信息" prop="description">
-            <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
+            <el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -135,7 +129,7 @@
             <div>{{ scope.row.region_name }}</div>
           </template>
         </af-table-column>
-        <el-table-column sortable prop="seq_num" label="顺序号" />
+        <el-table-column sortable prop="seq_num" label="顺序号" min-width="90" show-overflow-tooltip />
         <el-table-column prop="is_config" label="是否配置" width="75px">
           <template slot-scope="scope">
             <span v-if="scope.row.is_config=='true' ">是</span>
diff --git a/acs/qd/src/views/acs/instruction/index.vue b/acs/qd/src/views/acs/instruction/index.vue
index 598f5c8..e1be702 100644
--- a/acs/qd/src/views/acs/instruction/index.vue
+++ b/acs/qd/src/views/acs/instruction/index.vue
@@ -125,10 +125,10 @@
             <span v-if="scope.row.send_status=='2' ">失败</span>
           </template>
         </el-table-column>
-        <el-table-column prop="start_point_code" label="起点" />
-        <el-table-column prop="start_parent_code" label="父起点点位" />
-        <el-table-column prop="next_point_code" label="终点" />
-        <el-table-column prop="next_parent_code" label="父终点点位" />
+        <el-table-column prop="start_point_code" label="起点" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="start_parent_code" label="父起点点位" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="next_point_code" label="终点" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="next_parent_code" label="父终点点位" min-width="100" show-overflow-tooltip />
         <el-table-column prop="carno" label="车号" />
         <el-table-column prop="compound_inst" label="复合指令">
           <template slot-scope="scope">
@@ -148,7 +148,7 @@
           v-permission="['admin','instruction:edit','instruction:del']"
           fixed="left"
           label="操作"
-          width="150px"
+          width="80px"
           align="center"
         >
           <template slot-scope="scope">
diff --git a/acs/qd/src/views/acs/task/index.vue b/acs/qd/src/views/acs/task/index.vue
index c1e6f16..c986dda 100644
--- a/acs/qd/src/views/acs/task/index.vue
+++ b/acs/qd/src/views/acs/task/index.vue
@@ -241,11 +241,11 @@
             <span v-if="scope.row.task_status==='2' ">完成</span>
           </template>
         </el-table-column>
-        <el-table-column prop="priority" label="任务优先级" />
-        <el-table-column prop="start_point_code" label="起点" />
-        <el-table-column prop="start_parent_code" label="父起点点位" />
-        <el-table-column prop="next_point_code" label="终点" />
-        <el-table-column prop="next_parent_code" label="父终点点位" />
+        <el-table-column prop="priority" label="任务优先级" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="start_point_code" label="起点" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="start_parent_code" label="父起点点位" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="next_point_code" label="终点" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="next_parent_code" label="父终点点位" min-width="100" show-overflow-tooltip />
         <el-table-column prop="compound_task" label="复合任务">
           <template slot-scope="scope">
             <span v-if="scope.row.compound_task==='0' ">否</span>
@@ -258,7 +258,7 @@
         <el-table-column prop="remark" label="备注" />
         <el-table-column prop="create_by" label="创建者" />
         <el-table-column prop="create_time" label="创建时间" width="135" />
-        <el-table-column v-permission="['admin','task:edit','task:del']" fixed="left" label="操作" width="150px" align="center">
+        <el-table-column v-permission="['admin','task:edit','task:del']" fixed="left" label="操作" width="80px" align="center">
           <template slot-scope="scope">
             <el-dropdown trigger="click" @command="handleCommand">
               <span class="el-dropdown-link">
diff --git a/acs/qd/src/views/acs/task/taskFeedback/index.vue b/acs/qd/src/views/acs/task/taskFeedback/index.vue
index 3bd74f9..9841039 100644
--- a/acs/qd/src/views/acs/task/taskFeedback/index.vue
+++ b/acs/qd/src/views/acs/task/taskFeedback/index.vue
@@ -109,8 +109,8 @@
         <el-table-column prop="task_code" label="任务号" />
         <el-table-column prop="task_type" label="任务类型" />
         <el-table-column prop="task_status" label="任务状态" />
-        <el-table-column prop="start_point_code" label="起始点位" />
-        <el-table-column prop="next_point_code" label="目标点位" />
+        <el-table-column prop="start_point_code" label="起始点位" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="next_point_code" label="目标点位" min-width="100" show-overflow-tooltip />
         <el-table-column prop="vehicle_code" label="载具号" />
         <el-table-column prop="is_finished" label="是否完成" />
         <el-table-column prop="error_code" label="错误编码" />
@@ -121,7 +121,7 @@
         <el-table-column prop="retry_times" label="重试次数" />
         <el-table-column prop="remark" label="备注" />
         <el-table-column prop="create_by" label="创建者" />
-        <el-table-column prop="create_time" label="创建时间" />
+        <el-table-column prop="create_time" label="创建时间" min-width="150" show-overflow-tooltip />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -194,7 +194,7 @@ export default {
         create_time: [
           { required: true, message: '创建时间不能为空', trigger: 'blur' }
         ]
-      }    }
+      }}
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据