From fccb5033a79fc309e3018ed9ec57252caa3e6ffa Mon Sep 17 00:00:00 2001
From: fhysy <1149505133@qq.com>
Date: Mon, 26 May 2025 17:42:33 +0800
Subject: [PATCH] =?UTF-8?q?feat(store):=20=E6=B7=BB=E5=8A=A0=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD=E5=88=97=E8=A1=A8=E5=92=8C=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8=E7=9A=84=E6=8E=92=E5=BA=8F=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E3=80=81=E8=B0=83=E6=95=B4=E5=AD=97=E5=85=B8=E5=92=8C?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=A1=B5=E9=9D=A2=E3=80=81=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 attribute.js 中添加了 UpdateFunctionList 和 UpdateEventList 两个 action
---
 src/store/modules/attribute.js                |   8 +
 src/views/iot/device/index.vue                |   2 +-
 src/views/iot/device/profile/functionWrap.vue |  76 +-
 .../profile/DeviceDetailsView/eventLog.vue    |  24 +-
 .../profile/attribute/eventFormModel.vue      | 806 +++++++++---------
 src/views/profile/attribute/eventView.vue     | 239 ++----
 .../profile/attribute/functionFormModel.vue   | 735 ++++++++--------
 src/views/profile/attribute/functionView.vue  |  68 +-
 src/views/system/dict/data.vue                |  79 +-
 src/views/system/user/index.vue               |   4 +-
 10 files changed, 938 insertions(+), 1103 deletions(-)

diff --git a/src/store/modules/attribute.js b/src/store/modules/attribute.js
index dbef5110..58639a93 100644
--- a/src/store/modules/attribute.js
+++ b/src/store/modules/attribute.js
@@ -177,6 +177,14 @@ const attribute = {
     EditEvent({ commit, state }, param) {
       commit('UPDATE_EVENT', param)
     },
+    // 修改 列表
+    UpdateFunctionList({ commit, state }, param) {
+      commit('SET_FUNCTION_LIST', param)
+    },
+    // 修改 列表
+    UpdateEventList({ commit, state }, param) {
+      commit('SET_EVENT_LIST', param)
+    },
     // 删除分组 删除分组 判断分组是否有属性，有属性就不能删除
     DeleteGroup({ commit, state }, idx) {
       let groupItem = state.groupList[idx];
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index fbc87974..532f0809 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -877,7 +877,7 @@ export default {
           }
         ],
         deviceTag: [
-          { required: true, message: "设备标签不能为空", trigger: "change" }
+          // { required: true, message: "设备标签不能为空", trigger: "change" }
         ]
       },
       deviceTypeList: {},
diff --git a/src/views/iot/device/profile/functionWrap.vue b/src/views/iot/device/profile/functionWrap.vue
index 02f234a3..4ee554f0 100644
--- a/src/views/iot/device/profile/functionWrap.vue
+++ b/src/views/iot/device/profile/functionWrap.vue
@@ -333,14 +333,12 @@
   </div>
 </template>
 <script>
-import { updateDevice, resetPssword, setSwitchControl, setFunctionControl } from "@/api/iot/device";
+import { setSwitchControl, setFunctionControl } from "@/api/iot/device";
 import DialogTemplate from "@/components/DialogTemplate";
 import DeviceAlarmConfig from "@/views/profile/DeviceAlarmConfig/DeviceAlarmConfig";
 import DeviceTimingConfig from "@/views/profile/DeviceTimingConfig/DeviceTimingConfig";
 import { addCard, delCard, getCard, setCardQuery } from "@/api/iot/cardNumber";
 import MyMonacoEditor from '@/views/components/my-monaco-editor'
-// import JsonEditor from "@/components/JsonEditor";
-// import { callFunction } from "@/api/iot/function";
 
 export default {
   name: "functionWrap",
@@ -427,43 +425,6 @@ export default {
       }
 
       return this.currentFunction.inputs.map(input => {
-        // 获取类型显示名称
-        let typeName = "";
-        // switch (input.valueType.type) {
-        //   case "int":
-        //     typeName = "整数";
-        //     break;
-        //   case "long":
-        //     typeName = "长整数";
-        //     break;
-        //   case "float":
-        //     typeName = "浮点数";
-        //     break;
-        //   case "double":
-        //     typeName = "双精度浮点数";
-        //     break;
-        //   case "string":
-        //     typeName = "字符串";
-        //     break;
-        //   case "boolean":
-        //     typeName = "布尔值";
-        //     break;
-        //   case "date":
-        //     typeName = "日期时间";
-        //     break;
-        //   case "enum":
-        //     typeName = "枚举";
-        //     break;
-        //   case "array":
-        //     typeName = "数组";
-        //     break;
-        //   case "object":
-        //     typeName = "对象";
-        //     break;
-        //   default:
-        //     typeName = input.valueType.type;
-        // }
-
         return {
           ...input,
           type: input.valueType.type
@@ -619,42 +580,7 @@ export default {
               } else {
                 this.$message.error("功能执行失败");
               }
-
             });
-
-            // 模拟API调用
-            // setTimeout(() => {
-            //   this.loading = false;
-            //
-            //   // 添加执行结果
-            //   const result = {
-            //     time: new Date().toLocaleString(),
-            //     functionName: item.name,
-            //     success: Math.random() > 0.2, // 模拟成功/失败
-            //     data: JSON.stringify(processedData, null, 2)
-            //   };
-            //
-            //   this.executionResults.unshift(result);
-            //
-            //   // 控制结果列表最大数量
-            //   if (this.executionResults.length > 20) {
-            //     this.executionResults.pop();
-            //   }
-            //
-            //   // 显示执行结果提示
-            //   if (result.success) {
-            //     this.$message.success("功能执行成功");
-            //   } else {
-            //     this.$message.error("功能执行失败");
-            //   }
-            //
-            //   // 滚动到顶部
-            //   this.$nextTick(() => {
-            //     if (this.$refs.resultContent) {
-            //       this.$refs.resultContent.scrollTop = 0;
-            //     }
-            //   });
-            // }, 1000);
           }
         });
       }else{
diff --git a/src/views/profile/DeviceDetailsView/eventLog.vue b/src/views/profile/DeviceDetailsView/eventLog.vue
index 5cf0673e..0797f92c 100644
--- a/src/views/profile/DeviceDetailsView/eventLog.vue
+++ b/src/views/profile/DeviceDetailsView/eventLog.vue
@@ -100,8 +100,7 @@
 </template>
 
 <script>
-import { listDeviceEventLogList, listDeviceLogList } from "@/api/iot/device";
-import SelectTableWrap from "@/components/SelectTable/index";
+import { listDeviceEventLogList } from "@/api/iot/device";
 import {formatDate} from "@/utils";
 import JsonViewer from "vue-json-viewer";
 import "vue-json-viewer/style.css";
@@ -110,12 +109,10 @@ export default {
   name: 'EventLog',
   props: ['sourceId', 'pDevcieInfo'],
   components: {
-    SelectTableWrap,
     JsonViewer
   },
   data() {
     return {
-      direction,
       // 查询参数
       pickerValue: null,
       queryParams: {
@@ -124,7 +121,6 @@ export default {
         orderType: 2,
         deviceId: null,
         deviceName: null,
-        direction: direction[0].value,
         eventType: '',
         beginTime: null,
         endTime: null
@@ -201,10 +197,6 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.resetPicker();
-      // if (this.eventTypeList && this.eventTypeList.length > 0) {
-      //   this.queryParams.eventType = this.eventTypeList[0].id;
-      //   this.activeEventObj = this.eventTypeList[0];
-      // }
       this.handleQuery();
     },
     resetPicker() {
@@ -228,20 +220,6 @@ export default {
       this.queryParams = Object.assign(this.queryParams, sort);
       this.handleQuery();
     },
-    copyOnClick(val) {
-      let self = this;
-      this.$copyText(val).then(
-        function () {
-          self.$message({
-            message: "复制成功",
-            type: "success",
-          });
-        },
-        function () {
-          self.$message.error("复制失败");
-        }
-      );
-    },
     openDetail(item){
       let eventContent = '';
       try {
diff --git a/src/views/profile/attribute/eventFormModel.vue b/src/views/profile/attribute/eventFormModel.vue
index a50b4b0a..ff73cb51 100644
--- a/src/views/profile/attribute/eventFormModel.vue
+++ b/src/views/profile/attribute/eventFormModel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="attribute-form-view">
+  <div class="event-form-model">
     <el-dialog
       :close-on-click-modal="false"
       :modal="false"
@@ -8,82 +8,102 @@
       class="params-eldialog"
       top="5vh"
       width="800px"
-      @close="$emit('update:visible', false)">
-        <el-form
-          ref="form"
-          :model="form"
-          :rules="rules"
-          label-position="top"
-          style="padding: 10px"
-        >
-          <el-form-item label="标识:" prop="id">
-            <el-input
-              v-model="form.id"
-              placeholder="请输入标识"
-              @input="inputChange"
+      @close="$emit('update:visible', false)"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-position="top"
+        style="padding: 10px"
+      >
+        <el-form-item label="标识:" prop="id">
+          <el-input
+            v-model="form.id"
+            placeholder="请输入标识"
+            @input="inputChange"
+          />
+        </el-form-item>
+        <el-form-item label="名称:" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称" />
+        </el-form-item>
+
+        <el-form-item label="事件级别:" prop="level">
+          <el-select
+            v-model="form.expands.level"
+            placeholder="请选择事件级别"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="(dice, value) in eventLevel"
+              :key="value"
+              :label="dice"
+              :value="value"
             />
-          </el-form-item>
-          <el-form-item label="名称:" prop="name">
-            <el-input v-model="form.name" placeholder="请输入名称" />
-          </el-form-item>
+          </el-select>
+        </el-form-item>
 
-          <el-form-item label="事件级别:" prop="level">
-            <el-select v-model="form.expands.level" placeholder="请选择事件级别" style="width: 100%">
-              <el-option
-                v-for="(dice, value) in eventLevel"
-                :key="value"
-                :label="dice"
-                :value="value"
-              />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="输出参数:" prop="inputs">
-            <el-table :data="form.valueType.properties" height="300px">
-              <el-table-column align="left" label="标识" prop="id" />
-              <el-table-column align="left" label="名称" prop="name" />
-              <el-table-column align="left" label="数据类型" prop="type" >
-                <template slot-scope="scope">
-                  <span>{{ dataTypeOption[scope.row.valueType.type] }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                align="center"
-                class-name="small-padding fixed-width"
-                label="操作"
-                width="100px"
-              >
-                <template slot-scope="scope">
-                  <el-button
-                    icon="el-icon-edit"
-                    size="mini"
-                    type="text"
-                    @click="handleInputUpdate(scope.row, scope.$index)"
+        <el-form-item label="输出参数:" prop="inputs">
+          <el-table :data="form.valueType.properties" height="300px">
+            <el-table-column align="left" label="标识" prop="id" />
+            <el-table-column align="left" label="名称" prop="name" />
+            <el-table-column align="left" label="数据类型" prop="type">
+              <template slot-scope="scope">
+                <span>{{ dataTypeOption[scope.row.valueType.type] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              class-name="small-padding fixed-width"
+              label="操作"
+              width="200px"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  :disabled="scope.$index === 0"
+                  icon="el-icon-arrow-up"
+                  size="mini"
+                  type="text"
+                  @click="handleInputUp(scope.$index)"
+                >上移</el-button>
+                <el-button
+                  :disabled="scope.$index === form.valueType.properties.length - 1"
+                  icon="el-icon-arrow-down"
+                  size="mini"
+                  type="text"
+                  @click="handleInputDown(scope.$index)"
+                >下移</el-button>
+                <el-button
+                  icon="el-icon-edit"
+                  size="mini"
+                  type="text"
+                  @click="handleInputUpdate(scope.row, scope.$index)"
                   >修改</el-button
-                  >
+                >
 
-                  <el-button
-                    icon="el-icon-delete"
-                    size="mini"
-                    type="text"
-                    @click="handleInputDelete(scope.row, scope.$index)"
+                <el-button
+                  icon="el-icon-delete"
+                  size="mini"
+                  type="text"
+                  @click="handleInputDelete(scope.row, scope.$index)"
                   >删除</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-button
-              icon="el-icon-plus"
-              style="width: 100%;margin-top: 10px"
-              type="info"
-              @click="addParam"
-            >新增输出参数</el-button>
-          </el-form-item>
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-button
+            icon="el-icon-plus"
+            style="width: 100%;margin-top: 10px"
+            type="info"
+            @click="addParam"
+            >新增输出参数</el-button
+          >
+        </el-form-item>
 
-<!--          <el-form-item label="是否异步:" prop="async">-->
-<!--            <el-switch v-model="form.async"/>-->
-<!--          </el-form-item>-->
-        </el-form>
+        <!--          <el-form-item label="是否异步:" prop="async">-->
+        <!--            <el-switch v-model="form.async"/>-->
+        <!--          </el-form-item>-->
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="$emit('update:visible', false)">取 消</el-button>
@@ -110,11 +130,19 @@
           <el-input v-model="inputFormObj.form.id" placeholder="请输入标识" />
         </el-form-item>
         <el-form-item label="参数名称:" prop="name">
-          <el-input v-model="inputFormObj.form.name" placeholder="请输入参数名称" />
+          <el-input
+            v-model="inputFormObj.form.name"
+            placeholder="请输入参数名称"
+          />
         </el-form-item>
 
         <el-form-item label="数据类型:" prop="type">
-          <el-select v-model="inputFormObj.form.valueType.type" placeholder="请选择数据类型" style="width: 100%" @change="inputDataTypeChange">
+          <el-select
+            v-model="inputFormObj.form.valueType.type"
+            placeholder="请选择数据类型"
+            style="width: 100%"
+            @change="inputDataTypeChange"
+          >
             <el-option
               v-for="(dice, value) in dataTypeOption"
               :key="value"
@@ -123,13 +151,27 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="inputFormObj.form.valueType.type === 'enum'" label="枚举值:">
+        <el-form-item
+          v-if="inputFormObj.form.valueType.type === 'enum'"
+          label="枚举值:"
+        >
           <div class="enum-box">
             <div class="enum-header">
-              <el-button size="mini" type="primary" @click="addEnumItem">添加枚举项</el-button>
+              <el-button size="mini" type="primary" @click="addEnumItem"
+                >添加枚举项</el-button
+              >
             </div>
-            <el-table :data="inputFormObj.form.valueType.elements" border style="width: 100%">
-              <el-table-column align="center" label="序号" type="index" width="60"></el-table-column>
+            <el-table
+              :data="inputFormObj.form.valueType.elements"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                align="center"
+                label="序号"
+                type="index"
+                width="60"
+              ></el-table-column>
               <el-table-column label="值" prop="value" width="180">
                 <template slot-scope="scope">
                   <el-input
@@ -137,7 +179,12 @@
                     :class="{ 'is-error': scope.row.value }"
                     placeholder="请输入值"
                   ></el-input>
-                  <div v-if="scope.row.value===''" class="el-form-item__error">值不能为空</div>
+                  <div
+                    v-if="scope.row.value === ''"
+                    class="el-form-item__error"
+                  >
+                    值不能为空
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column label="描述" prop="text">
@@ -147,7 +194,9 @@
                     :class="{ 'is-error': scope.row.text }"
                     placeholder="请输入描述"
                   ></el-input>
-                  <div v-if="scope.row.text===''" class="el-form-item__error">描述不能为空</div>
+                  <div v-if="scope.row.text === ''" class="el-form-item__error">
+                    描述不能为空
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column align="center" label="操作" width="80">
@@ -164,9 +213,9 @@
             </el-table>
           </div>
         </el-form-item>
-<!--        <el-form-item label="是否必选:" prop="required">-->
-<!--          <el-switch v-model="inputFormObj.form.expands.required" />-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="是否必选:" prop="required">-->
+        <!--          <el-switch v-model="inputFormObj.form.expands.required" />-->
+        <!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitInputForm">确 定</el-button>
@@ -176,34 +225,12 @@
   </div>
 </template>
 <script>
-import { mapGetters, mapState } from "vuex";
-import JsonEditor from "./jsonEditor";
-import {dataTypeOption,eventLevel} from "@/basedata/physicalModel"
-// const dataTypeOption = {
-//   int: 'int(整数型)',
-//   long: 'long(长整数型)',
-//   float: 'float(单精度浮点型)',
-//   double: 'double(双精度浮点数)',
-//   string: 'text(字符串)',
-//   boolean: 'boolean(布尔型)',
-//   date: 'date(时间型)',
-//   enum: 'enum(枚举)',
-//   array: 'array(数组)',
-//   object: 'object(结构体)',
-//   file: 'file(文件)',
-//   password: 'password(密码)',
-//   geoPoint: 'geoPoint(地理位置)',
-// };
-// const eventLevel = {
-//   ordinary:'普通',
-//   warn:'警告',
-//   urgent:'紧急',
-// }
+import { dataTypeOption, eventLevel } from "@/basedata/physicalModel";
 
 const defaultenumForm = {
-  value: '',
-  text: ''
-}
+  value: "",
+  text: ""
+};
 
 const defaultForm = {
   id: "",
@@ -214,12 +241,10 @@ const defaultForm = {
   async: false,
   valueType: {
     type: "object",
-    properties: [
-    ]
+    properties: []
   }
 };
 
-
 const defaultInputForm = {
   id: "",
   name: "",
@@ -235,23 +260,22 @@ const defaultInputForm = {
 
 export default {
   name: "EventFormModel",
-  components: { JsonEditor },
   props: {
     visible: {
       type: Boolean,
-      default: false,
+      default: false
     },
     title: {
       type: String,
-      default: '新增',
+      default: "新增"
     },
     row: {
       type: Object,
-      default: () => {},
+      default: () => {}
     },
     tempType: {
       type: String,
-      default: "add",
+      default: "add"
     },
     paramIdx: {
       type: Number,
@@ -262,9 +286,6 @@ export default {
       default: []
     }
   },
-  computed: {
-    ...mapGetters(["groupList"]),
-  },
   data() {
     return {
       dataTypeOption,
@@ -279,8 +300,7 @@ export default {
         async: false,
         valueType: {
           type: "object",
-          properties: [
-          ]
+          properties: []
         }
       },
       inputFormObj: {
@@ -291,73 +311,73 @@ export default {
       inputFormRules: {
         id: [
           { required: true, message: "标识不能为空", trigger: "blur" },
-          { pattern: /^[a-zA-Z0-9_\-]+$/,message: '标识只能由数字、字母、下划线、中划线组成',trigger: "blur"},
+          {
+            pattern: /^[a-zA-Z0-9_\-]+$/,
+            message: "标识只能由数字、字母、下划线、中划线组成",
+            trigger: "blur"
+          },
           { validator: this.validateOutputId, trigger: "blur" }
         ],
-        name: [
-          { required: true, message: "名称不能为空", trigger: "blur" }
-        ]
+        name: [{ required: true, message: "名称不能为空", trigger: "blur" }]
       },
       // 表单校验
       rules: {
-        name: [
-          { required: true, message: "名称不能为空", trigger: "blur" },
-        ],
+        name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
         id: [
           { required: true, message: "标识不能为空", trigger: "blur" },
-          { pattern: /^[a-zA-Z0-9_\-]+$/,message: '标识只能由数字、字母、下划线、中划线组成',trigger: "blur"},
+          {
+            pattern: /^[a-zA-Z0-9_\-]+$/,
+            message: "标识只能由数字、字母、下划线、中划线组成",
+            trigger: "blur"
+          },
           { validator: this.validateEventId, trigger: "blur" }
         ],
-        type: [
-          { required: true, message: "数据类型不能为空", trigger: "blur" },
-        ]
-      },
+        type: [{ required: true, message: "数据类型不能为空", trigger: "blur" }]
+      }
     };
   },
-created() {
-    console.log("this.paramIdx", this.paramIdx, this.tempType);
+  created() {
     if (this.tempType === "update" && this.paramIdx >= 0) {
       this.form = JSON.parse(JSON.stringify(this.row));
     } else {
       // 新增时初始化表单
       this.form = JSON.parse(JSON.stringify(defaultForm));
-
     }
-},
-watch: {
-  visible(val) {
-    if (val) {
-      // 当弹窗打开时
-      if (this.tempType === "update" && this.paramIdx >= 0) {
-        // 编辑模式，复制传入的数据
-        this.form = JSON.parse(JSON.stringify(this.row));
+  },
+  watch: {
+    visible(val) {
+      if (val) {
+        // 当弹窗打开时
+        if (this.tempType === "update" && this.paramIdx >= 0) {
+          // 编辑模式，复制传入的数据
+          this.form = JSON.parse(JSON.stringify(this.row));
+        } else {
+          // 新增模式，重置表单数据
+          this.form = JSON.parse(JSON.stringify(defaultForm));
+        }
+
+        // 确保输入参数表单也被重置
+        this.inputFormObj = {
+          isEdit: false,
+          index: -1,
+          form: JSON.parse(JSON.stringify(defaultInputForm))
+        };
       } else {
-        // 新增模式，重置表单数据
-        this.form = JSON.parse(JSON.stringify(defaultForm));
+        // 当弹窗关闭时，重置表单校验状态
+        this.$nextTick(() => {
+          if (this.$refs.form) {
+            this.$refs.form.clearValidate();
+          }
+          if (this.$refs.inputForm) {
+            this.$refs.inputForm.clearValidate();
+          }
+        });
       }
-
-      // 确保输入参数表单也被重置
-      this.inputFormObj = {
-        isEdit: false,
-        index: -1,
-        form: JSON.parse(JSON.stringify(defaultInputForm))
-      };
-    } else {
-      // 当弹窗关闭时，重置表单校验状态
-      this.$nextTick(() => {
-        if (this.$refs.form) {
-          this.$refs.form.clearValidate();
-        }
-        if (this.$refs.inputForm) {
-          this.$refs.inputForm.clearValidate();
-        }
-      });
     }
-  }
-},
+  },
   methods: {
     // 自定义标识符验证规则
-    validateEventId(rule, value, callback){
+    validateEventId(rule, value, callback) {
       if (this.tempType === "update" && value === this.row.id) {
         // 如果是编辑模式且ID没有变化，直接通过验证
         callback();
@@ -365,103 +385,121 @@ watch: {
       }
 
       // 检查功能标识符是否重复
-      const isDuplicate = this.eventList && this.eventList.some(item => item.id === value);
+      const isDuplicate =
+        this.eventList && this.eventList.some(item => item.id === value);
       if (isDuplicate) {
-        callback(new Error('标识符已存在，请更换'));
+        callback(new Error("标识符已存在，请更换"));
       } else {
         callback();
       }
     },
     // 自定义输入参数标识符验证规则
-    validateOutputId(rule, value, callback){
-      if (this.inputFormObj.isEdit && value === this.form.valueType.properties[this.inputFormObj.index].id) {
+    validateOutputId(rule, value, callback) {
+      if (
+        this.inputFormObj.isEdit &&
+        value === this.form.valueType.properties[this.inputFormObj.index].id
+      ) {
         // 如果是编辑模式且ID没有变化，直接通过验证
         callback();
         return;
       }
 
       // 检查输入参数标识符是否重复
-      const isDuplicate = this.form.valueType.properties.some(item => item.id === value);
+      const isDuplicate = this.form.valueType.properties.some(
+        item => item.id === value
+      );
       if (isDuplicate) {
-        callback(new Error('参数标识符已存在，请更换'));
+        callback(new Error("参数标识符已存在，请更换"));
       } else {
         callback();
       }
     },
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           // 额外校验输入参数
-          if (!this.form.valueType.properties || this.form.valueType.properties.length === 0) {
-            this.$message.warning('请至少添加一个输出参数');
+          if (
+            !this.form.valueType.properties ||
+            this.form.valueType.properties.length === 0
+          ) {
+            this.$message.warning("请至少添加一个输出参数");
             return;
           }
           // 新增和修改操作
           if (this.tempType === "add") {
-            this.$store.dispatch("AddEvent", this.form).then(() => {
-              this.$message.success("添加成功");
-              this.$emit("ok");
-            }).catch(err => {
-              this.$message.error("添加失败：" + err);
-            });
+            this.$store
+              .dispatch("AddEvent", this.form)
+              .then(() => {
+                this.$message.success("添加成功");
+                this.$emit("ok");
+              })
+              .catch(err => {
+                this.$message.error("添加失败：" + err);
+              });
           } else if (this.tempType === "update") {
-            this.$store.dispatch("EditEvent", {
-              item: this.form,
-              idx: this.paramIdx,
-            }).then(() => {
-              this.$message.success("修改成功");
-              this.$emit("ok");
-            }).catch(err => {
-              this.$message.error("修改失败：" + err);
-            });
+            this.$store
+              .dispatch("EditEvent", {
+                item: this.form,
+                idx: this.paramIdx
+              })
+              .then(() => {
+                this.$message.success("修改成功");
+                this.$emit("ok");
+              })
+              .catch(err => {
+                this.$message.error("修改失败：" + err);
+              });
           }
         }
       });
     },
     inputDataTypeChange(val) {
       // 根据选择的数据类型设置valueType的type属性
-      if (val === 'int') {
-        this.inputFormObj.form.valueType.type = 'int';
+      if (val === "int") {
+        this.inputFormObj.form.valueType.type = "int";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'long') {
-        this.inputFormObj.form.valueType.type = 'long';
+      } else if (val === "long") {
+        this.inputFormObj.form.valueType.type = "long";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'float') {
-        this.inputFormObj.form.valueType.type = 'float';
+      } else if (val === "float") {
+        this.inputFormObj.form.valueType.type = "float";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'double') {
-        this.inputFormObj.form.valueType.type = 'double';
+      } else if (val === "double") {
+        this.inputFormObj.form.valueType.type = "double";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'string') {
-        this.inputFormObj.form.valueType.type = 'string';
+      } else if (val === "string") {
+        this.inputFormObj.form.valueType.type = "string";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'boolean') {
-        this.inputFormObj.form.valueType.type = 'boolean';
+      } else if (val === "boolean") {
+        this.inputFormObj.form.valueType.type = "boolean";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'date') {
-        this.inputFormObj.form.valueType.type = 'date';
+      } else if (val === "date") {
+        this.inputFormObj.form.valueType.type = "date";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'enum') {
-        this.inputFormObj.form.valueType.type = 'enum';
-        if (!this.inputFormObj.form.valueType.elements || this.inputFormObj.form.valueType.elements.length === 0) {
+      } else if (val === "enum") {
+        this.inputFormObj.form.valueType.type = "enum";
+        if (
+          !this.inputFormObj.form.valueType.elements ||
+          this.inputFormObj.form.valueType.elements.length === 0
+        ) {
           this.inputFormObj.form.valueType.elements = [];
           // 默认添加一个空的枚举项
           this.addEnumItem();
         }
-      } else if (val === 'array') {
-        this.inputFormObj.form.valueType.type = 'array';
+      } else if (val === "array") {
+        this.inputFormObj.form.valueType.type = "array";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'object') {
-        this.inputFormObj.form.valueType.type = 'object';
+      } else if (val === "object") {
+        this.inputFormObj.form.valueType.type = "object";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'file') {
-        this.inputFormObj.form.valueType.type = 'file';
+      } else if (val === "file") {
+        this.inputFormObj.form.valueType.type = "file";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'password') {
-        this.inputFormObj.form.valueType.type = 'password';
+      } else if (val === "password") {
+        this.inputFormObj.form.valueType.type = "password";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'geoPoint') {
-        this.inputFormObj.form.valueType.type = 'geoPoint';
+      } else if (val === "geoPoint") {
+        this.inputFormObj.form.valueType.type = "geoPoint";
         this.inputFormObj.form.valueType.elements = [];
       }
     },
@@ -474,10 +512,30 @@ watch: {
 
       // 添加一个新的枚举项
       const newEnumItem = JSON.parse(JSON.stringify(defaultenumForm));
-      newEnumItem.value = '';
-      newEnumItem.text = '';
+      newEnumItem.value = "";
+      newEnumItem.text = "";
       this.inputFormObj.form.valueType.elements.push(newEnumItem);
     },
+    removeEnumItem(index) {
+      this.$confirm("是否确认删除该枚举参数?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.inputFormObj.form.valueType.elements.splice(index, 1);
+          this.$message({
+            type: "success",
+            message: "删除成功!"
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除"
+          });
+        });
+    },
 
     // 修改提交方法，增加枚举项验证
     submitInputForm() {
@@ -485,21 +543,27 @@ watch: {
       this.$refs.inputForm.validate(valid => {
         if (valid) {
           // 如果是枚举类型，确保至少有一个枚举项
-          if (this.inputFormObj.form.valueType.type === 'enum' &&
+          if (
+            this.inputFormObj.form.valueType.type === "enum" &&
             (!this.inputFormObj.form.valueType.elements ||
-              this.inputFormObj.form.valueType.elements.length === 0)) {
-            this.$message.warning('枚举类型至少需要一个枚举项');
+              this.inputFormObj.form.valueType.elements.length === 0)
+          ) {
+            this.$message.warning("枚举类型至少需要一个枚举项");
             return;
           }
 
           // 验证枚举项的值和描述不能为空
-          if (this.inputFormObj.form.valueType.type === 'enum') {
+          if (this.inputFormObj.form.valueType.type === "enum") {
             let hasError = false;
             const enumValues = new Set();
-            for (let i = 0; i < this.inputFormObj.form.valueType.elements.length; i++) {
+            for (
+              let i = 0;
+              i < this.inputFormObj.form.valueType.elements.length;
+              i++
+            ) {
               const item = this.inputFormObj.form.valueType.elements[i];
-              let value  = !item.value;
-              let text  = !item.text;
+              let value = !item.value;
+              let text = !item.text;
               if (value || text) {
                 hasError = true;
                 break;
@@ -511,7 +575,7 @@ watch: {
               enumValues.add(item.value);
             }
             if (hasError) {
-              this.$message.warning('请完善枚举项的值和描述');
+              this.$message.warning("请完善枚举项的值和描述");
               return;
             }
           }
@@ -519,10 +583,16 @@ watch: {
           // 如果是编辑模式
           if (this.inputFormObj.isEdit) {
             // 更新现有输入参数
-            this.$set(this.form.valueType.properties, this.inputFormObj.index, this.inputFormObj.form);
+            this.$set(
+              this.form.valueType.properties,
+              this.inputFormObj.index,
+              this.inputFormObj.form
+            );
           } else {
             // 添加新的输入参数
-            this.form.valueType.properties.push(JSON.parse(JSON.stringify(this.inputFormObj.form)));
+            this.form.valueType.properties.push(
+              JSON.parse(JSON.stringify(this.inputFormObj.form))
+            );
           }
 
           // 关闭弹窗
@@ -534,11 +604,13 @@ watch: {
           });
 
           // 提示成功
-          this.$message.success(this.inputFormObj.isEdit ? '修改成功' : '添加成功');
+          this.$message.success(
+            this.inputFormObj.isEdit ? "修改成功" : "添加成功"
+          );
         }
       });
     },
-    addParam(){
+    addParam() {
       this.inputFormObj = {
         isEdit: false,
         index: -1,
@@ -546,125 +618,89 @@ watch: {
       };
       this.inputParamOpen = true;
     },
-/**
- * 修改输入参数
- * @param {Object} row 行数据
- * @param {Number} index 行索引
- */
- handleInputUpdate(row, index) {
-  this.inputFormObj = {
-    isEdit: true,
-    index: index,
-    form: JSON.parse(JSON.stringify(row))
-  };
-  this.inputParamOpen = true;
-},
+    /**
+     * 上移功能
+     * @param {Number} index 当前功能索引
+     */
+    handleInputUp(index) {
+      if (index === 0) return; // 已经是第一个，不能再上移
 
-/**
- * 删除输入参数
- * @param {Object} row 行数据
- * @param {Number} index 行索引
- */
-handleInputDelete(row, index) {
-  this.$confirm('是否确认删除该输出参数?', '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    this.form.valueType.properties.splice(index, 1);
-    this.$message({
-      type: 'success',
-      message: '删除成功!'
-    });
-  }).catch(() => {
-    this.$message({
-      type: 'info',
-      message: '已取消删除'
-    });
-  });
-},    inputChange() {
+      try  {
+        // 交换当前项与上一项的位置
+        const temp = this.form.valueType.properties[index];
+        this.$set(this.form.valueType.properties, index, this.form.valueType.properties[index - 1]);
+        this.$set(this.form.valueType.properties, index - 1, temp);
+        this.$message({
+          type: 'success',
+          message: '上移成功!'
+        });
+      } catch (error) {
+        this.$message.error("操作失败：" + error);
+      }
+    },
+
+    /**
+     * 下移功能
+     * @param {Number} index 当前功能索引
+     */
+    handleInputDown(index) {
+      if (index === this.form.valueType.properties.length - 1) return; // 已经是最后一个，不能再下移
+
+      try  {
+        // 交换当前项与下一项的位置
+        const temp = this.form.valueType.properties[index];
+        this.$set(this.form.valueType.properties, index, this.form.valueType.properties[index + 1]);
+        this.$set(this.form.valueType.properties, index + 1, temp);
+        this.$message({
+          type: 'success',
+          message: '下移成功!'
+        });
+      } catch (error) {
+        this.$message.error("操作失败：" + error);
+      }
+    },
+    /**
+     * 修改输入参数
+     * @param {Object} row 行数据
+     * @param {Number} index 行索引
+     */
+    handleInputUpdate(row, index) {
+      this.inputFormObj = {
+        isEdit: true,
+        index: index,
+        form: JSON.parse(JSON.stringify(row))
+      };
+      this.inputParamOpen = true;
+    },
+
+    /**
+     * 删除输入参数
+     * @param {Object} row 行数据
+     * @param {Number} index 行索引
+     */
+    handleInputDelete(row, index) {
+      this.$confirm("是否确认删除该输出参数?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.form.valueType.properties.splice(index, 1);
+          this.$message({
+            type: "success",
+            message: "删除成功!"
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除"
+          });
+        });
+    },
+    inputChange() {
       this.$forceUpdate();
     },
-    cmdChange(val) {
-      let newArr = this.groupList.filter((v) => {
-        if (v["cmdKey"] === val) {
-          return v["cmdType"];
-        }
-      });
-      this.form.funRwType = newArr[0] || this.form.funRwType;
-    },
-    getParamIten(idx) {
-      this.$store.dispatch("GetAttributeItem", idx).then((res) => {
-        console.log("GetAttributeItem",res,idx);
-        this.form = {show: true, sort: 100,dataFormat: {
-            type: null,
-            list: {}
-          }, ...JSON.parse(JSON.stringify(res))};
-      });
-    },
-    /** 提交验证 */
-    // submitForm: function () {
-    //   this.$refs["form"].validate((valid) => {
-    //     if (valid) {
-    //       // 新增和修改操作
-    //       if (this.tempType === "add") {
-    //         this.$store.dispatch("AddEvent", this.form).then(() => {
-    //           this.$message.success("添加成功");
-    //           this.$emit("ok");
-    //         }).catch(err => {
-    //           this.$message.error("添加失败：" + err);
-    //         });
-    //       } else if (this.tempType === "update") {
-    //         this.$store.dispatch("EditEvent", {
-    //           item: this.form,
-    //           idx: this.paramIdx,
-    //         }).then(() => {
-    //           this.$message.success("修改成功");
-    //           this.$emit("ok");
-    //         }).catch(err => {
-    //           this.$message.error("修改失败：" + err);
-    //         });
-    //       }
-    //     }
-    //   });
-    // },
-    // 回调 ok
-    //数据类型值变化出发方法
-    funDataTypeChange(val) {
-      this.form.funValAcc = null;
-      this.form.funValidType = "";
-    },
-    addJsonObj() {
-      this.$refs["jsonEditors"].addHandel();
-    },
-    jsonEvent(data) {
-      this.form.funObj = data;
-    },
-    addEnumJsonObj() {
-      this.$refs["enumJsonEditors"].addHandel();
-    },
-    enumJsonEvent(data) {
-      this.form.dataFormat.list = data;
-    },
-    // 校验方式发生变化的方法
-    funValidTypeChange(val) {
-      this.form.funValidType = val;
-      this.form.funValMax = "";
-      this.form.funValMin = "";
-      this.form.funObj = "";
-      if (val === "ENUM") {
-        this.form.funObj = '{"0":""}';
-      }
-      this.$forceUpdate()
-    },
-    dataFormatTypeChange(val) {
-      this.form.dataFormat.type = val;
-      this.form.dataFormat.list = '';
-      if (val === "ENUM") {
-        this.form.dataFormat.list = '{"0":""}';
-      }
-      this.$forceUpdate()
-    },
     // 添加一个监听输入参数弹窗关闭的方法
     handleInputDialogClose() {
       this.$nextTick(() => {
@@ -673,75 +709,30 @@ handleInputDelete(row, index) {
         }
       });
     }
-  },
+  }
 };
 </script>
-<style lang="scss">
-.attribute-form-view {
+<style lang="scss" scoped>
+.event-form-model {
   .item-title-wrap {
     font-size: 15px;
     font-weight: 600;
     height: 30px;
   }
-  .custom-wrap {
-    border: 1px solid #d8d7d7;
-    padding-top: 20px;
-    margin-top: 10px;
-    background: #f0f0f0;
-    padding-right: 10px;
-    .el-form-item {
-      border-bottom: 1px dashed #bdbdbd;
-      padding-bottom: 12px;
-      margin-bottom: 10px;
-      margin-left: 10px;
-    }
-    .el-form-item--medium .el-form-item__label {
-      width: 90px !important;
-    }
-    .el-form-item--medium .el-form-item__content {
-      margin-left: 90px !important;
-    }
-    .enumTypeDiv {
-      display: flex;
-      justify-content: flex-end;
-      max-height: 200px;
-      overflow: auto;
-      .enum-item {
-        width: 90%;
-        display: flex;
-        justify-content: space-around;
-        align-items: center;
-      }
-    }
-    .max-min-row {
-      width: 90%;
-      padding: 0;
-      margin-left: 5% !important;
-      margin-right: 0 !important;
-      .el-form-item {
-        border: 0;
-        margin-left: 0;
-      }
-      .el-form-item--medium .el-form-item__content {
-        margin-left: 0px !important;
-      }
-    }
-
-  }
-  .enum-box{
+  .enum-box {
     border: 1px solid #d8d7d7;
     padding: 10px;
     margin-bottom: 10px;
-    .enumTypeDiv{
+    .enumTypeDiv {
       margin-top: 10px;
     }
+    .enum-header {
+      margin-bottom: 10px;
+    }
   }
   .el-select {
     width: 100%;
   }
-  .el-input-number {
-    width: 100%;
-  }
   .enumTypeDiv {
     display: flex;
     justify-content: flex-end;
@@ -768,22 +759,13 @@ handleInputDelete(row, index) {
     }
   }
 }
-.enum-box {
-  border: 1px solid #d8d7d7;
-  padding: 10px;
-  margin-bottom: 10px;
-
-  .enum-header {
-    margin-bottom: 10px;
-  }
-}
 
 .is-error input {
-  border-color: #F56C6C;
+  border-color: #f56c6c;
 }
 
 .el-form-item__error {
-  color: #F56C6C;
+  color: #f56c6c;
   font-size: 12px;
   line-height: 1;
   padding-top: 4px;
@@ -792,5 +774,3 @@ handleInputDelete(row, index) {
   left: 0;
 }
 </style>
-
-
diff --git a/src/views/profile/attribute/eventView.vue b/src/views/profile/attribute/eventView.vue
index 6b31e2e3..845d48b7 100644
--- a/src/views/profile/attribute/eventView.vue
+++ b/src/views/profile/attribute/eventView.vue
@@ -33,9 +33,23 @@
         align="center"
         class-name="small-padding fixed-width"
         label="操作"
-        width="180px"
+        width="200px"
       >
         <template slot-scope="scope">
+          <el-button
+            :disabled="scope.$index === 0"
+            icon="el-icon-arrow-up"
+            size="mini"
+            type="text"
+            @click="handleMoveUp(scope.$index)"
+          >上移</el-button>
+          <el-button
+            :disabled="scope.$index === eventList.length - 1"
+            icon="el-icon-arrow-down"
+            size="mini"
+            type="text"
+            @click="handleMoveDown(scope.$index)"
+          >下移</el-button>
           <el-button
             icon="el-icon-edit"
             size="mini"
@@ -55,21 +69,13 @@
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :limit.sync="queryParams.pageSize"
-      :page.sync="queryParams.pageNum"
-      :total="total"
-      @pagination="getList"
-    />
-
     <event-form-model
       ref="eventForm"
       :eventList="eventList"
       :paramIdx="eventFormObj.paramIdx"
       :row="eventFormObj.eventForm"
       :tempType="eventFormObj.modelType"
-      :title="eventFormObj.modelType == 'add' ? '新增' : '编辑'"
+      :title="eventFormObj.modelType === 'add' ? '新增' : '编辑'"
       :visible.sync="eventOpen"
       @ok="handleFormOk"
     ></event-form-model>
@@ -77,7 +83,6 @@
 </template>
 
 <script>
-import JsonEditor from "./jsonEditor.vue";
 import ParamsJsonWrap from "./paramsJson";
 import eventFormModel from "@/views/profile/attribute/eventFormModel";
 
@@ -90,7 +95,6 @@ const eventLevel = {
 export default {
   name: "EventView",
   components: {
-    JsonEditor,
     ParamsJsonWrap,
     eventFormModel
   },
@@ -110,42 +114,14 @@ export default {
       eventOpen: false,
       // 遮罩层
       loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 总条数
-      total: 0,
       // 功能定义表格数据
       eventList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       attributeopen: false,
-      // 查询参数
-      queryParams: {},
       // 表单参数
       form: {},
-      // 表单校验
-      rules: {
-        funName: [{ required: true, message: "名称不能为空", trigger: "blur" }],
-        funKey: [
-          { required: true, message: "标识符不能为空", trigger: "blur" }
-        ],
-        funDataType: [
-          { required: true, message: "数据类型不能为空", trigger: "blur" }
-        ],
-        funRwType: [
-          { required: true, message: "传输类型不能为空", trigger: "blur" }
-        ],
-        funValidType: [
-          { required: true, message: "校验方式不能为空", trigger: "blur" }
-        ]
-      },
-      baseModelId: "",
-      tempType: "",
       eventFormObj: {
         id: "",
         name: "",
@@ -164,26 +140,6 @@ export default {
     this.getList();
   },
   methods: {
-    //数据类型值变化出发方法
-    funDataTypeChange(val) {
-      this.form.funValAcc = null;
-      this.form.funValidType = "";
-    },
-    addJsonObj() {
-      this.$refs["jsonEditors"].addHandel();
-    },
-    jsonEvent(data) {
-      this.form.funObj = data;
-    },
-    // 校验方式发生变化的方法
-    funValidTypeChange(val) {
-      this.form.funValMax = "";
-      this.form.funValMin = "";
-      this.form.funObj = "";
-      if (val === "ENUM") {
-        this.form.funObj = '{"0":""}';
-      }
-    },
     /** 查询功能定义列表 */
     getList() {
       this.loading = true;
@@ -197,41 +153,6 @@ export default {
         });
       }, 50);
     },
-    setList(list) {
-      this.loading = true;
-      this.eventList = [];
-      setTimeout(() => {
-        this.eventList = list;
-        this.$forceUpdate();
-        this.loading = false;
-      }, 50);
-    },
-    // 取消按钮
-    cancel() {
-      this.attributeopen = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        sourceId: this.sourceId,
-        mainId: undefined,
-        funName: undefined,
-        funKey: undefined,
-        funDataType: undefined,
-        funValAcc: undefined,
-        funRwType: undefined,
-        funValidType: undefined,
-        funValMin: undefined,
-        funValMax: undefined,
-        funObj: {},
-        unitName: ""
-      };
-      this.resetForm("form");
-    },
-    handleParams() {
-      this.$emit("handleClick", { type: "param", idx: 0 });
-    },
     /** 新增按钮操作 */
     handleAdd() {
       this.eventFormObj = {
@@ -252,6 +173,55 @@ export default {
       };
       this.eventOpen = true;
     },
+    /**
+     * 上移功能
+     * @param {Number} index 当前功能索引
+     */
+    handleMoveUp(index) {
+      if (index === 0) return; // 已经是第一个，不能再上移
+
+      // 交换当前项与上一项的位置
+      const temp = this.eventList[index];
+      this.$set(this.eventList, index, this.eventList[index - 1]);
+      this.$set(this.eventList, index - 1, temp);
+
+      // 保存到 store
+      this.$store.dispatch("UpdateEventList", this.eventList).then(() => {
+        this.$message({
+          type: 'success',
+          message: '上移成功!'
+        });
+      }).catch(err => {
+        this.$message.error("操作失败：" + err);
+        // 恢复原状
+        this.getList();
+      });
+    },
+
+    /**
+     * 下移功能
+     * @param {Number} index 当前功能索引
+     */
+    handleMoveDown(index) {
+      if (index === this.eventList.length - 1) return; // 已经是最后一个，不能再下移
+
+      // 交换当前项与下一项的位置
+      const temp = this.eventList[index];
+      this.$set(this.eventList, index, this.eventList[index + 1]);
+      this.$set(this.eventList, index + 1, temp);
+
+      // 保存到 store
+      this.$store.dispatch("UpdateEventList", this.eventList).then(() => {
+        this.$message({
+          type: 'success',
+          message: '下移成功!'
+        });
+      }).catch(err => {
+        this.$message.error("操作失败：" + err);
+        // 恢复原状
+        this.getList();
+      });
+    },
 
     /** 修改按钮操作 */
     handleUpdate(row, idx) {
@@ -301,88 +271,11 @@ export default {
   }
 };
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .product-customparams-wrap {
   .nl-dialog .el-dialog:not(.is-fullscreen) {
     margin-top: 3vh !important;
   }
-  .eldialog-wrap {
-    .el-dialog__header {
-      border-bottom: 1px solid #bdbdbd;
-    }
-    .el-dialog__body {
-      padding: 0px;
-    }
-    .form-button-div {
-      margin-top: 20px;
-      height: 60px;
-      border-top: 1px solid #bdbdbd;
-      text-align: right;
-      width: 100%;
-      padding-top: 15px;
-
-      .el-button + .el-button {
-        margin-right: 10px;
-      }
-      .el-button {
-        padding-top: 8px;
-      }
-    }
-    .el-select {
-      width: 100%;
-    }
-    .el-input-number {
-      width: 100%;
-    }
-    .item-title-wrap {
-      font-size: 15px;
-      font-weight: 600;
-      height: 30px;
-    }
-    .custom-wrap {
-      border: 1px solid #d8d7d7;
-      padding-top: 20px;
-      background: #f0f0f0;
-      padding-right: 10px;
-      .el-form-item {
-        border-bottom: 1px dashed #bdbdbd;
-        padding-bottom: 12px;
-        margin-bottom: 10px;
-        margin-left: 10px;
-      }
-      .el-form-item--medium .el-form-item__label {
-        width: 90px !important;
-      }
-      .el-form-item--medium .el-form-item__content {
-        margin-left: 90px !important;
-      }
-      .enumTypeDiv {
-        display: flex;
-        justify-content: flex-end;
-        max-height: 200px;
-        overflow: auto;
-        .enum-item {
-          width: 90%;
-          display: flex;
-          justify-content: space-around;
-          align-items: center;
-        }
-      }
-      .max-min-row {
-        width: 90%;
-        padding: 0;
-        margin-left: 5% !important;
-        margin-right: 0 !important;
-        .el-form-item {
-          border: 0;
-          margin-left: 0;
-        }
-        .el-form-item--medium .el-form-item__content {
-          margin-left: 0px !important;
-        }
-      }
-    }
-  }
   .params-eldialog {
     .el-dialog__header {
     }
diff --git a/src/views/profile/attribute/functionFormModel.vue b/src/views/profile/attribute/functionFormModel.vue
index c811c647..8c8e3dd6 100644
--- a/src/views/profile/attribute/functionFormModel.vue
+++ b/src/views/profile/attribute/functionFormModel.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="attribute-form-view">
+  <div class="function-form-model">
     <el-dialog
       :close-on-click-modal="false"
       :modal="false"
@@ -8,81 +8,98 @@
       class="params-eldialog"
       top="5vh"
       width="800px"
-      @close="$emit('update:visible', false)">
-        <el-form
-          ref="form"
-          :model="form"
-          :rules="rules"
-          label-position="top"
-          style="padding: 0 15px"
-        >
-          <el-row :gutter="20">
-            <el-col :span="12">
-              <el-form-item label="标识:" prop="id">
-                <el-input
-                  v-model="form.id"
-                  placeholder="请输入标识"
-                  @input="inputChange"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="功能名称:" prop="name">
-                <el-input v-model="form.name" placeholder="请输入功能名称" />
-              </el-form-item>
-            </el-col>
-          </el-row>
+      @close="$emit('update:visible', false)"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-position="top"
+        style="padding: 0 15px"
+      >
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="标识:" prop="id">
+              <el-input
+                v-model="form.id"
+                placeholder="请输入标识"
+                @input="inputChange"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="功能名称:" prop="name">
+              <el-input v-model="form.name" placeholder="请输入功能名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-          <el-form-item label="输入参数:" prop="inputs">
-            <el-table :data="form.inputs" height="300px">
-              <el-table-column align="left" label="标识" prop="id" />
-              <el-table-column align="left" label="参数名称" prop="name" />
-              <el-table-column align="center" label="是否必选" prop="required" >
-                <template slot-scope="scope">
-                  <span>{{ scope.row.expands.required ? '是' : '否'}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column align="left" label="数据类型" prop="type" >
-                <template slot-scope="scope">
-                  <span>{{ dataTypeOption[scope.row.valueType.type] }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                align="center"
-                class-name="small-padding fixed-width"
-                label="操作"
-                width="100px"
-              >
-                <template slot-scope="scope">
-                  <el-button
-                    icon="el-icon-edit"
-                    size="mini"
-                    type="text"
-                    @click="handleInputUpdate(scope.row, scope.$index)"
+        <el-form-item label="输入参数:" prop="inputs">
+          <el-table :data="form.inputs" height="300px">
+            <el-table-column align="left" label="标识" prop="id" />
+            <el-table-column align="left" label="参数名称" prop="name" />
+            <el-table-column align="center" label="是否必选" prop="required">
+              <template slot-scope="scope">
+                <span>{{ scope.row.expands.required ? "是" : "否" }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="数据类型" prop="type">
+              <template slot-scope="scope">
+                <span>{{ dataTypeOption[scope.row.valueType.type] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              class-name="small-padding fixed-width"
+              label="操作"
+              width="200px"
+            >
+              <template slot-scope="scope">
+                <el-button
+                  :disabled="scope.$index === 0"
+                  icon="el-icon-arrow-up"
+                  size="mini"
+                  type="text"
+                  @click="handleInputUp(scope.$index)"
+                >上移</el-button>
+                <el-button
+                  :disabled="scope.$index === form.inputs.length - 1"
+                  icon="el-icon-arrow-down"
+                  size="mini"
+                  type="text"
+                  @click="handleInputDown(scope.$index)"
+                >下移</el-button>
+                <el-button
+                  icon="el-icon-edit"
+                  size="mini"
+                  type="text"
+                  @click="handleInputUpdate(scope.row, scope.$index)"
                   >修改</el-button
-                  >
-                  <el-button
-                    icon="el-icon-delete"
-                    size="mini"
-                    type="text"
-                    @click="handleInputDelete(scope.row, scope.$index)"
+                >
+                <el-button
+                  icon="el-icon-delete"
+                  size="mini"
+                  type="text"
+                  @click="handleInputDelete(scope.row, scope.$index)"
                   >删除</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-button
-              icon="el-icon-plus"
-              style="width: 100%;margin-top: 10px"
-              type="info"
-              @click="addInputParam"
-            >新增输入参数</el-button>
-          </el-form-item>
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-button
+            icon="el-icon-plus"
+            plain
+            style="width: 100%;margin-top: 10px"
+            type="info"
+            @click="addInputParam"
+            >新增输入参数</el-button
+          >
+        </el-form-item>
 
-          <el-form-item label="是否异步:" prop="async">
-            <el-switch v-model="form.async"/>
-          </el-form-item>
-        </el-form>
+        <el-form-item label="是否异步:" prop="async">
+          <el-switch v-model="form.async" />
+        </el-form-item>
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="$emit('update:visible', false)">取 消</el-button>
@@ -109,11 +126,19 @@
           <el-input v-model="inputFormObj.form.id" placeholder="请输入标识" />
         </el-form-item>
         <el-form-item label="参数名称:" prop="name">
-          <el-input v-model="inputFormObj.form.name" placeholder="请输入参数名称" />
+          <el-input
+            v-model="inputFormObj.form.name"
+            placeholder="请输入参数名称"
+          />
         </el-form-item>
 
         <el-form-item label="数据类型:" prop="type">
-          <el-select v-model="inputFormObj.form.valueType.type" placeholder="请选择数据类型" style="width: 100%" @change="inputDataTypeChange">
+          <el-select
+            v-model="inputFormObj.form.valueType.type"
+            placeholder="请选择数据类型"
+            style="width: 100%"
+            @change="inputDataTypeChange"
+          >
             <el-option
               v-for="(dice, value) in dataTypeOption"
               :key="value"
@@ -122,13 +147,27 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item v-if="inputFormObj.form.valueType.type === 'enum'" label="枚举值:">
+        <el-form-item
+          v-if="inputFormObj.form.valueType.type === 'enum'"
+          label="枚举值:"
+        >
           <div class="enum-box">
             <div class="enum-header">
-              <el-button size="mini" type="primary" @click="addEnumItem">添加枚举项</el-button>
+              <el-button size="mini" type="primary" @click="addEnumItem"
+                >添加枚举项</el-button
+              >
             </div>
-            <el-table :data="inputFormObj.form.valueType.elements" border style="width: 100%">
-              <el-table-column align="center" label="序号" type="index" width="60"></el-table-column>
+            <el-table
+              :data="inputFormObj.form.valueType.elements"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                align="center"
+                label="序号"
+                type="index"
+                width="60"
+              ></el-table-column>
               <el-table-column label="值" prop="value" width="180">
                 <template slot-scope="scope">
                   <el-input
@@ -136,7 +175,12 @@
                     :class="{ 'is-error': scope.row.value }"
                     placeholder="请输入值"
                   ></el-input>
-                  <div v-if="scope.row.value===''" class="el-form-item__error">值不能为空</div>
+                  <div
+                    v-if="scope.row.value === ''"
+                    class="el-form-item__error"
+                  >
+                    值不能为空
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column label="描述" prop="text">
@@ -146,16 +190,17 @@
                     :class="{ 'is-error': scope.row.text }"
                     placeholder="请输入描述"
                   ></el-input>
-                  <div v-if="scope.row.text===''" class="el-form-item__error">描述不能为空</div>
+                  <div v-if="scope.row.text === ''" class="el-form-item__error">
+                    描述不能为空
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column align="center" label="操作" width="80">
                 <template slot-scope="scope">
                   <el-button
-                    circle
                     icon="el-icon-delete"
-                    size="mini"
-                    type="danger"
+                    style="color: red"
+                    type="text"
                     @click="removeEnumItem(scope.$index)"
                   ></el-button>
                 </template>
@@ -175,64 +220,44 @@
   </div>
 </template>
 <script>
-import { mapGetters, mapState } from "vuex";
-import JsonEditor from "./jsonEditor";
-import {dataTypeOption} from "@/basedata/physicalModel"
-// const dataTypeOption = {
-//   int: 'int(整数型)',
-//   long: 'long(长整数型)',
-//   float: 'float(单精度浮点型)',
-//   double: 'double(双精度浮点数)',
-//   string: 'text(字符串)',
-//   boolean: 'boolean(布尔型)',
-//   date: 'date(时间型)',
-//   enum: 'enum(枚举)',
-//   array: 'array(数组)',
-//   object: 'object(结构体)',
-//   file: 'file(文件)',
-//   password: 'password(密码)',
-//   geoPoint: 'geoPoint(地理位置)',
-// };
+import { dataTypeOption } from "@/basedata/physicalModel";
 
 const defaultenumForm = {
-  value: '',
-  text: ''
-}
+  value: "",
+  text: ""
+};
 
 const defaultInputForm = {
-  id: '',
-  name: '',
+  id: "",
+  name: "",
   expands: {
-    required:false
+    required: false
   },
   valueType: {
     expands: {},
-    type: 'int',
+    type: "int",
     elements: []
   }
 };
 
-
-
 export default {
   name: "FunctionFormModel",
-  components: { JsonEditor },
   props: {
     visible: {
       type: Boolean,
-      default: false,
+      default: false
     },
     title: {
       type: String,
-      default: '新增',
+      default: "新增"
     },
     row: {
       type: Object,
-      default: () => {},
+      default: () => {}
     },
     tempType: {
       type: String,
-      default: "add",
+      default: "add"
     },
     paramIdx: {
       type: Number,
@@ -243,20 +268,17 @@ export default {
       default: []
     }
   },
-  computed: {
-    ...mapGetters(["groupList"]),
-  },
   data() {
     return {
       dataTypeOption,
       inputParamOpen: false,
       form: {
-        id: '',
-        name: '',
+        id: "",
+        name: "",
         expands: {},
         async: false,
         inputs: [],
-        output: {},
+        output: {}
       },
       inputFormObj: {
         isEdit: false,
@@ -266,39 +288,40 @@ export default {
       inputFormRules: {
         id: [
           { required: true, message: "标识不能为空", trigger: "blur" },
-          { pattern: /^[a-zA-Z0-9_\-]+$/,message: '标识只能由数字、字母、下划线、中划线组成',trigger: "blur"},
+          {
+            pattern: /^[a-zA-Z0-9_\-]+$/,
+            message: "标识只能由数字、字母、下划线、中划线组成",
+            trigger: "blur"
+          },
           { validator: this.validateInputId, trigger: "blur" }
         ],
-        name: [
-          { required: true, message: "参数名称不能为空", trigger: "blur" }
-        ],
+        name: [{ required: true, message: "参数名称不能为空", trigger: "blur" }]
       },
       // 表单校验
       rules: {
-        name: [
-          { required: true, message: "名称不能为空", trigger: "blur" },
-        ],
+        name: [{ required: true, message: "名称不能为空", trigger: "blur" }],
         cmdKey: [{ required: true, message: "分组不能为空", trigger: "blur" }],
         id: [
           { required: true, message: "标识不能为空", trigger: "blur" },
-          { pattern: /^[a-zA-Z0-9_\-]+$/,message: '标识只能由数字、字母、下划线、中划线组成',trigger: "blur"},
+          {
+            pattern: /^[a-zA-Z0-9_\-]+$/,
+            message: "标识只能由数字、字母、下划线、中划线组成",
+            trigger: "blur"
+          },
           { validator: this.validateFunctionId, trigger: "blur" }
         ],
-        type: [
-          { required: true, message: "数据类型不能为空", trigger: "blur" },
-        ],
-      },
+        type: [{ required: true, message: "数据类型不能为空", trigger: "blur" }]
+      }
     };
   },
   created() {
-    console.log("this.paramIdx", this.paramIdx, this.tempType);
     if (this.tempType === "update" && this.paramIdx >= 0) {
       this.form = JSON.parse(JSON.stringify(this.row));
     } else {
       // 新增时初始化表单
       this.form = {
-        id: '',
-        name: '',
+        id: "",
+        name: "",
         expands: {},
         async: true,
         inputs: [],
@@ -316,8 +339,8 @@ export default {
         } else {
           // 新增模式，重置表单数据
           this.form = {
-            id: '',
-            name: '',
+            id: "",
+            name: "",
             expands: {},
             async: true,
             inputs: [],
@@ -346,7 +369,7 @@ export default {
   },
   methods: {
     // 自定义标识符验证规则
-    validateFunctionId(rule, value, callback){
+    validateFunctionId(rule, value, callback) {
       if (this.tempType === "update" && value === this.row.id) {
         // 如果是编辑模式且ID没有变化，直接通过验证
         callback();
@@ -354,16 +377,20 @@ export default {
       }
 
       // 检查功能标识符是否重复
-      const isDuplicate = this.functionList && this.functionList.some(item => item.id === value);
+      const isDuplicate =
+        this.functionList && this.functionList.some(item => item.id === value);
       if (isDuplicate) {
-        callback(new Error('标识符已存在，请更换'));
+        callback(new Error("标识符已存在，请更换"));
       } else {
         callback();
       }
     },
     // 自定义输入参数标识符验证规则
-    validateInputId(rule, value, callback){
-      if (this.inputFormObj.isEdit && value === this.form.inputs[this.inputFormObj.index].id) {
+    validateInputId(rule, value, callback) {
+      if (
+        this.inputFormObj.isEdit &&
+        value === this.form.inputs[this.inputFormObj.index].id
+      ) {
         // 如果是编辑模式且ID没有变化，直接通过验证
         callback();
         return;
@@ -372,55 +399,58 @@ export default {
       // 检查输入参数标识符是否重复
       const isDuplicate = this.form.inputs.some(item => item.id === value);
       if (isDuplicate) {
-        callback(new Error('输入参数标识符已存在，请更换'));
+        callback(new Error("输入参数标识符已存在，请更换"));
       } else {
         callback();
       }
     },
     inputDataTypeChange(val) {
       // 根据选择的数据类型设置valueType的type属性
-      if (val === 'int') {
-        this.inputFormObj.form.valueType.type = 'int';
+      if (val === "int") {
+        this.inputFormObj.form.valueType.type = "int";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'long') {
-        this.inputFormObj.form.valueType.type = 'long';
+      } else if (val === "long") {
+        this.inputFormObj.form.valueType.type = "long";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'float') {
-        this.inputFormObj.form.valueType.type = 'float';
+      } else if (val === "float") {
+        this.inputFormObj.form.valueType.type = "float";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'double') {
-        this.inputFormObj.form.valueType.type = 'double';
+      } else if (val === "double") {
+        this.inputFormObj.form.valueType.type = "double";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'string') {
-        this.inputFormObj.form.valueType.type = 'string';
+      } else if (val === "string") {
+        this.inputFormObj.form.valueType.type = "string";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'boolean') {
-        this.inputFormObj.form.valueType.type = 'boolean';
+      } else if (val === "boolean") {
+        this.inputFormObj.form.valueType.type = "boolean";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'date') {
-        this.inputFormObj.form.valueType.type = 'date';
+      } else if (val === "date") {
+        this.inputFormObj.form.valueType.type = "date";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'enum') {
-        this.inputFormObj.form.valueType.type = 'enum';
-        if (!this.inputFormObj.form.valueType.elements || this.inputFormObj.form.valueType.elements.length === 0) {
+      } else if (val === "enum") {
+        this.inputFormObj.form.valueType.type = "enum";
+        if (
+          !this.inputFormObj.form.valueType.elements ||
+          this.inputFormObj.form.valueType.elements.length === 0
+        ) {
           this.inputFormObj.form.valueType.elements = [];
           // 默认添加一个空的枚举项
           this.addEnumItem();
         }
-      } else if (val === 'array') {
-        this.inputFormObj.form.valueType.type = 'array';
+      } else if (val === "array") {
+        this.inputFormObj.form.valueType.type = "array";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'object') {
-        this.inputFormObj.form.valueType.type = 'object';
+      } else if (val === "object") {
+        this.inputFormObj.form.valueType.type = "object";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'file') {
-        this.inputFormObj.form.valueType.type = 'file';
+      } else if (val === "file") {
+        this.inputFormObj.form.valueType.type = "file";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'password') {
-        this.inputFormObj.form.valueType.type = 'password';
+      } else if (val === "password") {
+        this.inputFormObj.form.valueType.type = "password";
         this.inputFormObj.form.valueType.elements = [];
-      } else if (val === 'geoPoint') {
-        this.inputFormObj.form.valueType.type = 'geoPoint';
+      } else if (val === "geoPoint") {
+        this.inputFormObj.form.valueType.type = "geoPoint";
         this.inputFormObj.form.valueType.elements = [];
       }
     },
@@ -433,10 +463,30 @@ export default {
 
       // 添加一个新的枚举项
       const newEnumItem = JSON.parse(JSON.stringify(defaultenumForm));
-      newEnumItem.value = '';
-      newEnumItem.text = '';
+      newEnumItem.value = "";
+      newEnumItem.text = "";
       this.inputFormObj.form.valueType.elements.push(newEnumItem);
     },
+    removeEnumItem(index) {
+      this.$confirm("是否确认删除该枚举参数?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.inputFormObj.form.valueType.elements.splice(index, 1);
+          this.$message({
+            type: "success",
+            message: "删除成功!"
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除"
+          });
+        });
+    },
 
     // 修改提交方法，增加枚举项验证
     submitInputForm() {
@@ -444,21 +494,27 @@ export default {
       this.$refs.inputForm.validate(valid => {
         if (valid) {
           // 如果是枚举类型，确保至少有一个枚举项
-          if (this.inputFormObj.form.valueType.type === 'enum' &&
+          if (
+            this.inputFormObj.form.valueType.type === "enum" &&
             (!this.inputFormObj.form.valueType.elements ||
-              this.inputFormObj.form.valueType.elements.length === 0)) {
-            this.$message.warning('枚举类型至少需要一个枚举项');
+              this.inputFormObj.form.valueType.elements.length === 0)
+          ) {
+            this.$message.warning("枚举类型至少需要一个枚举项");
             return;
           }
 
           // 验证枚举项的值和描述不能为空
-          if (this.inputFormObj.form.valueType.type === 'enum') {
+          if (this.inputFormObj.form.valueType.type === "enum") {
             let hasError = false;
             const enumValues = new Set();
-            for (let i = 0; i < this.inputFormObj.form.valueType.elements.length; i++) {
+            for (
+              let i = 0;
+              i < this.inputFormObj.form.valueType.elements.length;
+              i++
+            ) {
               const item = this.inputFormObj.form.valueType.elements[i];
-              let value  = !item.value;
-              let text  = !item.text;
+              let value = !item.value;
+              let text = !item.text;
               if (value || text) {
                 hasError = true;
                 break;
@@ -470,7 +526,7 @@ export default {
               enumValues.add(item.value);
             }
             if (hasError) {
-              this.$message.warning('请完善枚举项的值和描述');
+              this.$message.warning("请完善枚举项的值和描述");
               return;
             }
           }
@@ -478,10 +534,16 @@ export default {
           // 如果是编辑模式
           if (this.inputFormObj.isEdit) {
             // 更新现有输入参数
-            this.$set(this.form.inputs, this.inputFormObj.index, this.inputFormObj.form);
+            this.$set(
+              this.form.inputs,
+              this.inputFormObj.index,
+              this.inputFormObj.form
+            );
           } else {
             // 添加新的输入参数
-            this.form.inputs.push(JSON.parse(JSON.stringify(this.inputFormObj.form)));
+            this.form.inputs.push(
+              JSON.parse(JSON.stringify(this.inputFormObj.form))
+            );
           }
 
           // 关闭弹窗
@@ -493,11 +555,13 @@ export default {
           });
 
           // 提示成功
-          this.$message.success(this.inputFormObj.isEdit ? '修改成功' : '添加成功');
+          this.$message.success(
+            this.inputFormObj.isEdit ? "修改成功" : "添加成功"
+          );
         }
       });
     },
-    addInputParam(){
+    addInputParam() {
       this.inputFormObj = {
         isEdit: false,
         index: -1,
@@ -505,130 +569,126 @@ export default {
       };
       this.inputParamOpen = true;
     },
-/**
- * 修改输入参数
- * @param {Object} row 行数据
- * @param {Number} index 行索引
- */
- handleInputUpdate(row, index) {
-  this.inputFormObj = {
-    isEdit: true,
-    index: index,
-    form: JSON.parse(JSON.stringify(row))
-  };
-  this.inputParamOpen = true;
-},
+    /**
+     * 上移功能
+     * @param {Number} index 当前功能索引
+     */
+    handleInputUp(index) {
+      if (index === 0) return; // 已经是第一个，不能再上移
 
-/**
- * 删除输入参数
- * @param {Object} row 行数据
- * @param {Number} index 行索引
- */
-handleInputDelete(row, index) {
-  this.$confirm('是否确认删除该输入参数?', '警告', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    this.form.inputs.splice(index, 1);
-    this.$message({
-      type: 'success',
-      message: '删除成功!'
-    });
-  }).catch(() => {
-    this.$message({
-      type: 'info',
-      message: '已取消删除'
-    });
-  });
-},    inputChange() {
+      try  {
+        // 交换当前项与上一项的位置
+        const temp = this.form.inputs[index];
+        this.$set(this.form.inputs, index, this.form.inputs[index - 1]);
+        this.$set(this.form.inputs, index - 1, temp);
+        this.$message({
+          type: 'success',
+          message: '上移成功!'
+        });
+      } catch (error) {
+        this.$message.error("操作失败：" + error);
+      }
+    },
+
+    /**
+     * 下移功能
+     * @param {Number} index 当前功能索引
+     */
+    handleInputDown(index) {
+      if (index === this.form.inputs.length - 1) return; // 已经是最后一个，不能再下移
+
+      try  {
+        // 交换当前项与下一项的位置
+        const temp = this.form.inputs[index];
+        this.$set(this.form.inputs, index, this.form.inputs[index + 1]);
+        this.$set(this.form.inputs, index + 1, temp);
+        this.$message({
+          type: 'success',
+          message: '下移成功!'
+        });
+      } catch (error) {
+        this.$message.error("操作失败：" + error);
+      }
+    },
+    /**
+     * 修改输入参数
+     * @param {Object} row 行数据
+     * @param {Number} index 行索引
+     */
+    handleInputUpdate(row, index) {
+      this.inputFormObj = {
+        isEdit: true,
+        index: index,
+        form: JSON.parse(JSON.stringify(row))
+      };
+      this.inputParamOpen = true;
+    },
+
+    /**
+     * 删除输入参数
+     * @param {Object} row 行数据
+     * @param {Number} index 行索引
+     */
+    handleInputDelete(row, index) {
+      this.$confirm("是否确认删除该输入参数?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.form.inputs.splice(index, 1);
+          this.$message({
+            type: "success",
+            message: "删除成功!"
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除"
+          });
+        });
+    },
+    inputChange() {
       this.$forceUpdate();
     },
-    cmdChange(val) {
-      let newArr = this.groupList.filter((v) => {
-        if (v["cmdKey"] === val) {
-          return v["cmdType"];
-        }
-      });
-      this.form.funRwType = newArr[0] || this.form.funRwType;
-    },
-    getParamIten(idx) {
-      this.$store.dispatch("GetAttributeItem", idx).then((res) => {
-        console.log("GetAttributeItem",res,idx);
-        this.form = {show: true, sort: 100,dataFormat: {
-            type: null,
-            list: {}
-          }, ...JSON.parse(JSON.stringify(res))};
-      });
-    },
     /** 提交验证 */
-    submitForm: function () {
-      this.$refs["form"].validate((valid) => {
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           // 额外校验输入参数
           if (!this.form.inputs || this.form.inputs.length === 0) {
-            this.$message.warning('请至少添加一个输入参数');
+            this.$message.warning("请至少添加一个输入参数");
             return;
           }
           // 新增和修改操作
           if (this.tempType === "add") {
-            this.$store.dispatch("AddFunction", this.form).then(() => {
-              this.$message.success("添加成功");
-              this.$emit("ok");
-            }).catch(err => {
-              this.$message.error("添加失败：" + err);
-            });
+            this.$store
+              .dispatch("AddFunction", this.form)
+              .then(() => {
+                this.$message.success("添加成功");
+                this.$emit("ok");
+              })
+              .catch(err => {
+                this.$message.error("添加失败：" + err);
+              });
           } else if (this.tempType === "update") {
-            this.$store.dispatch("EditFunction", {
-              item: this.form,
-              idx: this.paramIdx,
-            }).then(() => {
-              this.$message.success("修改成功");
-              this.$emit("ok");
-            }).catch(err => {
-              this.$message.error("修改失败：" + err);
-            });
+            this.$store
+              .dispatch("EditFunction", {
+                item: this.form,
+                idx: this.paramIdx
+              })
+              .then(() => {
+                this.$message.success("修改成功");
+                this.$emit("ok");
+              })
+              .catch(err => {
+                this.$message.error("修改失败：" + err);
+              });
           }
         }
       });
     },
-    // 回调 ok
-    //数据类型值变化出发方法
-    funDataTypeChange(val) {
-      this.form.funValAcc = null;
-      this.form.funValidType = "";
-    },
-    addJsonObj() {
-      this.$refs["jsonEditors"].addHandel();
-    },
-    jsonEvent(data) {
-      this.form.funObj = data;
-    },
-    addEnumJsonObj() {
-      this.$refs["enumJsonEditors"].addHandel();
-    },
-    enumJsonEvent(data) {
-      this.form.dataFormat.list = data;
-    },
-    // 校验方式发生变化的方法
-    funValidTypeChange(val) {
-      this.form.funValidType = val;
-      this.form.funValMax = "";
-      this.form.funValMin = "";
-      this.form.funObj = "";
-      if (val === "ENUM") {
-        this.form.funObj = '{"0":""}';
-      }
-      this.$forceUpdate()
-    },
-    dataFormatTypeChange(val) {
-      this.form.dataFormat.type = val;
-      this.form.dataFormat.list = '';
-      if (val === "ENUM") {
-        this.form.dataFormat.list = '{"0":""}';
-      }
-      this.$forceUpdate()
-    },
     // 添加一个监听输入参数弹窗关闭的方法
     handleInputDialogClose() {
       this.$nextTick(() => {
@@ -637,68 +697,21 @@ handleInputDelete(row, index) {
         }
       });
     }
-  },
+  }
 };
 </script>
 <style lang="scss">
-.attribute-form-view {
-  .item-title-wrap {
-    font-size: 15px;
-    font-weight: 600;
-    height: 30px;
-  }
-  .custom-wrap {
-    border: 1px solid #d8d7d7;
-    padding-top: 20px;
-    margin-top: 10px;
-    background: #f0f0f0;
-    padding-right: 10px;
-    .el-form-item {
-      border-bottom: 1px dashed #bdbdbd;
-      padding-bottom: 12px;
-      margin-bottom: 10px;
-      margin-left: 10px;
-    }
-    .el-form-item--medium .el-form-item__label {
-      width: 90px !important;
-    }
-    .el-form-item--medium .el-form-item__content {
-      margin-left: 90px !important;
-    }
-    .enumTypeDiv {
-      display: flex;
-      justify-content: flex-end;
-      max-height: 200px;
-      overflow: auto;
-      .enum-item {
-        width: 90%;
-        display: flex;
-        justify-content: space-around;
-        align-items: center;
-      }
-    }
-    .max-min-row {
-      width: 90%;
-      padding: 0;
-      margin-left: 5% !important;
-      margin-right: 0 !important;
-      .el-form-item {
-        border: 0;
-        margin-left: 0;
-      }
-      .el-form-item--medium .el-form-item__content {
-        margin-left: 0px !important;
-      }
-    }
-
-  }
-  .enum-box{
+.function-form-model {
+  .enum-box {
     border: 1px solid #d8d7d7;
     padding: 10px;
     margin-bottom: 10px;
-    .enumTypeDiv{
+    .enumTypeDiv {
       margin-top: 10px;
     }
+    .enum-header {
+      margin-bottom: 10px;
+    }
   }
   .el-select {
     width: 100%;
@@ -718,36 +731,14 @@ handleInputDelete(row, index) {
       align-items: center;
     }
   }
-  .max-min-row {
-    width: 90%;
-    padding: 0;
-    margin-left: 5% !important;
-    margin-right: 0 !important;
-    .el-form-item {
-      border: 0;
-      margin-left: 0;
-    }
-    .el-form-item--medium .el-form-item__content {
-      margin-left: 0px !important;
-    }
-  }
-}
-.enum-box {
-  border: 1px solid #d8d7d7;
-  padding: 10px;
-  margin-bottom: 10px;
-
-  .enum-header {
-    margin-bottom: 10px;
-  }
 }
 
 .is-error input {
-  border-color: #F56C6C;
+  border-color: #f56c6c;
 }
 
 .el-form-item__error {
-  color: #F56C6C;
+  color: #f56c6c;
   font-size: 12px;
   line-height: 1;
   padding-top: 4px;
@@ -756,5 +747,3 @@ handleInputDelete(row, index) {
   left: 0;
 }
 </style>
-
-
diff --git a/src/views/profile/attribute/functionView.vue b/src/views/profile/attribute/functionView.vue
index fa2731bb..6c01ea59 100644
--- a/src/views/profile/attribute/functionView.vue
+++ b/src/views/profile/attribute/functionView.vue
@@ -31,9 +31,23 @@
         align="center"
         class-name="small-padding fixed-width"
         label="操作"
-        width="180px"
+        width="200px"
       >
         <template slot-scope="scope">
+          <el-button
+            :disabled="scope.$index === 0"
+            icon="el-icon-arrow-up"
+            size="mini"
+            type="text"
+            @click="handleMoveUp(scope.$index)"
+          >上移</el-button>
+          <el-button
+            :disabled="scope.$index === functionList.length - 1"
+            icon="el-icon-arrow-down"
+            size="mini"
+            type="text"
+            @click="handleMoveDown(scope.$index)"
+          >下移</el-button>
           <el-button
             icon="el-icon-edit"
             size="mini"
@@ -128,7 +142,6 @@ export default {
       this.functionList = [];
       setTimeout(() => {
         this.$store.dispatch("GetFunctionList").then(res => {
-          console.log("功能列表数据", res);
           this.functionList = res;
           this.$forceUpdate();
           this.loading = false;
@@ -186,6 +199,55 @@ export default {
       };
       this.functionOpen = true;
     },
+    /**
+     * 上移功能
+     * @param {Number} index 当前功能索引
+     */
+    handleMoveUp(index) {
+      if (index === 0) return; // 已经是第一个，不能再上移
+
+      // 交换当前项与上一项的位置
+      const temp = this.functionList[index];
+      this.$set(this.functionList, index, this.functionList[index - 1]);
+      this.$set(this.functionList, index - 1, temp);
+
+      // 保存到 store
+      this.$store.dispatch("UpdateFunctionList", this.functionList).then(() => {
+        this.$message({
+          type: 'success',
+          message: '上移成功!'
+        });
+      }).catch(err => {
+        this.$message.error("操作失败：" + err);
+        // 恢复原状
+        this.getList();
+      });
+    },
+
+    /**
+     * 下移功能
+     * @param {Number} index 当前功能索引
+     */
+    handleMoveDown(index) {
+      if (index === this.functionList.length - 1) return; // 已经是最后一个，不能再下移
+
+      // 交换当前项与下一项的位置
+      const temp = this.functionList[index];
+      this.$set(this.functionList, index, this.functionList[index + 1]);
+      this.$set(this.functionList, index + 1, temp);
+
+      // 保存到 store
+      this.$store.dispatch("UpdateFunctionList", this.functionList).then(() => {
+        this.$message({
+          type: 'success',
+          message: '下移成功!'
+        });
+      }).catch(err => {
+        this.$message.error("操作失败：" + err);
+        // 恢复原状
+        this.getList();
+      });
+    },
 
     /** 修改按钮操作 */
     handleUpdate(row, idx) {
@@ -318,8 +380,6 @@ export default {
     }
   }
   .params-eldialog {
-    .el-dialog__header {
-    }
     .el-dialog__body {
       height: 100%;
       max-height: calc(100vh - 200px);
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index e178e323..b1878c49 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -1,10 +1,11 @@
 <template>
   <div class="app-container">
     <el-form
-      :model="queryParams"
+      v-show="showSearch"
       ref="queryForm"
       :inline="true"
-      v-show="showSearch"
+      :model="queryParams"
+      class="main-search-card"
       label-width="68px"
     >
       <el-form-item label="字典名称" prop="dictType">
@@ -20,14 +21,14 @@
       <el-form-item label="字典标签" prop="dictLabel">
         <el-input
           v-model="queryParams.dictLabel"
-          placeholder="请输入字典标签"
           clearable
+          placeholder="请输入字典标签"
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="数据状态" clearable size="small">
+        <el-select v-model="queryParams.status" clearable placeholder="数据状态" size="small">
           <el-option
             v-for="dict in statusOptions"
             :key="dict.dictValue"
@@ -37,20 +38,20 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
+    <div class="main-content-card">
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
           v-hasPermi="['system:dict:add']"
+          icon="el-icon-plus"
+          plain
+          size="mini"
+          type="primary"
+          @click="handleAdd"
         >新增</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
@@ -66,12 +67,12 @@
       </el-col> -->
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
           v-hasPermi="['system:dict:export']"
+          icon="el-icon-download"
+          plain
+          size="mini"
+          type="warning"
+          @click="handleExport"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -83,43 +84,43 @@
       :default-sort="{prop: 'createTime', order: 'descending'}"
       @sort-change="sortChange"
     >
-      <el-table-column type="index" label="序号" align="center" :index="indexFormatter" width="80px"></el-table-column>
-      <el-table-column label="字典标签" align="left" prop="dictLabel" />
-      <el-table-column label="字典键值" align="left" prop="dictValue" />
-      <el-table-column label="字典排序" align="center" width="100" prop="dictSort" />
+      <el-table-column :index="indexFormatter" align="center" label="序号" type="index" width="80px"></el-table-column>
+      <el-table-column align="left" label="字典标签" prop="dictLabel" />
+      <el-table-column align="left" label="字典键值" prop="dictValue" />
+      <el-table-column align="center" label="字典排序" prop="dictSort" width="100" />
       <el-table-column
-        label="状态"
-        align="center"
-        width="100"
-        prop="status"
         :formatter="statusFormat"
+        align="center"
+        label="状态"
+        prop="status"
+        width="100"
       />
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" sortable="custom" prop="createTime" width="160">
+      <el-table-column :show-overflow-tooltip="true" align="center" label="备注" prop="remark" />
+      <el-table-column align="center" label="创建时间" prop="createTime" sortable="custom" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
       <el-table-column
-        label="操作"
         align="center"
-        width="100px"
         class-name="small-padding fixed-width"
+        label="操作"
+        width="100px"
       >
         <template slot-scope="scope">
           <el-button
+            v-hasPermi="['system:dict:edit']"
+            icon="el-icon-edit"
             size="mini"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dict:edit']"
           >修改</el-button>
           <el-button
+            v-hasPermi="['system:dict:remove']"
+            icon="el-icon-delete"
             size="mini"
             type="text"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dict:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -127,14 +128,14 @@
 
     <pagination
       v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.pageNum"
+      :total="total"
       @pagination="getList"
     />
-
+    </div>
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog class="eldialog-wrap" :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px">
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="eldialog-wrap" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="字典类型:">
           <el-input v-model="form.dictType" :disabled="true" />
@@ -147,10 +148,10 @@
         </el-form-item>
         <el-form-item label="显示排序:" prop="dictSort">
           <el-input-number
-            style="width: 100%;"
             v-model="form.dictSort"
-            controls-position="right"
             :min="0"
+            controls-position="right"
+            style="width: 100%;"
           />
         </el-form-item>
         <el-form-item label="状态:" prop="status">
@@ -163,7 +164,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注:" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input v-model="form.remark" placeholder="请输入内容" type="textarea"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 37797cf0..e501e2af 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="40">
+    <el-row :gutter="20">
       <!--部门数据-->
-      <el-col :span="4" :xs="24" class="main-search-card">
+      <el-col :span="4" :xs="24" class="main-search-card" style="min-height: 500px">
         <div class="head-container">
           <el-input
             v-model="deptName"