From 0243ef1e0854d31d49378f196eef994edfadb10f Mon Sep 17 00:00:00 2001
From: kongjun <qdkongjun@gmail.com>
Date: Tue, 21 Jun 2022 18:04:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/src/views/main.vue                       |   3 -
 .../src/views/modules/ability/bsabilityai.vue | 228 +++++++-------
 back/src/views/modules/sys/user.vue           | 290 +++++++++++++-----
 3 files changed, 325 insertions(+), 196 deletions(-)

diff --git a/back/src/views/main.vue b/back/src/views/main.vue
index 2dd2f26a..612ba48d 100644
--- a/back/src/views/main.vue
+++ b/back/src/views/main.vue
@@ -136,8 +136,5 @@ export default {
 <style scoped lang="scss">
 .aui-content__wrapper {
   margin-left: 266px;
-  .aui-content > .el-tabs > .el-tabs__header {
-    left: 230px;
-  }
 }
 </style>
diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index e06e60dc..947710db 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -1,10 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-ability__bsabilityai">
-      <el-form
-        :inline="true"
-        :model="dataForm"
-      >
+      <el-form :inline="true" :model="dataForm">
         <el-form-item>
           <el-input
             v-model="dataForm.name"
@@ -13,7 +10,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList2(dataForm.name)">{{
+          <el-button type="primary" @click="getDataList2(dataForm.name)">{{
             $t("query")
           }}</el-button>
         </el-form-item>
@@ -49,7 +46,7 @@
         :height="qp ? '650px' : '650px'"
         border
         @selection-change="dataListSelectionChangeHandle"
-        style="width: 100%;"
+        style="width: 100%"
       >
         <el-table-column
           type="selection"
@@ -71,9 +68,7 @@
           align="center"
         >
           <template slot-scope="scope">
-            {{
-              findValue(scope.row.infoList, item.attrType)
-            }}
+            {{ findValue(scope.row.infoList, item.attrType) }}
           </template>
         </af-table-column>
         <el-table-column
@@ -129,187 +124,196 @@
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './bsabilityai-add-or-update'
-import dictionaries from '@/utils/dictionaries'
-import qs from 'qs'
+import mixinViewModule from "@/mixins/view-module";
+import AddOrUpdate from "./bsabilityai-add-or-update";
+import dictionaries from "@/utils/dictionaries";
+import qs from "qs";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/resource/page',
+        getDataListURL: "/resource/page",
         getDataListIsPage: true,
-        exportURL: '/ability/bsabilityai/export',
-        deleteURL: '/resource/delete',
-        deleteIsBatch: true
+        exportURL: "/ability/bsabilityai/export",
+        deleteURL: "/resource/delete",
+        deleteIsBatch: true,
       },
       disabled: false,
       sceneArr: dictionaries.sceneArr,
       fieldArr: dictionaries.fieldArr,
       shareFormArr: dictionaries.shareFormArr,
       dataForm: {
-        name: '',
-        creator: '',
+        name: "",
+        creator: "",
         delFlag: 0,
         selectType: 0,
-        type: '组件服务'
+        type: "组件服务",
       },
-      qp: false
-    }
+      qp: false,
+    };
   },
   watch: {},
   components: {
-    AddOrUpdate
+    AddOrUpdate,
   },
-  created () {
-    this.dataForm.name = ''
-    this.dataForm.type = '组件服务'
+  created() {
+    this.dataForm.name = "";
+    this.dataForm.type = "组件服务";
   },
-  mounted () {
-    window.addEventListener('resize', this.a)
-    this.fullScreen()
+  mounted() {
+    window.addEventListener("resize", this.a);
+    this.fullScreen();
   },
   methods: {
-    reset () {
-      this.$http.get(
-        this.mixinViewModuleOptions.getDataListURL + '?' + qs.stringify({
-          // order: this.order,
-          // orderField: this.orderField,
-          // type: '组件服务',
-          page: 1,
-          limit: 10,
-          creator: '',
-          selectType: 0,
-          delFlag: 0,
-          type: '组件服务',
-          name: ''
-        })
-      )
+    reset() {
+      this.$http
+        .get(
+          this.mixinViewModuleOptions.getDataListURL +
+            "?" +
+            qs.stringify({
+              // order: this.order,
+              // orderField: this.orderField,
+              // type: '组件服务',
+              page: 1,
+              limit: 10,
+              creator: "",
+              selectType: 0,
+              delFlag: 0,
+              type: "组件服务",
+              name: "",
+            })
+        )
         .then(({ data: res }) => {
-          this.dataForm.name = ''
+          this.dataForm.name = "";
           if (res.code !== 0) {
-            this.dataList = []
-            this.total = 0
-            return this.$message.error(res.msg)
+            this.dataList = [];
+            this.total = 0;
+            return this.$message.error(res.msg);
           }
           this.dataList = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.list
-            : res.data
+            : res.data;
           this.total = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.total
-            : 0
+            : 0;
           if (this.mixinViewModuleOptions.requestCallback) {
-            this.mixinViewModuleOptions.requestCallback(res.data)
+            this.mixinViewModuleOptions.requestCallback(res.data);
           }
-          this.dataListLoading = false
+          this.dataListLoading = false;
         })
         .catch(() => {
-          this.dataListLoading = false
-        })
+          this.dataListLoading = false;
+        });
     },
-    findValue (list, type) {
-      const found = list.find(item => item.attrType === type)
+    findValue(list, type) {
+      const found = list.find((item) => item.attrType === type);
       if (found) {
-        return found.attrValue
+        return found.attrValue;
       } else {
-        return '暂无数据'
+        return "暂无数据";
       }
     },
-    showDetail (val) {
+    showDetail(val) {
       // this.addOrUpdateHandle(id)
-      this.addOrUpdateVisible = true
-      this.disabled = false
-      console.log('显示数据=============》', val)
+      this.addOrUpdateVisible = true;
+      this.disabled = false;
+      console.log("显示数据=============》", val);
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.UpdateState = false
-        this.$refs.addOrUpdate.dataFormShowDetails = val
-        this.$refs.addOrUpdate.init()
-      })
-      this.disabled = true
+        this.$refs.addOrUpdate.UpdateState = false;
+        this.$refs.addOrUpdate.dataFormShowDetails = val;
+        this.$refs.addOrUpdate.init();
+      });
+      this.disabled = true;
     },
-    showDocument (val) {
-      console.log(val)
-      window.open(window.SITE_CONFIG.frontUrl + '?id=' + val.id + '&&type=' + val.type, '_blank')
+    showDocument(val) {
+      console.log(val);
+      window.open(
+        window.SITE_CONFIG.frontUrl + "?id=" + val.id + "&&type=" + val.type,
+        "_blank"
+      );
     },
-    getDataList2 (names) {
+    getDataList2(names) {
       if (names != null) {
-        this.$http.get(
-          this.mixinViewModuleOptions.getDataListURL + '?' + qs.stringify({
-          // order: this.order,
-          // orderField: this.orderField,
-          // type: '组件服务',
-            pageNum: 1,
-            pageSize: this.limit,
-            type: '组件服务',
-            creator: '',
-            selectType: 0,
-            delFlag: 0,
-            name: names
-          })
-        )
+        this.$http
+          .get(
+            this.mixinViewModuleOptions.getDataListURL +
+              "?" +
+              qs.stringify({
+                // order: this.order,
+                // orderField: this.orderField,
+                // type: '组件服务',
+                pageNum: 1,
+                pageSize: this.limit,
+                type: "组件服务",
+                creator: "",
+                selectType: 0,
+                delFlag: 0,
+                name: names,
+              })
+          )
           .then(({ data: res }) => {
-            console.log('res', res)
+            console.log("res", res);
             if (res.code !== 0) {
-              this.dataList = []
-              this.total = 0
-              return this.$message.error(res.msg)
+              this.dataList = [];
+              this.total = 0;
+              return this.$message.error(res.msg);
             }
             if (res.data.list.length !== 0) {
-              this.dataList = res.data.list
+              this.dataList = res.data.list;
               this.total = this.mixinViewModuleOptions.getDataListIsPage
                 ? res.data.total
-                : 0
+                : 0;
               if (this.mixinViewModuleOptions.requestCallback) {
-                this.mixinViewModuleOptions.requestCallback(res.data)
+                this.mixinViewModuleOptions.requestCallback(res.data);
               }
-              this.dataListLoading = false
+              this.dataListLoading = false;
             } else {
-              this.$message.error('未查询到相关信息')
-              this.reset()
+              this.$message.error("未查询到相关信息");
+              this.reset();
             }
           })
           .catch(() => {
-            this.dataListLoading = false
-          })
+            this.dataListLoading = false;
+          });
       } else {
-        this.$message.error('查询信息不能为空')
+        this.$message.error("查询信息不能为空");
       }
     },
-    fullScreen () {
+    fullScreen() {
       if (window.outerHeight === screen.availHeight) {
         if (window.outerWidth === screen.availWidth) {
           console.log(
-            '全屏1',
+            "全屏1",
             window.outerHeight,
             screen.availHeight,
             window.outerWidth,
             screen.availWidth
-          )
-          this.qp = false
+          );
+          this.qp = false;
         } else {
           console.log(
-            '不是全屏2',
+            "不是全屏2",
             window.outerHeight,
             screen.availHeight,
             window.outerWidth,
             screen.availWidth
-          )
-          this.qp = true
+          );
+          this.qp = true;
         }
       } else {
         console.log(
-          '不是全屏3',
+          "不是全屏3",
           window.outerHeight,
           screen.availHeight,
           window.outerWidth,
           screen.availWidth
-        )
-        this.qp = true
+        );
+        this.qp = true;
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 .el-tooltip__popper {
diff --git a/back/src/views/modules/sys/user.vue b/back/src/views/modules/sys/user.vue
index cbb91933..bd4a4be4 100644
--- a/back/src/views/modules/sys/user.vue
+++ b/back/src/views/modules/sys/user.vue
@@ -1,32 +1,75 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__user">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
         <el-form-item>
-          <el-input v-model="dataForm.username" :placeholder="$t('user.username')" clearable></el-input>
+          <el-input
+            v-model="dataForm.username"
+            :placeholder="$t('user.username')"
+            clearable
+          ></el-input>
         </el-form-item>
         <el-form-item>
-          <ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
+          <ren-select
+            v-model="dataForm.gender"
+            dict-type="gender"
+            :placeholder="$t('user.gender')"
+          ></ren-select>
         </el-form-item>
         <el-form-item>
-          <el-select v-model="dataForm.postId" :placeholder="$t('user.postIdList')" clearable>
-            <el-option :label="data.postName" v-for="data in postList" :key="data.id" :value ="data.id">{{data.postName}}</el-option>
+          <el-select
+            v-model="dataForm.postId"
+            :placeholder="$t('user.postIdList')"
+            clearable
+          >
+            <el-option
+              :label="data.postName"
+              v-for="data in postList"
+              :key="data.id"
+              :value="data.id"
+              >{{ data.postName }}</el-option
+            >
           </el-select>
         </el-form-item>
         <el-form-item>
-          <ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :query="true"></ren-dept-tree>
+          <ren-dept-tree
+            v-model="dataForm.deptId"
+            :placeholder="$t('dept.title')"
+            :query="true"
+          ></ren-dept-tree>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataList()">{{
+            $t("query")
+          }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:user:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button
+            v-if="$hasPermission('sys:user:save')"
+            type="primary"
+            @click="addOrUpdateHandle()"
+            >{{ $t("add") }}</el-button
+          >
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:user:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button
+            v-if="$hasPermission('sys:user:delete')"
+            type="danger"
+            @click="deleteHandle()"
+            >{{ $t("deleteBatch") }}</el-button
+          >
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:user:export')" type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button
+            v-if="$hasPermission('sys:user:export')"
+            type="info"
+            @click="exportHandle()"
+            >{{ $t("export") }}</el-button
+          >
         </el-form-item>
         <el-form-item>
           <el-button @click="reset()">重置</el-button>
@@ -38,28 +81,97 @@
         border
         @selection-change="dataListSelectionChangeHandle"
         @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gender" :label="$t('user.gender')" sortable="custom" header-align="center" align="center">
+        style="width: 100%"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          prop="username"
+          :label="$t('user.username')"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="deptName"
+          :label="$t('user.deptName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="email"
+          :label="$t('user.email')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="mobile"
+          :label="$t('user.mobile')"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="gender"
+          :label="$t('user.gender')"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        >
           <template slot-scope="scope">
             {{ $getDictLabel("gender", scope.row.gender) }}
           </template>
         </el-table-column>
-        <el-table-column prop="status" :label="$t('user.status')" sortable="custom" header-align="center" align="center">
+        <el-table-column
+          prop="status"
+          :label="$t('user.status')"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('user.status0') }}</el-tag>
-            <el-tag v-else size="small" type="success">{{ $t('user.status1') }}</el-tag>
+            <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{
+              $t("user.status0")
+            }}</el-tag>
+            <el-tag v-else size="small" type="success">{{
+              $t("user.status1")
+            }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="createDate" :label="$t('user.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column
+          prop="createDate"
+          :label="$t('user.createDate')"
+          sortable="custom"
+          header-align="center"
+          align="center"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button
+              v-if="$hasPermission('sys:user:update')"
+              type="text"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.id)"
+              >{{ $t("update") }}</el-button
+            >
+            <el-button
+              v-if="$hasPermission('sys:user:delete')"
+              type="text"
+              size="small"
+              @click="deleteHandle(scope.row.id)"
+              >{{ $t("delete") }}</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -70,84 +182,100 @@
         :total="total"
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+        @current-change="pageCurrentChangeHandle"
+      >
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <add-or-update
+        v-if="addOrUpdateVisible"
+        ref="addOrUpdate"
+        @refreshDataList="getDataList"
+      ></add-or-update>
     </div>
   </el-card>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './user-add-or-update'
-import qs from 'qs'
+import mixinViewModule from "@/mixins/view-module";
+import AddOrUpdate from "./user-add-or-update";
+import qs from "qs";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/sys/user/page',
+        getDataListURL: "/sys/user/page",
         getDataListIsPage: true,
-        deleteURL: '/sys/user',
+        deleteURL: "/sys/user",
         deleteIsBatch: true,
-        exportURL: '/sys/user/export'
+        exportURL: "/sys/user/export",
       },
       postList: [],
       dataForm: {
-        username: '',
-        deptId: '',
-        postId: '',
-        gender: ''
-      }
-    }
+        username: "",
+        deptId: "",
+        postId: "",
+        gender: "",
+      },
+    };
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
   },
-  created () {
-    this.getPostList()
+  created() {
+    this.getPostList();
   },
   methods: {
-    reset () {
-      this.$http.get(
-        this.mixinViewModuleOptions.getDataListURL + '?' + qs.stringify({
-          page: 1,
-          limit: 10,
-          username: '',
-          deptId: '',
-          postId: '',
-          gender: ''
+    reset() {
+      this.$http
+        .get(
+          this.mixinViewModuleOptions.getDataListURL +
+            "?" +
+            qs.stringify({
+              page: 1,
+              limit: 10,
+              username: "",
+              deptId: "",
+              postId: "",
+              gender: "",
+            })
+        )
+        .then(({ data: res }) => {
+          this.dataForm.username = "";
+          this.dataForm.deptId = "";
+          this.dataForm.postId = "";
+          this.dataForm.gender = "";
+          if (res.code !== 0) {
+            this.dataList = [];
+            this.total = 0;
+            return this.$message.error(res.msg);
+          }
+          this.dataList = this.mixinViewModuleOptions.getDataListIsPage
+            ? res.data.list
+            : res.data;
+          this.total = this.mixinViewModuleOptions.getDataListIsPage
+            ? res.data.total
+            : 0;
+          if (this.mixinViewModuleOptions.requestCallback) {
+            this.mixinViewModuleOptions.requestCallback(res.data);
+          }
+          this.dataListLoading = false;
         })
-
-      ).then(({ data: res }) => {
-        this.dataForm.username = ''
-        this.dataForm.deptId = ''
-        this.dataForm.postId = ''
-        this.dataForm.gender = ''
-        if (res.code !== 0) {
-          this.dataList = []
-          this.total = 0
-          return this.$message.error(res.msg)
-        }
-        this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
-        this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
-        if (this.mixinViewModuleOptions.requestCallback) {
-          this.mixinViewModuleOptions.requestCallback(res.data)
-        }
-        this.dataListLoading = false
-      }).catch(() => {
-        this.dataListLoading = false
-      })
+        .catch(() => {
+          this.dataListLoading = false;
+        });
     },
-    getPostList () {
-      this.$http.get('/sys/post/list').then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.postList = res.data
-      }).catch(() => {})
-    }
-  }
-}
+    getPostList() {
+      this.$http
+        .get("/sys/post/list")
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.postList = res.data;
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>