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

2022-10-31 17:47:56 +08:00 · 2022-10-31 17:47:56 +08:00 · d130bcf1aa
parent 2156e70433 1ad52d954c
commit d130bcf1aa
5 changed files with 187 additions and 144 deletions
--- a/back/src/views/modules/sys/dept.vue
+++ b/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="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80"></el-table-column>
+        <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center">
+        </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:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <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: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
-      this.$http.get('/sys/dept/list').then((res) => {
-        res.data.data.map((item, index) => {
-          if (item.district != null || item.children.length > 0) {
+    // 分页, 每页条数
+    pageSizeChangeHandle (val) {
+      this.page = 1
+      this.limit = val
+      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>
--- a/front/src/api/home.js
+++ b/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({
--- a/front/src/views/home/apply.vue
+++ b/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({
-        pageNum: 1,
-        pageSize: 99999,
-        type: '应用资源',
-        name: '',
-        infoList: [],
-      }).then((res) => {
+      getAppListByDept().then((res) => {
+        console.log('res=====>', res.data.data)
        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) => {
-              if (val.deptName === deptName) {
-                systemOptions2.value.push({
-                  value: val.name,
-                  label: val.name,
-                })
-              }
+            res.data.data.map((val) => {
+              systemOptions2.value.push({
+                value: val.NAME,
+                label: val.NAME,
+              })
            })
            // console.log('第一次获取===================>', systemOptions2.value)
          }
@ -959,130 +956,130 @@
  }
 </script>
 <style scoped lang="less">
-  #apply-container {
-    // background-color: #f5f8fc;
-    height: 100%;
-    width: 100%;
-    margin: 0.8rem auto 0;
+#apply-container {
+  // background-color: #f5f8fc;
+  height: 100%;
+  width: 100%;
+  margin: 0.8rem auto 0;
+  display: flex;
+  justify-content: space-between;
+
+  aside {
+    width: 282px;
+    height: 96%;
+    overflow-y: auto;
+    background-color: #fff;
+    margin: 1% 0 3%;
+  }
+
+  article {
+    width: 1090px;
+    height: 99%;
+    overflow-y: auto;
+    background-color: #fff;
+    margin: 1% auto;
+  }
+
+  .form-container {
+    padding: 20px 20px 30px 20px;
+
+    .title {
+      font-size: 20px;
+      color: #000;
+      font-weight: bold;
+      margin-bottom: 20px;
+    }
+  }
+
+  .base-info {
    display: flex;
    justify-content: space-between;
+  }

-    aside {
-      width: 282px;
-      height: 96%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 1% 0 3%;
-    }
+  .flex-row-start {
+    justify-content: flex-start;
+    align-items: center;
+  }

-    article {
-      width: 1090px;
-      height: 99%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 1% auto;
-    }
+  :deep(.ant-form-item-label) {
+    label {
+      color: #666;
+      font-size: 16px;

-    .form-container {
-      padding: 20px 20px 30px 20px;
-
-      .title {
-        font-size: 20px;
-        color: #000;
-        font-weight: bold;
-        margin-bottom: 20px;
+      &::after {
+        content: '';
      }
    }
-
-    .base-info {
-      display: flex;
-      justify-content: space-between;
-    }
-
-    .flex-row-start {
-      justify-content: flex-start;
-      align-items: center;
-    }
-
-    :deep(.ant-form-item-label) {
-      label {
-        color: #666;
-        font-size: 16px;
-
-        &::after {
-          content: '';
-        }
-      }
-    }
-
-    :deep(.ant-form-item-required) {
-      &::before {
-        font-size: 8px;
-        margin-right: 10px;
-      }
-    }
-
-    :deep(.ant-input) {
-      border: 1px solid #e0e0e0;
-      border-radius: 6px;
-    }
-
-    .success {
-      div {
-        width: 100px;
-        margin: 80px auto 40px;
-      }
-
-      text-align: center;
-      font-size: 20px;
-      font-weight: bold;
-      color: #000;
-    }
  }

-  .applicationScene {
-    :deep(.ant-select-selector) {
-      overflow-x: scroll;
-    }
-
-    :deep(.ant-select-selection-overflow) {
-      flex-wrap: nowrap;
+  :deep(.ant-form-item-required) {
+    &::before {
+      font-size: 8px;
+      margin-right: 10px;
    }
  }

-  textarea {
-    resize: none;
-    font-size: 14px;
-  }
-
-  .bottom-btn {
-    display: flex;
-    justify-content: center;
-    // position: fixed;
-  }
-
-  .cancel-apply {
-    width: 80px;
-    height: 38px;
-    margin-right: 20px;
-    background: #e1edfa;
-    color: #0087ff;
-    font-size: 14px;
+  :deep(.ant-input) {
+    border: 1px solid #e0e0e0;
    border-radius: 6px;
-    border: none;
-    padding: 0;
-    text-align: center;
  }

-  .confirm-apply {
-    width: 80px;
-    height: 38px;
-    background: #0087ff;
-    color: #fff;
-    font-size: 14px;
-    border-radius: 6px;
-    border: none;
-    padding: 0;
+  .success {
+    div {
+      width: 100px;
+      margin: 80px auto 40px;
+    }
+
    text-align: center;
+    font-size: 20px;
+    font-weight: bold;
+    color: #000;
  }
+}
+
+.applicationScene {
+  :deep(.ant-select-selector) {
+    overflow-x: scroll;
+  }
+
+  :deep(.ant-select-selection-overflow) {
+    flex-wrap: nowrap;
+  }
+}
+
+textarea {
+  resize: none;
+  font-size: 14px;
+}
+
+.bottom-btn {
+  display: flex;
+  justify-content: center;
+  // position: fixed;
+}
+
+.cancel-apply {
+  width: 80px;
+  height: 38px;
+  margin-right: 20px;
+  background: #e1edfa;
+  color: #0087ff;
+  font-size: 14px;
+  border-radius: 6px;
+  border: none;
+  padding: 0;
+  text-align: center;
+}
+
+.confirm-apply {
+  width: 80px;
+  height: 38px;
+  background: #0087ff;
+  color: #fff;
+  font-size: 14px;
+  border-radius: 6px;
+  border: none;
+  padding: 0;
+  text-align: center;
+}
 </style>
--- a/front/src/views/home/components/header.vue
+++ b/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 {
--- a/front/src/views/personalCenter/components/MyApply.vue
+++ b/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>