Merge branch 'master' of http://120.26.64.82:3000/BFFE/SZYGM1.0

src/views/BasicsData/airlineCompany/index.vue

@@ -8,12 +8,15 @@
           </div>
         </template></Minheader
       >
-      <DataTable
-        :state="state"
-        :tableData="tableData"
-        @editDialog="editDialog"
-        @eleDialog="eleDialog"
-      />
+      <div class="app-container scroll-y">
+        <DataTable
+          :tableHeader="state.list"
+          :tableData="tableData"
+          :tableBtnGroup="tableBtnGroup"
+          :tableProperty="{ rowKey: 'ID' }"
+          @btnClick="btnClick"
+        />
+      </div>
       <Dialog
         :flag="flag"
         :type="type"
@@ -81,7 +84,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import DataTable from "@/views/table/index.vue";
+import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 const flag = ref<Boolean>(false); //弹窗开关
@@ -135,6 +138,18 @@ const state = reactive({
   ],
   listLoading: true,
 });
+const tableBtnGroup = ref([
+  {
+    name: "编辑",
+    className: "editBtn",
+    param: 2,
+  },
+  {
+    name: "删除",
+    className: "delBtn",
+    param: 3,
+  },
+]);
 //新增
 const addForm = () => {
   msgTitle.value = "新增航司信息维护";
@@ -152,16 +167,35 @@ const resetForm = () => {
   tableForm.text = "";
 };
 //编辑
-const editDialog = (data) => {
-  msgTitle.value = "编辑航司信息维护";
-  flag.value = true;
-  type.value = "";
-  tableForm.name = data.name;
-  tableForm.china = data.china;
-  tableForm.englin = data.englin;
-  tableForm.two = data.two;
-  tableForm.three = data.three;
-  tableForm.text = data.text;
+// const editDialog = (data) => {
+//   msgTitle.value = "编辑航司信息维护";
+//   flag.value = true;
+//   type.value = "";
+//   tableForm.name = data.name;
+//   tableForm.china = data.china;
+//   tableForm.englin = data.englin;
+//   tableForm.two = data.two;
+//   tableForm.three = data.three;
+//   tableForm.text = data.text;
+// };
+//编辑-删除
+const btnClick = (row, index, param) => {
+  if (param === 2) {
+    msgTitle.value = "编辑航司信息维护";
+    flag.value = true;
+    type.value = "";
+    tableForm.name = index.name;
+    tableForm.china = index.china;
+    tableForm.englin = index.englin;
+    tableForm.two = index.two;
+    tableForm.three = index.three;
+    tableForm.text = index.text;
+  } else if (param === 3) {
+    msgTitle.value = "删除航司信息维护";
+    flag.value = true;
+    type.value = "del";
+  } else if (param === 4) {
+  }
 };
 //删除
 const eleDialog = () => {

src/views/BasicsData/airportCompany/index.vue

@@ -8,12 +8,15 @@
           </div>
         </template></Minheader
       >
-      <DataTable
-        :state="state"
-        :tableData="tableData"
-        @editDialog="editDialog"
-        @eleDialog="eleDialog"
-      />
+      <div class="app-container scroll-y">
+        <DataTable
+          :tableHeader="state.list"
+          :tableData="tableData"
+          :tableBtnGroup="tableBtnGroup"
+          :tableProperty="{ rowKey: 'ID' }"
+          @btnClick="btnClick"
+        />
+      </div>
       <Dialog
         :flag="flag"
         :type="type"
@@ -72,7 +75,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import DataTable from "@/views/table/index.vue";
+import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 const flag = ref<Boolean>(false); //弹窗开关
@@ -85,6 +88,18 @@ const tableForm = reactive({
   china: "",
   englin: "",
 }); //弹窗内容
+const tableBtnGroup = ref([
+  {
+    name: "编辑",
+    className: "editBtn",
+    param: 2,
+  },
+  {
+    name: "删除",
+    className: "delBtn",
+    param: 3,
+  },
+]);
 //列表
 const tableData = ref([
   {
@@ -125,20 +140,21 @@ const resetForm = () => {
   tableForm.china = "";
   tableForm.englin = "";
 };
-//编辑
-const editDialog = (data) => {
-  msgTitle.value = "编辑机场公司维护";
-  flag.value = true;
-  type.value = "";
-  tableForm.name = data.name;
-  tableForm.china = data.china;
-  tableForm.englin = data.englin;
-};
-//删除
-const eleDialog = () => {
-  msgTitle.value = "删除机场公司维护";
-  flag.value = true;
-  type.value = "del";
+//编辑-删除
+const btnClick = (row, index, param) => {
+  if (param === 2) {
+    msgTitle.value = "编辑机场公司维护";
+    flag.value = true;
+    type.value = "";
+    tableForm.name = index.name;
+    tableForm.china = index.china;
+    tableForm.englin = index.englin;
+  } else if (param === 3) {
+    msgTitle.value = "删除机场公司维护";
+    flag.value = true;
+    type.value = "del";
+  } else if (param === 4) {
+  }
 };
 //删除
 const delRest = () => {

src/views/BasicsData/airportInfo/airportInfoChild/index.vue

@@ -8,12 +8,15 @@
           </div>
         </template></Minheader
       >
-      <DataTable
-        :tableBtnGroup="tableBtnGroup"
-        @editDialog="editDialog"
-        @eleDialog="eleDialog"
-        @aloneDialog="aloneDialog"
-      />
+      <div class="app-container scroll-y">
+        <DataTable
+          :tableHeader="state.list"
+          :tableData="tableData"
+          :tableBtnGroup="tableBtnGroup"
+          :tableProperty="{ rowKey: 'ID' }"
+          @btnClick="btnClick"
+        />
+      </div>
       <Dialog
         :flag="flag"
         :type="type"
@@ -53,7 +56,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import DataTable from "@/views/table/index.vue";
+import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 const router = useRouter();
@@ -78,14 +81,28 @@ const tableBtnGroup = ref<Array>([
     param: 3,
   },
 ]); //单独的编辑
-const tableForm = reactive<Object>({
+const tableForm = reactive({
   name: "",
   china: "",
   englin: "",
-  two: "",
-  three: "",
-  text: "",
 }); //弹窗内容
+//列表
+const tableData = ref([
+  {
+    name: "1",
+    china: "t1",
+    englin: "CCA",
+  },
+]);
+//表头
+const state = reactive({
+  list: [
+    { label: "ID", key: "name" },
+    { label: "名称", key: "china" },
+    { label: "机场三字码", key: "englin" },
+  ],
+  listLoading: true,
+});
 //新增
 const addForm = () => {
   msgTitle.value = "新增航站楼";
@@ -95,12 +112,18 @@ const addForm = () => {
 //取消
 const resetForm = () => {
   flag.value = false;
+  tableForm.name = "";
+  tableForm.china = "";
+  tableForm.englin = "";
 };
 //编辑
-const editDialog = () => {
+const editDialog = (data) => {
   msgTitle.value = "编辑航站楼";
   flag.value = true;
   type.value = "";
+  tableForm.name = data.name;
+  tableForm.china = data.china;
+  tableForm.englin = data.englin;
 };
 //删除
 const eleDialog = () => {
@@ -116,6 +139,23 @@ const delRest = () => {
 const aloneDialog = () => {
   router.push({ path: "/BasicsData/positionSetting" });
 };
+//编辑-删除
+const btnClick = (row, index, param) => {
+  if (param === 2) {
+    msgTitle.value = "编辑航站楼";
+    flag.value = true;
+    type.value = "";
+    tableForm.name = index.name;
+    tableForm.china = index.china;
+    tableForm.englin = index.englin;
+  } else if (param === 3) {
+    msgTitle.value = "删除航站楼";
+    flag.value = true;
+    type.value = "del";
+  } else if (param === 4) {
+    router.push({ path: "/BasicsData/positionSetting" });
+  }
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/BasicsData/airportInfo/index.vue

@@ -19,12 +19,16 @@
           </div>
         </el-col>
         <el-col :span="18">
-          <DataTable
-            :tableBtnGroup="tableBtnGroup"
-            @editDialog="editDialog"
-            @eleDialog="eleDialog"
-            @aloneDialog="aloneDialog"
-          />
+          <div class="app-container scroll-y">
+            <DataTable
+              :tableColumnProperty="tableColumnProperty"
+              :tableHeader="state.list"
+              :tableData="tableData"
+              :tableBtnGroup="tableBtnGroup"
+              :tableProperty="{ rowKey: 'ID' }"
+              @btnClick="btnClick"
+            />
+          </div>
         </el-col>
       </el-row>
     </div>
@@ -58,7 +62,7 @@
             <el-col :span="12">
               <el-form-item label="四字码">
                 <el-input
-                  v-model="tableForm.china"
+                  v-model="tableForm.englin"
                   placeholder="请输入四字码"
                 />
               </el-form-item>
@@ -66,7 +70,7 @@
             <el-col :span="12">
               <el-form-item label="中文简称">
                 <el-input
-                  v-model="tableForm.china"
+                  v-model="tableForm.two"
                   placeholder="请输入中文简称"
                 />
               </el-form-item>
@@ -74,14 +78,14 @@
             <el-col :span="12">
               <el-form-item label="英文简称">
                 <el-input
-                  v-model="tableForm.china"
+                  v-model="tableForm.three"
                   placeholder="请输入英文简称"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="全称">
-                <el-input v-model="tableForm.china" placeholder="请输入全称" />
+                <el-input v-model="tableForm.text" placeholder="请输入全称" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -89,7 +93,7 @@
                 <!-- <el-input v-model="tableForm.china" /> -->
                 <el-select
                   style="width: 100%"
-                  v-model="tableForm.china"
+                  v-model="tableForm.text1"
                   class="input-shadow"
                   size="small"
                   filterable
@@ -110,7 +114,7 @@
             <el-col :span="12">
               <el-form-item label="描述">
                 <el-input
-                  v-model="tableForm.text"
+                  v-model="tableForm.text2"
                   placeholder="请输入机场三字码"
                 />
               </el-form-item>
@@ -122,8 +126,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import Minheader from "@/components/minheader/index.vue";
-import DataTable from "@/views/table/index.vue";
+import DataTable from "@/components/tableTemp/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 const router = useRouter();
 const tableBtnGroup = ref<Array>([
@@ -148,61 +151,96 @@ const type = ref<String>(""); //判断是否删除
 const msgTitle = ref<String>("新增机场信息维护"); //弹窗标题
 const tableOptionser = ref<Array>([]); //弹窗下拉
 const tableColsCopys = reactive<Object>({}); //弹窗
-const tableForm = reactive<Object>({
+const tableForm = reactive({
   name: "",
   china: "",
   englin: "",
   two: "",
   three: "",
   text: "",
+  text1: "",
+  text2: "",
+}); //弹窗内容
+const tableColumnProperty = reactive({
+  width: "120px",
+  fixed: "",
+  sortable: false,
+  showOverflowTooltip: false,
+  align: "center",
+  headerAlign: "",
 }); //弹窗内容
+//列表
+const tableData = ref([
+  {
+    name: "成都双流机场",
+    china: "CTU",
+    englin: "ZUUU",
+    two: "",
+    three: "CHENGDU",
+    text: "成都双流机场",
+    text1: "",
+    text2: "西南分公司",
+  },
+  {
+    name: "成都双流机场",
+    china: "CTU",
+    englin: "ZUUU",
+    two: "",
+    three: "CHENGDU",
+    text: "成都双流机场",
+    text1: "",
+    text2: "西南分公司",
+  },
+  {
+    name: "成都双流机场",
+    china: "CTU",
+    englin: "ZUUU",
+    two: "",
+    three: "CHENGDU",
+    text: "成都双流机场",
+    text1: "",
+    text2: "西南分公司",
+  },
+]);
+//表头
+const state = reactive({
+  list: [
+    { label: "名称", key: "name", width: "100px" },
+    { label: "三字码", key: "china", width: "50px" },
+    { label: "四字码", key: "englin", width: "50px" },
+    { label: "中文简称", key: "two", width: "50px" },
+    { label: "英文简称", key: "three", width: "50px" },
+    { label: "全称", key: "text", width: "50px" },
+    { label: "时区", key: "text1", width: "50px" },
+    { label: "公司名称", key: "text2", width: "50px" },
+  ],
+  listLoading: true,
+});
 const company = ref("所属公司");
 const data2 = reactive([
   {
     id: 1,
-    label: "Level one 1",
+    label: "中国国际航空",
     children: [
       {
-        id: 4,
-        label: "Level two 1-1",
-        children: [
-          {
-            id: 9,
-            label: "Level three 1-1-1",
-          },
-          {
-            id: 10,
-            label: "Level three 1-1-2",
-          },
-        ],
+        id: 2,
+        label: "西南分公司",
       },
-    ],
-  },
-  {
-    id: 2,
-    label: "Level one 2",
-    children: [
       {
-        id: 5,
-        label: "Level two 2-1",
+        id: 3,
+        label: "浙江分公司",
       },
       {
-        id: 6,
-        label: "Level two 2-2",
+        id: 4,
+        label: "重庆分公司",
       },
-    ],
-  },
-  {
-    id: 3,
-    label: "Level one 3",
-    children: [
       {
-        id: 7,
-        label: "Level two 3-1",
+        id: 5,
+        label: "天津分公司",
       },
       {
-        id: 8,
-        label: "Level two 3-2",
+        id: 6,
+        label: "上海分公司",
       },
     ],
   },
@@ -218,10 +256,18 @@ const resetForm = () => {
   flag.value = false;
 };
 //编辑
-const editDialog = () => {
+const editDialog = (data) => {
   msgTitle.value = "编辑机场信息维护";
   flag.value = true;
   type.value = "";
+  tableForm.name = data.name;
+  tableForm.china = data.china;
+  tableForm.englin = data.englin;
+  tableForm.two = data.two;
+  tableForm.three = data.three;
+  tableForm.text = data.text;
+  tableForm.text1 = data.text1;
+  tableForm.text2 = data.text2;
 };
 //删除
 const eleDialog = () => {
@@ -237,8 +283,32 @@ const delRest = () => {
 const aloneDialog = () => {
   router.push({ path: "/BasicsData/airportInfoChild" });
 };
+//编辑-删除
+const btnClick = (row, index, param) => {
+  if (param === 2) {
+    msgTitle.value = "编辑机场信息维护";
+    flag.value = true;
+    type.value = "";
+    tableForm.name = index.name;
+    tableForm.china = index.china;
+    tableForm.englin = index.englin;
+    tableForm.two = index.two;
+    tableForm.three = index.three;
+    tableForm.text = index.text;
+    tableForm.text1 = index.text1;
+    tableForm.text2 = index.text2;
+  } else if (param === 3) {
+    msgTitle.value = "删除机场信息维护";
+    flag.value = true;
+    type.value = "del";
+  } else if (param === 4) {
+    router.push({ path: "/BasicsData/airportInfoChild" });
+  }
+};
 //点击树事件
-const handleNodeClick = () => {};
+const handleNodeClick = (data) => {
+  company.value = data.label;
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/BasicsData/airportInfo/positionSetting/index.vue

@@ -8,7 +8,15 @@
           </div>
         </template></Minheader
       >
-      <DataTable @editDialog="editDialog" @eleDialog="eleDialog" />
+      <div class="app-container scroll-y">
+        <DataTable
+          :tableHeader="state.list"
+          :tableData="tableData"
+          :tableBtnGroup="tableBtnGroup"
+          :tableProperty="{ rowKey: 'ID' }"
+          @btnClick="btnClick"
+        />
+      </div>
       <Dialog
         :flag="flag"
         :type="type"
@@ -55,7 +63,7 @@
                 <el-form-item label="位置描述">
                   <el-input
                     type="textarea"
-                    v-model="tableForm.text"
+                    v-model="tableForm.three"
                     placeholder="请输入位置描述"
                   />
                 </el-form-item>
@@ -68,21 +76,67 @@
   </div>
 </template>
 <script setup lang="ts">
-import DataTable from "@/views/table/index.vue";
+import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除
 const msgTitle = ref<String>("新增位置设置"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
-const tableForm = reactive<Object>({
+const tableForm = reactive({
   name: "",
   china: "",
   englin: "",
   two: "",
   three: "",
-  text: "",
 }); //弹窗内容
+//列表
+const tableData = ref([
+  {
+    name: "测试",
+    china: "测试",
+    englin: "测试",
+    two: "测试",
+    three: "",
+  },
+  {
+    name: "测试",
+    china: "测试",
+    englin: "测试",
+    two: "测试",
+    three: "",
+  },
+  {
+    name: "测试",
+    china: "测试",
+    englin: "测试",
+    two: "测试",
+    three: "",
+  },
+]);
+//表头
+const state = reactive({
+  list: [
+    { label: "位置名称", key: "name" },
+    { label: "位置所属节点", key: "china" },
+    { label: "位置标识", key: "englin" },
+    { label: "位置编码", key: "two" },
+    { label: "位置描述", key: "three" },
+  ],
+  listLoading: true,
+});
+const tableBtnGroup = ref([
+  {
+    name: "编辑",
+    className: "editBtn",
+    param: 2,
+  },
+  {
+    name: "删除",
+    className: "delBtn",
+    param: 3,
+  },
+]);
 //新增
 const addForm = () => {
   msgTitle.value = "新增位置";
@@ -92,12 +146,22 @@ const addForm = () => {
 //取消
 const resetForm = () => {
   flag.value = false;
+  tableForm.name = "";
+  tableForm.china = "";
+  tableForm.englin = "";
+  tableForm.two = "";
+  tableForm.three = "";
 };
 //编辑
-const editDialog = () => {
+const editDialog = (data) => {
   msgTitle.value = "编辑位置";
   flag.value = true;
   type.value = "";
+  tableForm.name = data.name;
+  tableForm.china = data.china;
+  tableForm.englin = data.englin;
+  tableForm.two = data.two;
+  tableForm.three = data.three;
 };
 //删除
 const eleDialog = () => {
@@ -109,6 +173,24 @@ const eleDialog = () => {
 const delRest = () => {
   flag.value = false;
 };
+//编辑-删除
+const btnClick = (row, index, param) => {
+  if (param === 2) {
+    msgTitle.value = "编辑位置";
+    flag.value = true;
+    type.value = "";
+    tableForm.name = index.name;
+    tableForm.china = index.china;
+    tableForm.englin = index.englin;
+    tableForm.two = index.two;
+    tableForm.three = index.three;
+  } else if (param === 3) {
+    msgTitle.value = "删除位置";
+    flag.value = true;
+    type.value = "del";
+  } else if (param === 4) {
+  }
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/BasicsData/cargoInformation/index.vue

@@ -8,12 +8,15 @@
           </div>
         </template></Minheader
       >
-      <DataTable
-        :state="state"
-        :tableData="tableData"
-        @editDialog="editDialog"
-        @eleDialog="eleDialog"
-      />
+      <div class="app-container scroll-y">
+        <DataTable
+          :tableHeader="state.list"
+          :tableData="tableData"
+          :tableBtnGroup="tableBtnGroup"
+          :tableProperty="{ rowKey: 'ID' }"
+          @btnClick="btnClick"
+        />
+      </div>
       <Dialog
         :flag="flag"
         :type="type"
@@ -57,7 +60,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import DataTable from "@/views/table/index.vue";
+import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 const flag = ref<Boolean>(false); //弹窗开关
@@ -100,6 +103,18 @@ const state = reactive({
   ],
   listLoading: true,
 });
+const tableBtnGroup = ref([
+  {
+    name: "编辑",
+    className: "editBtn",
+    param: 2,
+  },
+  {
+    name: "删除",
+    className: "delBtn",
+    param: 3,
+  },
+]);
 //新增
 const addForm = () => {
   msgTitle.value = "新增货代管理";
@@ -132,6 +147,22 @@ const eleDialog = () => {
 const delRest = () => {
   flag.value = false;
 };
+//编辑-删除
+const btnClick = (row, index, param) => {
+  if (param === 2) {
+    msgTitle.value = "编辑货代管理";
+    flag.value = true;
+    type.value = "";
+    tableForm.name = index.name;
+    tableForm.china = index.china;
+    tableForm.two = index.two;
+  } else if (param === 3) {
+    msgTitle.value = "删除货代管理";
+    flag.value = true;
+    type.value = "del";
+  } else if (param === 4) {
+  }
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/BasicsData/containerMaintenance/index.vue

@@ -8,12 +8,15 @@
           </div>
         </template></Minheader
       >
-      <DataTable
-        :state="state"
-        :tableData="tableData"
-        @editDialog="editDialog"
-        @eleDialog="eleDialog"
-      />
+      <div class="app-container scroll-y">
+        <DataTable
+          :tableHeader="state.list"
+          :tableData="tableData"
+          :tableBtnGroup="tableBtnGroup"
+          :tableProperty="{ rowKey: 'ID' }"
+          @btnClick="btnClick"
+        />
+      </div>
       <Dialog
         :flag="flag"
         :type="type"
@@ -57,7 +60,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import DataTable from "@/views/table/index.vue";
+import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 const flag = ref<Boolean>(false); //弹窗开关
@@ -96,6 +99,18 @@ const state = reactive({
   ],
   listLoading: true,
 });
+const tableBtnGroup = ref([
+  {
+    name: "编辑",
+    className: "editBtn",
+    param: 2,
+  },
+  {
+    name: "删除",
+    className: "delBtn",
+    param: 3,
+  },
+]);
 //新增
 const addForm = () => {
   msgTitle.value = "新增容器维护";
@@ -128,6 +143,22 @@ const eleDialog = () => {
 const delRest = () => {
   flag.value = false;
 };
+//编辑-删除
+const btnClick = (row, index, param) => {
+  if (param === 2) {
+    msgTitle.value = "编辑容器维护";
+    flag.value = true;
+    type.value = "";
+    tableForm.name = index.name;
+    tableForm.china = index.china;
+    tableForm.englin = index.englin;
+  } else if (param === 3) {
+    msgTitle.value = "删除容器维护";
+    flag.value = true;
+    type.value = "del";
+  } else if (param === 4) {
+  }
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/BasicsData/deployNode/index.vue

@@ -8,12 +8,15 @@
           </div>
         </template></Minheader
       >
-      <DataTable
-        :state="state"
-        :tableData="tableData"
-        @editDialog="editDialog"
-        @eleDialog="eleDialog"
-      />
+      <div class="app-container scroll-y">
+        <DataTable
+          :tableHeader="state.list"
+          :tableData="tableData"
+          :tableBtnGroup="tableBtnGroup"
+          :tableProperty="{ rowKey: 'ID' }"
+          @btnClick="btnClick"
+        />
+      </div>
       <Dialog
         :flag="flag"
         :type="type"
@@ -54,7 +57,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import DataTable from "@/views/table/index.vue";
+import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 const flag = ref<Boolean>(false); //弹窗开关
@@ -97,6 +100,18 @@ const state = reactive({
   ],
   listLoading: true,
 });
+const tableBtnGroup = ref([
+  {
+    name: "编辑",
+    className: "editBtn",
+    param: 2,
+  },
+  {
+    name: "删除",
+    className: "delBtn",
+    param: 3,
+  },
+]);
 //新增
 const addForm = () => {
   msgTitle.value = "新增节点信息维护";
@@ -129,6 +144,22 @@ const eleDialog = () => {
 const delRest = () => {
   flag.value = false;
 };
+//编辑-删除
+const btnClick = (row, index, param) => {
+  if (param === 2) {
+    msgTitle.value = "编辑节点信息维护";
+    flag.value = true;
+    type.value = "";
+    tableForm.name = index.name;
+    tableForm.china = index.china;
+    tableForm.englin = index.englin;
+  } else if (param === 3) {
+    msgTitle.value = "删除节点信息维护";
+    flag.value = true;
+    type.value = "del";
+  } else if (param === 4) {
+  }
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/BasicsData/equipmentMaintenance/index.vue

@@ -8,12 +8,15 @@
           </div>
         </template></Minheader
       >
-      <DataTable
-        :state="state"
-        :tableData="tableData"
-        @editDialog="editDialog"
-        @eleDialog="eleDialog"
-      />
+      <div class="app-container scroll-y">
+        <DataTable
+          :tableHeader="state.list"
+          :tableData="tableData"
+          :tableBtnGroup="tableBtnGroup"
+          :tableProperty="{ rowKey: 'ID' }"
+          @btnClick="btnClick"
+        />
+      </div>
       <Dialog
         :flag="flag"
         :type="type"
@@ -57,7 +60,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import DataTable from "@/views/table/index.vue";
+import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 const flag = ref<Boolean>(false); //弹窗开关
@@ -108,6 +111,18 @@ const state = reactive({
   ],
   listLoading: true,
 });
+const tableBtnGroup = ref([
+  {
+    name: "编辑",
+    className: "editBtn",
+    param: 2,
+  },
+  {
+    name: "删除",
+    className: "delBtn",
+    param: 3,
+  },
+]);
 //新增
 const addForm = () => {
   msgTitle.value = "新增设备维护";
@@ -140,6 +155,22 @@ const eleDialog = () => {
 const delRest = () => {
   flag.value = false;
 };
+//编辑-删除
+const btnClick = (row, index, param) => {
+  if (param === 2) {
+    msgTitle.value = "编辑设备维护";
+    flag.value = true;
+    type.value = "";
+    tableForm.name = index.name;
+    tableForm.englin = index.englin;
+    tableForm.two = index.two;
+  } else if (param === 3) {
+    msgTitle.value = "删除设备维护";
+    flag.value = true;
+    type.value = "del";
+  } else if (param === 4) {
+  }
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/BasicsData/modelMaintenance/index.vue

@@ -8,14 +8,15 @@
           </div>
         </template></Minheader
       >
-      <DataTable
-        :tableBtnGroup="tableBtnGroup"
-        :state="state"
-        :tableData="tableData"
-        @editDialog="editDialog"
-        @eleDialog="eleDialog"
-        @aloneDialog="aloneDialog"
-      />
+      <div class="app-container scroll-y">
+        <DataTable
+          :tableHeader="state.list"
+          :tableData="tableData"
+          :tableBtnGroup="tableBtnGroup"
+          :tableProperty="{ rowKey: 'ID' }"
+          @btnClick="btnClick"
+        />
+      </div>
       <Dialog
         :flag="flag"
         :type="type"
@@ -59,7 +60,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import DataTable from "@/views/table/index.vue";
+import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 const router = useRouter();
@@ -155,6 +156,23 @@ const delRest = () => {
 const aloneDialog = () => {
   router.push({ path: "/BasicsData/shippingSpace" });
 };
+//编辑-删除
+const btnClick = (row, index, param) => {
+  if (param === 2) {
+    msgTitle.value = "编辑机型维护";
+    flag.value = true;
+    type.value = "";
+    tableForm.name = index.name;
+    tableForm.china = index.china;
+    tableForm.englin = index.englin;
+  } else if (param === 3) {
+    msgTitle.value = "删除机型维护";
+    flag.value = true;
+    type.value = "del";
+  } else if (param === 4) {
+    router.push({ path: "/BasicsData/shippingSpace" });
+  }
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/BasicsData/shippingSpace/index.vue

@@ -8,12 +8,15 @@
           </div>
         </template></Minheader
       >
-      <DataTable
-        :state="state"
-        :tableData="tableData"
-        @editDialog="editDialog"
-        @eleDialog="eleDialog"
-      />
+      <div class="app-container scroll-y">
+        <DataTable
+          :tableHeader="state.list"
+          :tableData="tableData"
+          :tableBtnGroup="tableBtnGroup"
+          :tableProperty="{ rowKey: 'ID' }"
+          @btnClick="btnClick"
+        />
+      </div>
       <Dialog
         :flag="flag"
         :type="type"
@@ -54,7 +57,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import DataTable from "@/views/table/index.vue";
+import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 const flag = ref<Boolean>(false); //弹窗开关
@@ -93,6 +96,18 @@ const state = reactive({
   ],
   listLoading: true,
 });
+const tableBtnGroup = ref([
+  {
+    name: "编辑",
+    className: "editBtn",
+    param: 2,
+  },
+  {
+    name: "删除",
+    className: "delBtn",
+    param: 3,
+  },
+]);
 //新增
 const addForm = () => {
   msgTitle.value = "新增舱位管理";
@@ -125,6 +140,22 @@ const eleDialog = () => {
 const delRest = () => {
   flag.value = false;
 };
+//编辑-删除
+const btnClick = (row, index, param) => {
+  if (param === 2) {
+    msgTitle.value = "编辑舱位管理";
+    flag.value = true;
+    type.value = "";
+    tableForm.name = index.name;
+    tableForm.china = index.china;
+    tableForm.englin = index.englin;
+  } else if (param === 3) {
+    msgTitle.value = "删除舱位管理";
+    flag.value = true;
+    type.value = "del";
+  } else if (param === 4) {
+  }
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/BasicsData/specialCargoMaintenance/index.vue

@@ -8,12 +8,15 @@
           </div>
         </template></Minheader
       >
-      <DataTable
-        :state="state"
-        :tableData="tableData"
-        @editDialog="editDialog"
-        @eleDialog="eleDialog"
-      />
+      <div class="app-container scroll-y">
+        <DataTable
+          :tableHeader="state.list"
+          :tableData="tableData"
+          :tableBtnGroup="tableBtnGroup"
+          :tableProperty="{ rowKey: 'ID' }"
+          @btnClick="btnClick"
+        />
+      </div>
       <Dialog
         :flag="flag"
         :type="type"
@@ -57,7 +60,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import DataTable from "@/views/table/index.vue";
+import DataTable from "@/components/tableTemp/index.vue";
 import Minheader from "@/components/minheader/index.vue";
 import Dialog from "@/components/dialog/index.vue";
 const flag = ref<Boolean>(false); //弹窗开关
@@ -96,6 +99,18 @@ const state = reactive({
   ],
   listLoading: true,
 });
+const tableBtnGroup = ref([
+  {
+    name: "编辑",
+    className: "editBtn",
+    param: 2,
+  },
+  {
+    name: "删除",
+    className: "delBtn",
+    param: 3,
+  },
+]);
 //新增
 const addForm = () => {
   msgTitle.value = "新增特殊货物类型维护";
@@ -128,6 +143,22 @@ const eleDialog = () => {
 const delRest = () => {
   flag.value = false;
 };
+//编辑-删除
+const btnClick = (row, index, param) => {
+  if (param === 2) {
+    msgTitle.value = "编辑特殊货物类型维护";
+    flag.value = true;
+    type.value = "";
+    tableForm.name = index.name;
+    tableForm.china = index.china;
+    tableForm.englin = index.englin;
+  } else if (param === 3) {
+    msgTitle.value = "删除特殊货物类型维护";
+    flag.value = true;
+    type.value = "del";
+  } else if (param === 4) {
+  }
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/userManagement/account/index.vue

@@ -1,9 +1,235 @@
 <template>
-  <div>账号管理</div>
+  <div class="application account scroll-y">
+    <div class="application-head flex">
+      <div class="manageTitle">账号管理</div>
+      <div class="flex-wrap">
+        <Search @clear="clear" @search="search" />
+        <el-button size="default" @click="addApp" plain>新增</el-button>
+      </div>
+    </div>
+    <div class="application-content flex">
+      <div class="box account-tree">
+        <el-tree :data="data" :props="defaultProps" default-expand-all @node-click="handleNodeClick" />
+      </div>
+      <Table class="account-table" :tableHeader="tableHeader" @btnClick="btnClick" :tableBtnGroup="tableBtnGroup" :tableData="tableData" />
+    </div>
+    <!--删除弹框-->
+    <Dialog :flag="flag" msgTitle="删除账号" type="del" :delName="title" @delRest="delRest" @delRemove="remove" />
+    <!--新增/编辑-->
+    <Dialog :flag="editDialogVisible" :msgTitle="editDialogTitle" @submitForm="submitForm(ruleFormRef)" @resetForm="resetForm(ruleFormRef)" :show-flag="true">
+      <el-form ref="ruleFormRef" :model="ruleForm" label-width="110px" class="demo-ruleForm">
+        <el-form-item label="账号名称" prop="roleName">
+          <el-input v-model="ruleForm.roleName" size="default" placeholder="请输入账号名称" />
+        </el-form-item>
+        <el-form-item label="账号密码" prop="rolePwd">
+          <el-input v-model="ruleForm.rolePwd" type="password" show-password size="default" placeholder="请输入账号名称" />
+        </el-form-item>
+        <el-form-item label="账号描述" prop="roleDesc">
+          <el-input v-model="ruleForm.roleDesc" size="default" type="textarea" :rows="3" placeholder="请输入账号描述" />
+        </el-form-item>
+        <el-form-item label="是否启用" prop="roleStatus">
+          <el-radio-group v-model="ruleForm.roleStatus">
+            <el-radio label="1">启用</el-radio>
+            <el-radio label="2"> 禁用</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+    </Dialog>
+  </div>
 </template>
 
 <script setup lang="ts">
+import { ref, reactive } from "vue";
+import { ElMessage, FormInstance, FormRules } from "element-plus";
+import Table from "@/components/tableTemp/index.vue";
+import Search from "@/components/search/index.vue";
+interface Tree {
+  label: string;
+  children?: Tree[];
+}
+const router = useRouter();
+const ruleFormRef = ref<FormInstance>();
+const tableHeader = [
+  { label: "账号名称", key: "roleName" },
+  { label: "账号数", key: "accountNum" },
+  { label: "权限项数", key: "authNum" },
+  { label: "是否存在互斥", key: "isHc" },
+  { label: "启用状态", key: "status" },
+  { label: "描述", key: "desc" },
+];
+const tableData = ref([
+  {
+    id: 1,
+    roleName: "11",
+    accountNum: "22",
+    authNum: "33",
+    isHc: "是",
+    status: "启用",
+    desc: "555",
+    pwd: "",
+  },
+  {
+    id: 2,
+    roleName: "11",
+    accountNum: "22",
+    authNum: "33",
+    isHc: "是",
+    status: "启用",
+    desc: "555",
+    pwd: "",
+  },
+]);
+const tableBtnGroup = [
+  {
+    name: "编辑",
+    className: "editBtn",
+    param: "edit",
+  },
+  {
+    name: "查看权限",
+    className: "editBtn",
+    param: "auth",
+  },
+  {
+    name: "删除",
+    className: "delBtn",
+    param: "del",
+  },
+];
+const flag = ref(false);
+const title = ref("");
+const dT = ref("add");
+const editDialogVisible = ref(false);
+const editDialogTitle = ref("新增账号");
+const ruleForm = reactive({
+  roleName: "",
+  roleDesc: "",
+  roleStatus: "",
+  rolePwd: "",
+});
+const rowIndex = ref(1);
+
+const handleNodeClick = (data: Tree) => {
+  console.log(data);
+};
+
+const data: Tree[] = [
+  {
+    label: "全部账号组",
+    children: [
+      {
+        label: "账号组名称",
+        children: [],
+      },
+      {
+        label: "账号组名称",
+        children: [],
+      },
+    ],
+  },
+];
+
+const defaultProps = {
+  children: "children",
+  label: "label",
+};
+const search = (val) => {
+  ElMessage.success(`搜索成功：${val}`);
+};
+const clear = () => {
+  ElMessage.success(`清除`);
+};
+const btnClick = (index, row, param) => {
+  rowIndex.value = index;
+  if (param == "del") {
+    flag.value = true;
+    title.value = row.roleName;
+  } else if (param == "edit") {
+    dT.value = "edit";
+    editDialogVisible.value = true;
+    editDialogTitle.value = "编辑账号";
+    ruleForm.roleName = row.roleName;
+    ruleForm.roleDesc = row.desc;
+    ruleForm.roleStatus = row.status;
+    ruleForm.rolePwd = row.pwd;
+  } else {
+    router.push("/userManagement/auth");
+  }
+};
+const delRest = () => {
+  flag.value = false;
+};
+const remove = () => {
+  tableData.value.splice(rowIndex.value, 1);
+  ElMessage.success("删除成功");
+  flag.value = false;
+};
+const addApp = () => {
+  editDialogVisible.value = true;
+  editDialogTitle.value = "新增账号";
+  dT.value = "add";
+  ruleForm.roleDesc = "";
+  ruleForm.roleName = "";
+  ruleForm.roleStatus = "";
+};
+const submitForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      if (dT.value == "add") {
+        const len = tableData.value.length;
+        tableData.value.push({
+          id: len + 1,
+          roleName: ruleForm.roleName,
+          desc: ruleForm.roleDesc,
+          status: ruleForm.roleStatus,
+          pwd: ruleForm.rolePwd,
+          accountNum: "22",
+          authNum: "33",
+          isHc: "是",
+        });
+        ElMessage.success("新增成功");
+      } else {
+        tableData.value[rowIndex.value] = {
+          id: tableData.value[rowIndex.value].id,
+          roleName: ruleForm.roleName,
+          desc: ruleForm.roleDesc,
+          status: ruleForm.roleStatus,
+          pwd: ruleForm.rolePwd,
+          accountNum: "22",
+          authNum: "33",
+          isHc: "是",
+        };
+        ElMessage.success("编辑成功");
+      }
+      editDialogVisible.value = false;
+    } else {
+      console.log("error submit!", fields);
+    }
+  });
+};
+
+const resetForm = (formEl: FormInstance | undefined) => {
+  if (!formEl) return;
+  formEl.resetFields();
+  editDialogVisible.value = false;
+};
 </script>
 
 <style lang="scss" scoped>
+.application {
+  &-content {
+    margin-top: 24px;
+    height: calc(100% - 56px);
+  }
+}
+.account {
+  &-tree {
+    width: 488px;
+    margin-right: 24px;
+  }
+  &-table {
+    flex: 1;
+  }
+}
 </style>