应用用户和模块api

src/modules/admin/api.js

@@ -1,12 +1,6 @@
-import { $get, $post, $postParam, qsRepeatParams } from "@/plugins/axios";
+import { $postParam, qsRepeatParams } from "@/plugins/axios";
 
 // common-select
-// export const appTypeList = datas => {
-//   return $get("/api/admin/app/types", datas);
-// };
-// export const appDeployList = datas => {
-//   return $get("/api/admin/app/deploy_modes", datas);
-// };
 
 // user-manage
 export const userListPage = datas => {
@@ -30,17 +24,17 @@ export const userInsertOrUpdate = datas => {
 
 // app-manage
 export const appQuery = datas => {
-  return $get("/api/admin/app/query", datas);
+  return $postParam("/api/admin/app/query", datas);
 };
 export const appList = datas => {
   // id/code/nameStartWith
-  return $get("/api/admin/app/list", datas);
+  return $postParam("/api/admin/app/list", datas);
 };
 export const appInsertOrUpdate = datas => {
   if (datas.id) {
-    return $post("/api/admin/app/update", datas);
+    return $postParam("/api/admin/app/update", datas);
   } else {
-    return $post("/api/admin/app/insert", datas);
+    return $postParam("/api/admin/app/insert", datas);
   }
 };
 // app-user-manage
@@ -61,13 +55,13 @@ export const appModuleList = datas => {
 };
 export const appModuleInsertOrUpdate = datas => {
   if (datas.id) {
-    return $post("/api/admin/module/update", datas);
+    return $postParam("/api/admin/module/update", datas);
   } else {
-    return $post("/api/admin/module/insert", datas);
+    return $postParam("/api/admin/module/insert", datas);
   }
 };
 export const appModuleEnable = ({ id, enable }) => {
-  return $post("/api/admin/module/update", { id, enable });
+  return $postParam("/api/admin/module/update", { id, enable });
 };
 // app-version-manage
 export const appVersionList = datas => {
@@ -78,9 +72,9 @@ export const appSetMasterVersion = ({ appId, versionId }) => {
 };
 export const appVersionInsertOrUpdate = datas => {
   if (datas.id) {
-    return $post("/api/admin/version/update", datas);
+    return $postParam("/api/admin/version/update", datas);
   } else {
-    return $post("/api/admin/version/insert", datas);
+    return $postParam("/api/admin/version/insert", datas);
   }
 };
 // app-env-manage
@@ -92,9 +86,9 @@ export const appEnvTypes = () => {
 };
 export const appEnvInsertOrUpdate = datas => {
   if (datas.id) {
-    return $post("/api/admin/env/update", datas);
+    return $postParam("/api/admin/env/update", datas);
   } else {
-    return $post("/api/admin/env/insert", datas);
+    return $postParam("/api/admin/env/insert", datas);
   }
 };
 // app-config
@@ -109,7 +103,7 @@ export const appConfigBaseline = datas => {
   return $postParam("/api/admin/config/baseline", datas);
 };
 export const appConfigBaselineUpdate = (datas, headerData) => {
-  return $post("/api/admin/config/baseline/update", datas, {
+  return $postParam("/api/admin/config/baseline/update", datas, {
     header: headerData
   });
 };

src/modules/admin/components/AppModuleManage.vue

@@ -30,13 +30,13 @@
               <el-option
                 v-for="(val, key) in ABLE_TYPE"
                 :key="key"
-                :value="val"
+                :value="key * 1"
                 :label="val"
               ></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label-width="0px">
-            <el-button type="primary" icon="ios-search" @click="toPage(1)"
+            <el-button type="primary" icon="ios-search" @click="getList"
               >查询</el-button
             >
             <el-button type="success" icon="md-add" @click="toAdd"
@@ -52,9 +52,12 @@
           <el-table-column prop="name" label="名称"> </el-table-column>
           <el-table-column prop="code" label="编码"> </el-table-column>
           <el-table-column prop="enable" label="状态" width="80">
-            <template slot-scope="scope">
+            <span
+              slot-scope="scope"
+              :class="{ 'color-danger': !scope.row.enable }"
+            >
               {{ scope.row.enable | ableTypeFilter }}
-            </template>
+            </span>
           </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="170">
             <span slot-scope="scope">{{
@@ -125,7 +128,7 @@ export default {
   },
   methods: {
     visibleChange() {
-      // this.getList();
+      this.getList();
     },
     cancel() {
       this.modalIsShow = false;

src/modules/admin/components/AppUserManage.vue

@@ -49,10 +49,7 @@
           <el-table-column prop="id" label="ID" width="80"></el-table-column>
           <el-table-column prop="loginName" label="用户名"></el-table-column>
           <el-table-column prop="name" label="姓名"></el-table-column>
-          <el-table-column prop="roles" label="角色" min-width="120">
-            <template slot-scope="scope">
-              {{ scope.row.roles | rolesFilter }}
-            </template>
+          <el-table-column prop="roleNames" label="角色" min-width="120">
           </el-table-column>
           <el-table-column label="状态" width="80">
             <template slot-scope="scope">
@@ -100,11 +97,6 @@ export default {
       }
     }
   },
-  filters: {
-    rolesFilter(val) {
-      return val.map(code => this.roleType[code]).join("，");
-    }
-  },
   data() {
     return {
       modalIsShow: false,
@@ -118,23 +110,22 @@ export default {
       roles: [],
       roleType: {},
       users: [],
-      curUser: {},
       bindUserIds: []
     };
   },
-  created() {
-    // this.getRoleList();
-  },
   methods: {
     async visibleChange() {
-      // await this.getBindUser();
-      // this.toPage(1);
+      await this.getRoleList();
+      await this.getBindUser();
+      this.toPage(1);
     },
     async getBindUser() {
       const res = await appUserList(this.app.id);
       this.bindUserIds = res ? res.map(item => item.userId) : [];
     },
     async getRoleList() {
+      if (this.roles.length) return;
+
       const data = await userRoleList();
       this.roles = data || [];
       let roleType = {};
@@ -150,8 +141,10 @@ export default {
         pageSize: this.size
       };
       const data = await userListPage(datas);
-      this.dataList = data.records.map(item => {
+      this.users = data.records.map(item => {
         item.isBind = this.bindUserIds.includes(item.id);
+        item.roleNames = item.role.map(code => this.roleType[code]).join("，");
+
         return item;
       });
       this.total = data.total;

src/modules/admin/components/ModifyAppModule.vue

@@ -123,6 +123,7 @@ export default {
       if (this.isSubmit) return;
       this.isSubmit = true;
       let datas = { ...this.modalForm };
+      if (!this.isEdit) datas.enable = true;
       const data = await appModuleInsertOrUpdate(datas).catch(() => {});
       this.isSubmit = false;
 

src/modules/admin/views/AppManage.vue

@@ -158,23 +158,13 @@ export default {
       current: 1,
       size: this.GLOBAL.pageSize,
       total: 0,
-      dataList: [
-        {
-          id: "1",
-          name: "应用1",
-          code: "app1",
-          masterVersionName: "1.0.0",
-          masterVersionId: "11",
-          createTime: Date.now(),
-          updateTime: Date.now()
-        }
-      ],
+      dataList: [],
       curRow: {},
       loading: false
     };
   },
   created() {
-    // this.initData();
+    this.initData();
   },
   methods: {
     initData() {