Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/sys/dept.vue

@@ -3,22 +3,36 @@
     <div class="mod-sys__dept">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:dept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('sys:dept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" row-key="id" border style="width: 100%;">
         <el-table-column prop="name" :label="$t('dept.name')" header-align="center" min-width="150"></el-table-column>
-        <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center">
-        <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80"></el-table-column>
+        </el-table-column>
+        <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80">
+        </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:dept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('sys:dept:update')" type="text" size="small"
-            <el-button v-if="$hasPermission('sys:dept:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+              @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('sys:dept:delete')" type="text" size="small"
+              @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
         <el-table-column prop="type" label="类型" header-align="center" align="center" width="80"></el-table-column>
         <el-table-column prop="district" label="区划" header-align="center" align="center" width="80"></el-table-column>
       </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
     </div>
@@ -31,12 +45,16 @@ import AddOrUpdate from './dept-add-or-update'
 import qs from 'qs'
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
         getDataListURL: '/sys/dept/list',
         deleteURL: '/sys/dept'
-      }
+      },
+      total: 0,
+      limit: 10,
+      page: 1,
+      dataList: []
     }
   },
   components: {
@@ -45,16 +63,35 @@ export default {
   watch: {
     dataList: {
       handler: function () {
-        this.init()
+        this.getData()
       }
     }
   },
   methods: {
-    init () {
+    // 分页, 每页条数
-      debugger
+    pageSizeChangeHandle (val) {
-      this.$http.get('/sys/dept/list').then((res) => {
+      this.page = 1
-        res.data.data.map((item, index) => {
+      this.limit = val
-          if (item.district != null || item.children.length > 0) {
+      this.getData()
+    },
+    // 分页, 当前页
+    pageCurrentChangeHandle (val) {
+      this.page = val
+      this.getData()
+    },
+    getData() {
+      // debugger
+      let _data = {
+        limt: this.limit,
+        page: this.page,
+      }
+      this.$http.get('sys/dept/page', {
+        params: _data
+      }).then((res) => {
+        this.total = res.data.data.total;
+        res.data.data.list.map((item, index) => {
+          console.log('item, index------------>', item, index);
+          if (item.district != null || item.children.length >= 0) {
             this.$http.get('/sys/region/' + item.district).then((data) => {
               this.dataList[index].district = data.data.data.name
               console.log('datafrom', this.dataList)
@@ -72,10 +109,10 @@ export default {
           }
         })
       })
-    }
     },
-  created () {
+  },
-    this.init()
+  created() {
+    this.getData()
   }
 }
 </script>

front/src/api/home.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-04-01 19:19:40
  * @LastEditors: Light
- * @LastEditTime: 2022-10-26 10:35:36
+ * @LastEditTime: 2022-10-31 15:52:57
  * @Description: 告诉大家这是什么
  */
 import request from '@/utils/request'
@@ -63,6 +63,13 @@ export function pageWithAttrs(data) {
     data,
   })
 }
+// 筛选
+export function getAppListByDept() {
+  return request({
+    url: '/resource/getAppListByDept',
+    method: 'get',
+  })
+}
 // 获取hls视频流
 export function getHls(params) {
   return request({

front/src/views/home/apply.vue

@@ -260,7 +260,11 @@
   import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
   import mybus from '@/myplugins/mybus'
   import { sgcDel, getApplyForm } from '@/api/personalCenter'
-  import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
+  import {
+    pageWithAttrs,
+    updateIntegrationServices,
+    getAppListByDept,
+  } from '@/api/home'
   import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
   import { getIntegrationDetail, soldierApply } from '@/api/home'
   import { useStore } from 'vuex'
@@ -783,25 +787,18 @@
           })
         }
       }
-      pageWithAttrs({
+      getAppListByDept().then((res) => {
-        pageNum: 1,
+        console.log('res=====>', res.data.data)
-        pageSize: 99999,
-        type: '应用资源',
-        name: '',
-        infoList: [],
-      }).then((res) => {
         if (res.data.code == 0) {
-          if (res.data.data.records.length == 0) {
+          if (res.data.data.length == 0) {
             message.warning('该关键词，暂无应用资源！')
           } else {
             // 过滤本单位的应用系统
-            res.data.data.records.map((val) => {
+            res.data.data.map((val) => {
-              if (val.deptName === deptName) {
               systemOptions2.value.push({
-                  value: val.name,
+                value: val.NAME,
-                  label: val.name,
+                label: val.NAME,
               })
-              }
             })
             // console.log('第一次获取===================>', systemOptions2.value)
           }
@@ -959,7 +956,7 @@
   }
 </script>
 <style scoped lang="less">
-  #apply-container {
+#apply-container {
   // background-color: #f5f8fc;
   height: 100%;
   width: 100%;
@@ -1038,9 +1035,9 @@
     font-weight: bold;
     color: #000;
   }
-  }
+}
 
-  .applicationScene {
+.applicationScene {
   :deep(.ant-select-selector) {
     overflow-x: scroll;
   }
@@ -1048,20 +1045,20 @@
   :deep(.ant-select-selection-overflow) {
     flex-wrap: nowrap;
   }
-  }
+}
 
-  textarea {
+textarea {
   resize: none;
   font-size: 14px;
-  }
+}
 
-  .bottom-btn {
+.bottom-btn {
   display: flex;
   justify-content: center;
   // position: fixed;
-  }
+}
 
-  .cancel-apply {
+.cancel-apply {
   width: 80px;
   height: 38px;
   margin-right: 20px;
@@ -1072,9 +1069,9 @@
   border: none;
   padding: 0;
   text-align: center;
-  }
+}
 
-  .confirm-apply {
+.confirm-apply {
   width: 80px;
   height: 38px;
   background: #0087ff;
@@ -1084,5 +1081,5 @@
   border: none;
   padding: 0;
   text-align: center;
-  }
+}
 </style>

front/src/views/home/components/header.vue

@@ -587,6 +587,7 @@
   :deep(.ant-list-item) {
     border-bottom: 0.01rem solid #ccc;
     padding: 0.1rem;
+    cursor: default;
   }
 
   :deep(.ant-list-item-meta-title) {
@@ -602,6 +603,7 @@
       -webkit-line-clamp: 2;
       word-break: break-all;
       -webkit-box-orient: vertical;
+      cursor: default;
     }
 
     button {

front/src/views/personalCenter/components/MyApply.vue

@@ -44,12 +44,12 @@
           </div>
           <a-tooltip>
             <template #title>
-              {{ item.cameraList ? item.system : item.title }}
+              {{ item.cameraList ? item.system : (item.title|| item.name) }}
             </template>
             <div class="content-body-title">
               <span>
                 名称：{{
-                  item.cameraList ? item.system : item.title || item.name
+                  item.cameraList ? item.system : (item.title || item.name)
                 }}
               </span>
               <div></div>