From 8174aeb99b0fa172db369d98feda6ad7b2e3a0b8 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Thu, 12 Jun 2025 15:29:04 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BB=BB=E5=8A=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 acs/nladmin-ui/src/views/acs/task/index.vue   |  2 +-
 .../src/views/system/menu/index.vue           |  5 +--
 .../inspectionProfiles/Project_Default.xml    | 36 +++++++++++++++++++
 acs2/nladmin-system/.idea/misc.xml            |  6 ++++
 acs2/nladmin-system/.idea/modules.xml         |  8 +++++
 acs2/nladmin-system/.idea/nladmin-system.iml  |  9 +++++
 acs2/nladmin-system/.idea/vcs.xml             |  6 ++++
 acs2/nladmin-system/.idea/workspace.xml       | 13 +++----
 8 files changed, 74 insertions(+), 11 deletions(-)
 create mode 100644 acs2/nladmin-system/.idea/inspectionProfiles/Project_Default.xml
 create mode 100644 acs2/nladmin-system/.idea/misc.xml
 create mode 100644 acs2/nladmin-system/.idea/modules.xml
 create mode 100644 acs2/nladmin-system/.idea/nladmin-system.iml
 create mode 100644 acs2/nladmin-system/.idea/vcs.xml

diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue
index d164db0..83fa582 100644
--- a/acs/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs/nladmin-ui/src/views/acs/task/index.vue
@@ -852,7 +852,7 @@ export default {
     finish(index, row) {
       this.taskStatus.task_id = row.task_id
       this.taskStatus.task_status = index
-      crudTask.finish(this.taskStatus).then(res => {
+      crudTask.finish(row.task_id).then(res => {
         this.crud.toQuery()
         this.crud.notify('完成成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
       }).catch(err => {
diff --git a/acs/nladmin-ui/src/views/system/menu/index.vue b/acs/nladmin-ui/src/views/system/menu/index.vue
index d9b842c..c244563 100644
--- a/acs/nladmin-ui/src/views/system/menu/index.vue
+++ b/acs/nladmin-ui/src/views/system/menu/index.vue
@@ -181,11 +181,12 @@
     >
       <el-table-column type="selection" width="55" />
       <el-table-column :label="$t('menu.table_title.menu_title')" :prop="$langPre.computedProp('title')" :min-width="flexWidth($langPre.computedProp('title'),crud.data,$t('menu.table_title.menu_title'))" />
-      <el-table-column :label="$t('menu.table_title.system')" prop="system_type" :min-width="flexWidth('system_type',crud.data,$t('menu.table_title.system'))">
+     <!-- <el-table-column :label="$t('menu.table_title.system')" prop="system_type" :min-width="flexWidth('system_type',crud.data,$t('menu.table_title.system'))">
         <template slot-scope="scope">
           {{ dict.label.system_type[scope.row.system_type] }} : {{ scope.row.system_type }}
         </template>
-      </el-table-column>
+      </el-table-column>-->
+      <el-table-column label="所属系统" prop="title" />
       <el-table-column prop="icon" :label="$t('menu.table_title.icon')" align="center" :min-width="flexWidth('icon',crud.data, $t('menu.table_title.system'))">
         <template slot-scope="scope">
           <svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" />
diff --git a/acs2/nladmin-system/.idea/inspectionProfiles/Project_Default.xml b/acs2/nladmin-system/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..6560a98
--- /dev/null
+++ b/acs2/nladmin-system/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,36 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="TOP_LEVEL_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="INNER_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="METHOD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+        </value>
+      </option>
+      <option name="FIELD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="IGNORE_DEPRECATED" value="false" />
+      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+      <option name="myAdditionalJavadocTags" value="date" />
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/acs2/nladmin-system/.idea/misc.xml b/acs2/nladmin-system/.idea/misc.xml
new file mode 100644
index 0000000..28a804d
--- /dev/null
+++ b/acs2/nladmin-system/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/acs2/nladmin-system/.idea/modules.xml b/acs2/nladmin-system/.idea/modules.xml
new file mode 100644
index 0000000..5bab4e8
--- /dev/null
+++ b/acs2/nladmin-system/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/nladmin-system.iml" filepath="$PROJECT_DIR$/.idea/nladmin-system.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/acs2/nladmin-system/.idea/nladmin-system.iml b/acs2/nladmin-system/.idea/nladmin-system.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/acs2/nladmin-system/.idea/nladmin-system.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/acs2/nladmin-system/.idea/vcs.xml b/acs2/nladmin-system/.idea/vcs.xml
new file mode 100644
index 0000000..b2bdec2
--- /dev/null
+++ b/acs2/nladmin-system/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/acs2/nladmin-system/.idea/workspace.xml b/acs2/nladmin-system/.idea/workspace.xml
index d49b91d..feeb4b5 100644
--- a/acs2/nladmin-system/.idea/workspace.xml
+++ b/acs2/nladmin-system/.idea/workspace.xml
@@ -20,14 +20,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="a019a4eb-08e9-4982-8f64-7b4fa41c94ac" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/CreateTaskRequest.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/data/one/CreateTaskRequest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/AcsToWmsController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/rest/TaskController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/TaskService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/../../acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -101,6 +96,7 @@
       <updated>1749695657075</updated>
       <workItem from="1749695660750" duration="16000" />
       <workItem from="1749696388346" duration="6162000" />
+      <workItem from="1749712636221" duration="11000" />
     </task>
     <servers />
   </component>
@@ -117,6 +113,7 @@
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="WindowStateProjectService">
     <state x="549" y="171" key="FileChooserDialogImpl" timestamp="1749696574867">