Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev

front/src/router/index.js

@@ -453,6 +453,15 @@ export const constantRoutes = [
       icon: 'error-warning-line',
     },
   },
+  {
+    path: '/packagingDetails',
+    name: 'packagingDetails',
+    component: () => import('@/views/home/packagingDetails'),
+    meta: {
+      title: '打包模式详情',
+      icon: 'error-warning-line',
+    },
+  },
   {
     path: '/integrationServices',
     name: 'integrationServices',

front/src/views/home/integrationServices.vue

@@ -5,56 +5,28 @@
     <div class="top">
       <div class="top-title">
         全部：
-        <div 
+        <div v-for="(item, index) in titleName" :key="index" class="tabAll" @click="changeCards(index)"
-          v-for="(item, index) in titleName" 
-          :key="index" 
-          class="tabAll" 
-          @click="changeCards(index)"
           :class="{ sel: index == number }">
-            <span>{{ item.name }}</span>
+          <span>{{ item.name }}</span>
         </div>
       </div>
       <div class="resultListSearchInput-father">
         <div class="resultListSearchInput-son">
           模糊搜索
-          <a-input-search
+          <a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
-            v-model:value="searchValue"
+            @search="getAppResources" @change="onSearch" class="resultListSearchInput" />
-            placeholder="请输入关键词"
-            enter-button="搜索"
-            size="large"
-            @search="getAppResources"
-            @change="onSearch"
-            class="resultListSearchInput"
-          />
           <button class="button-reset" @click="chongzhi()">重置</button>
           <div class="hengxian"></div>
         </div>
       </div>
-      <searchResultList
+      <searchResultList v-show="resourceList.data && resourceList.data.length > 0" :key="listKey2"
-        v-show="resourceList.data && resourceList.data.length > 0"
+        :resourceList="resourceList" :resourceTotal="resourceTotal" :selectCardsname="number == 0 ? '融合服务' : '赋能场景'" />
-        :key="listKey2"
-        :resourceList="resourceList"
-        :resourceTotal="resourceTotal"
-        selectCardsname="融合服务"
-      />
       <div class="pagination">
-        <a-pagination
+        <a-pagination v-if="resourceList.data && resourceList.data.length > 0" v-model:current="currentPage"
-          v-if="resourceList.data && resourceList.data.length > 0"
+          v-model:pageSize="currentPageSize" show-size-changer show-less-items show-quick-jumper :total="resourceTotal"
-          v-model:current="currentPage"
+          :page-size-options="pageSizeOptions" @change="pageChange" @showSizeChange="onShowSizeChange" />
-          v-model:pageSize="currentPageSize"
-          show-size-changer
-          show-less-items
-          show-quick-jumper
-          :total="resourceTotal"
-          :page-size-options="pageSizeOptions"
-          @change="pageChange"
-          @showSizeChange="onShowSizeChange"
-        />
       </div>
-      <div
+      <div v-if="resourceList.data && resourceList.data.length <= 0" style="margin-top: 2rem">
-        v-if="resourceList.data && resourceList.data.length <= 0"
-        style="margin-top: 2rem"
-      >
         <a-empty />
       </div>
     </div>
@@ -62,327 +34,330 @@
   <home-footer></home-footer>
 </template>
 <script>
-  import HomeFooter from '@/views/newHome/components/Footer'
+import HomeFooter from '@/views/newHome/components/Footer'
-  import mybus from '@/myplugins/mybus'
+import mybus from '@/myplugins/mybus'
-  import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
+import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
 
-  import { getIntegrationServicesList } from '@/api/home.js'
+import { getIntegrationServicesList } from '@/api/home.js'
-  import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
-  import HomeHeader from '@/views/home/components/header'
+import HomeHeader from '@/views/home/components/header'
-  import searchResultList from '@/views/home/components/searchResultList.vue'
+import searchResultList from '@/views/home/components/searchResultList.vue'
-  import { message } from 'ant-design-vue'
+import { message } from 'ant-design-vue'
 
-  export default defineComponent({
+export default defineComponent({
-    setup() {
+  setup() {
+    // 分页
+    const loading = ref(true)
+    const currentPage = ref(1)
+    const currentPageSize = ref(5)
+    const pageSizeOptions = ref(['5', '10', '20', '50'])
+    const router = useRouter()
+    const select = router.currentRoute.value.query.select
+    const searchValue = ref('')
+    const Cardsname = ref(select)
+    const resourceList = reactive({ data: [] })
+    const resourceTotal = ref(0)
+    const current = ref(1)
+    // 选项卡
+    const titleName = ref([
+      {
+        name: '打包模式',
+      },
+      {
+        name: '赋能场景',
+      },
+    ])
+
+    const number = ref(0)
+    // 刷新筛选条件组件
+    let listKey = ref(0)
+    // 刷新筛选列表信息组件
+    const listKey2 = ref(0)
+
+    // 查询参数
+    const paramsGetResources = {
+      pageNum: 1,
+      pageSize: currentPageSize.value,
+      type: titleName.value[number.value].name,
+      name: '',
+      orderField: 'create_date', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+      orderType: 'DESC', // ASC 升序  DESC 降序
+    }
+
+    const changeCards = (val) => {
+      console.log(val)
+      number.value = val
+      chongzhi()
+    }
+
+    // 查询
+    const onSearch = () => {
+      loading.value = true
+      currentPage.value = 1
+    }
+    // 重置数据
+    const chongzhi = () => {
+      loading.value = true
+      // 重置模糊查字段
+      searchValue.value = ''
       // 分页
-      const loading = ref(true)
+      currentPage.value = 1
-      const currentPage = ref(1)
+      currentPageSize.value = 5
-      const currentPageSize = ref(5)
+      // 重置查询条件
-      const pageSizeOptions = ref(['5', '10', '20', '50'])
+      paramsGetResources.pageNum = 1
-      const router = useRouter()
+      paramsGetResources.pageSize = 5
-      const select = router.currentRoute.value.query.select
+      paramsGetResources.orderField = 'create_date'
-      const searchValue = ref('')
+      paramsGetResources.orderType = 'DESC'
-      const Cardsname = ref(select)
+      mybus.emit('chongzhi', {
-      const resourceList = reactive({ data: [] })
-      const resourceTotal = ref(0)
-      const current = ref(1)
-      // 选项卡
-      const titleName = ref([
-        {
-          name: '打包模式',
-        },
-        {
-          name: '赋能场景',
-        },
-      ])
-
-      const number = ref(0)
-      // 刷新筛选条件组件
-      let listKey = ref(0)
-      // 刷新筛选列表信息组件
-      const listKey2 = ref(0)
-
-      // 查询参数
-      const paramsGetResources = {
-        pageNum: 1,
-        pageSize: currentPageSize.value,
         type: titleName.value[number.value].name,
-        name: '',
+      })
-        orderField: 'create_date', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+      getAppResources()
-        orderType: 'DESC', // ASC 升序  DESC 降序
+    }
-      }
 
-      const changeCards = (val) => {
+    const getAppResources = () => {
-        console.log(val)
+      getIntegrationList()
-        number.value = val
+    }
-        chongzhi()
-      }
 
-      // 查询
+    // 获取融合服务列表
-      const onSearch = () => {
+    const getIntegrationList = () => {
-        loading.value = true
+      let postData = {
-        currentPage.value = 1
+        limit: currentPageSize.value,
+        page: currentPage.value,
+        orderField: paramsGetResources.orderField,
+        orderType: paramsGetResources.orderType,
+        name: searchValue.value,
+        type: titleName.value[number.value].name,
       }
-      // 重置数据
+      getIntegrationServicesList(postData).then(
-      const chongzhi = () => {
+        (res) => {
-        loading.value = true
+          if (res.data.code !== 0) {
-        // 重置模糊查字段
+            return message.error(res.data.msg)
-        searchValue.value = ''
-        // 分页
-        currentPage.value = 1
-        currentPageSize.value = 5
-        // 重置查询条件
-        paramsGetResources.pageNum = 1
-        paramsGetResources.pageSize = 5
-        paramsGetResources.orderField = 'create_date'
-        paramsGetResources.orderType = 'DESC'
-        mybus.emit('chongzhi', {
-          type: titleName.value[number.value].name,
-        })
-        getAppResources()
-      }
-
-      const getAppResources = () => {
-        getIntegrationList()
-      }
-
-      // 获取融合服务列表
-      const getIntegrationList = () => {
-        let postData = {
-          limit: currentPageSize.value,
-          page: currentPage.value,
-          orderField: paramsGetResources.orderField,
-          orderType: paramsGetResources.orderType,
-          name: searchValue.value,
-          type: titleName.value[number.value].name,
-        }
-        getIntegrationServicesList(postData).then(
-          (res) => {
-            if (res.data.code !== 0) {
-              return message.error(res.data.msg)
-            }
-            resourceList.data = res.data.data.list || []
-            resourceTotal.value = res.data.data.total || 0
-          },
-          (err) => {
-            message.error(err)
           }
-        )
+          resourceList.data = res.data.data.list || []
-      }
+          resourceTotal.value = res.data.data.total || 0
-
+        },
-      mybus.on('paramsGetResources', (ids) => {
+        (err) => {
-        if (ids && ids.length > 0) {
+          message.error(err)
-          paramsGetResources.deptIds = ids
-        } else {
-          delete paramsGetResources.deptIds
         }
-        getAppResources()
+      )
-        console.log('paramsGetResources', paramsGetResources)
+    }
-      })
-      mybus.on('changePage', (page) => {
-        paramsGetResources.pageNum = page
-        getAppResources('分页查询')
-      })
-      mybus.on('changeSelcted', () => {
-        getAppResources()
-      })
 
-      mybus.on('refresh', () => {
+    mybus.on('paramsGetResources', (ids) => {
-        paramsGetResources.pageNum = 1
+      if (ids && ids.length > 0) {
-        currentPage.value = 1
+        paramsGetResources.deptIds = ids
-        getAppResources()
+      } else {
-      })
+        delete paramsGetResources.deptIds
-      mybus.on('changeCondition', (condition) => {
-        paramsGetResources.orderField = condition.orderField
-        paramsGetResources.orderType = condition.orderType
-        getAppResources()
-      })
-
-      const pageChange = (val) => {
-        console.log(val)
-        loading.value = true
-        currentPage.value = val
-        paramsGetResources.pageNum = val
-        let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-        getAppResources(params)
       }
+      getAppResources()
+      console.log('paramsGetResources', paramsGetResources)
+    })
+    mybus.on('changePage', (page) => {
+      paramsGetResources.pageNum = page
+      getAppResources('分页查询')
+    })
+    mybus.on('changeSelcted', () => {
+      getAppResources()
+    })
 
-      onMounted(() => {
+    mybus.on('refresh', () => {
-        listKey2.value++
+      paramsGetResources.pageNum = 1
-        getAppResources()
+      currentPage.value = 1
-      })
+      getAppResources()
+    })
+    mybus.on('changeCondition', (condition) => {
+      paramsGetResources.orderField = condition.orderField
+      paramsGetResources.orderType = condition.orderType
+      getAppResources()
+    })
 
-      // 分页
+    const pageChange = (val) => {
-      const onShowSizeChange = (current, pageSize) => {
+      console.log(val)
-        currentPage.value = current
+      loading.value = true
-        currentPageSize.value = pageSize
+      currentPage.value = val
-        paramsGetResources.pageNum = current
+      paramsGetResources.pageNum = val
-        paramsGetResources.pageSize = pageSize
+      let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-        getAppResources()
+      getAppResources(params)
-      }
+    }
-      watch(currentPageSize, () => {
-        console.log('pageSize', currentPageSize.value)
-      })
 
-      return {
+    onMounted(() => {
-        listKey,
+      listKey2.value++
-        searchValue,
+      getAppResources()
-        currentPage,
+    })
-        resourceList,
+
-        resourceTotal,
+    // 分页
-        pageChange,
+    const onShowSizeChange = (current, pageSize) => {
-        listKey2,
+      currentPage.value = current
-        Cardsname,
+      currentPageSize.value = pageSize
-        getAppResources,
+      paramsGetResources.pageNum = current
-        chongzhi,
+      paramsGetResources.pageSize = pageSize
-        onSearch,
+      getAppResources()
-        currentPageSize,
+    }
-        pageSizeOptions,
+    watch(currentPageSize, () => {
-        current,
+      console.log('pageSize', currentPageSize.value)
-        loading,
+    })
-        titleName,
+
-        changeCards,
+    return {
-        number,
+      listKey,
-      }
+      searchValue,
-    },
+      currentPage,
-    components: {
+      resourceList,
-      HomeHeader,
+      resourceTotal,
-      HomeFooter,
+      pageChange,
-      searchResultList,
+      listKey2,
-    },
+      Cardsname,
-    beforeUnmount() {
+      getAppResources,
-      mybus.off('paramsGetResources')
+      chongzhi,
-      mybus.off('changeCondition')
+      onSearch,
-      mybus.off('refresh')
+      currentPageSize,
-      mybus.off('changePage')
+      pageSizeOptions,
-    },
+      current,
-  })
+      loading,
+      titleName,
+      changeCards,
+      number,
+    }
+  },
+  components: {
+    HomeHeader,
+    HomeFooter,
+    searchResultList,
+  },
+  beforeUnmount() {
+    mybus.off('paramsGetResources')
+    mybus.off('changeCondition')
+    mybus.off('refresh')
+    mybus.off('changePage')
+  },
+})
 </script>
 <style lang="less" scoped>
-  .resultListSearchInput-father {
+.resultListSearchInput-father {
-    background: #f3f5f9;
+  background: #f3f5f9;
-    padding: 0.2rem;
+  padding: 0.2rem;
 
-    // padding-left: 0.2rem;
+  // padding-left: 0.2rem;
-    // padding-top: 0.2rem;
+  // padding-top: 0.2rem;
-    .resultListSearchInput-son {
+  .resultListSearchInput-son {
-      background: #fff;
+    background: #fff;
-      padding: 0.2rem 0.2rem 0rem 0.3rem;
+    padding: 0.2rem 0.2rem 0rem 0.3rem;
 
-      .hengxian {
+    .hengxian {
-        width: 100%;
+      width: 100%;
-        height: 0.01rem;
+      height: 0.01rem;
-        background: rgba(150, 144, 144, 0.3);
+      background: rgba(150, 144, 144, 0.3);
-        margin-top: 0.2rem;
+      margin-top: 0.2rem;
-      }
     }
   }
+}
 
-  .resultListSearchInput {
+.resultListSearchInput {
-    margin-left: 0.1rem;
+  margin-left: 0.1rem;
 
-    :deep(.ant-input) {
+  :deep(.ant-input) {
-      width: 4rem;
+    width: 4rem;
-      height: 0.36rem;
+    height: 0.36rem;
-      background: #fff;
+    background: #fff;
-      border-radius: 0.04rem;
+    border-radius: 0.04rem;
-    }
-
-    :deep(.ant-input-search-button) {
-      width: 0.8rem;
-      height: 0.36rem;
-      background: #0087ff;
-      border-radius: 0.04rem !important;
-      font-size: 0.14rem;
-      font-weight: 400;
-      color: #fff;
-      line-height: 0.34rem;
-      margin-left: 0.1rem;
-    }
-
-    :deep(.ant-input-group-addon) {
-      left: 0 !important;
-    }
   }
 
-  .button-reset {
+  :deep(.ant-input-search-button) {
-    border: 0;
-    outline: none;
     width: 0.8rem;
     height: 0.36rem;
-    background: #e1edfa;
+    background: #0087ff;
-    border-radius: 0.04rem;
+    border-radius: 0.04rem !important;
     font-size: 0.14rem;
     font-weight: 400;
-    color: #0087ff;
+    color: #fff;
     line-height: 0.34rem;
-    margin-left: 2.5rem;
+    margin-left: 0.1rem;
-    cursor: pointer;
   }
 
-  .details-pageconetent {
+  :deep(.ant-input-group-addon) {
-    height: 100%;
+    left: 0 !important;
-    width: 100%;
+  }
-    display: flex;
+}
-    justify-content: center;
+
-    align-items: center;
+.button-reset {
-    margin-top: 0.67rem;
+  border: 0;
+  outline: none;
+  width: 0.8rem;
+  height: 0.36rem;
+  background: #e1edfa;
+  border-radius: 0.04rem;
+  font-size: 0.14rem;
+  font-weight: 400;
+  color: #0087ff;
+  line-height: 0.34rem;
+  margin-left: 2.5rem;
+  cursor: pointer;
+}
+
+.details-pageconetent {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 0.67rem;
+  position: relative;
+  background: rgba(245, 243, 243, 0.3);
+
+  .details-pageconetent-left {
+    max-height: 6.9rem;
+    position: absolute;
+    width: 2.5rem;
+    top: 0.17rem;
+    left: 2.5rem;
+    margin-right: 0.17rem;
+    overflow: auto;
+  }
+
+  .top {
+    min-height: 7.2rem;
     position: relative;
-    background: rgba(245, 243, 243, 0.3);
+    width: 11.5rem;
+    display: flex;
+    padding-top: 0.2rem;
+    flex-direction: column;
+    font-size: 0.16rem;
+    justify-content: left;
+    background: #f3f5f9;
 
-    .details-pageconetent-left {
+    .pagination {
-      max-height: 6.9rem;
-      position: absolute;
-      width: 2.5rem;
-      top: 0.17rem;
-      left: 2.5rem;
-      margin-right: 0.17rem;
-      overflow: auto;
-    }
-
-    .top {
-      min-height: 7.2rem;
-      position: relative;
-      width: 11.5rem;
-      display: flex;
-      padding-top: 0.2rem;
-      flex-direction: column;
-      font-size: 0.16rem;
-      justify-content: left;
       background: #f3f5f9;
+      padding-bottom: 0.6rem;
+    }
 
-      .pagination {
+    .top-title {
-        background: #f3f5f9;
+      padding: 0.2rem;
-        padding-bottom: 0.6rem;
+      display: flex;
+      font-size: 18px;
+
+      .tabAll {
+        font-size: 18px;
+        color: #000000;
+        margin-right: 35px;
+        cursor: pointer;
       }
 
-      .top-title {
+      .tabAll:nth-child(1) {
-        padding: 0.2rem;
+        margin-left: 20px;
-        display: flex;
+      }
-        font-size: 22px;
+
-        .tabAll {
+      .sel {
-          font-size: 22px;
+        font-weight: 600;
-          color: #000000;
+        color: #0087ff;
-          margin-right: 35px;
+        border-bottom: 0.02rem solid #0087ff;
-          cursor: pointer;
-        }
-        .tabAll:nth-child(1) {
-          margin-left: 20px;
-        }
-        .sel {
-          font-weight: 600;
-          color: #0087ff;
-          border-bottom: 0.02rem solid #0087ff;
-        }
       }
     }
   }
+}
 
-  :deep(.ant-card-grid) {
+:deep(.ant-card-grid) {
-    overflow: hidden;
+  overflow: hidden;
-    white-space: nowrap;
+  white-space: nowrap;
-    text-overflow: ellipsis;
+  text-overflow: ellipsis;
-    -webkit-line-clamp: 1;
+  -webkit-line-clamp: 1;
-    word-break: break-all;
+  word-break: break-all;
-  }
+}
 </style>

front/src/views/home/packagingDetails.vue

@@ -0,0 +1,153 @@
+<template>
+  <!-- 青岛 -->
+  <div class="details-pageconetent">
+    <home-header></home-header>
+    <div></div>
+    <home-footer></home-footer>
+  </div>
+
+</template>
+<script setup>
+import HomeFooter from '@/views/newHome/components/Footer'
+import mybus from '@/myplugins/mybus'
+import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
+
+import { getIntegrationServicesList } from '@/api/home.js'
+import { useRouter } from 'vue-router'
+import HomeHeader from '@/views/home/components/header'
+import searchResultList from '@/views/home/components/searchResultList.vue'
+import { message } from 'ant-design-vue'
+
+
+</script>
+<style lang="less" scoped>
+.resultListSearchInput-father {
+  background: #f3f5f9;
+  padding: 0.2rem;
+
+  // padding-left: 0.2rem;
+  // padding-top: 0.2rem;
+  .resultListSearchInput-son {
+    background: #fff;
+    padding: 0.2rem 0.2rem 0rem 0.3rem;
+
+    .hengxian {
+      width: 100%;
+      height: 0.01rem;
+      background: rgba(150, 144, 144, 0.3);
+      margin-top: 0.2rem;
+    }
+  }
+}
+
+.resultListSearchInput {
+  margin-left: 0.1rem;
+
+  :deep(.ant-input) {
+    width: 4rem;
+    height: 0.36rem;
+    background: #fff;
+    border-radius: 0.04rem;
+  }
+
+  :deep(.ant-input-search-button) {
+    width: 0.8rem;
+    height: 0.36rem;
+    background: #0087ff;
+    border-radius: 0.04rem !important;
+    font-size: 0.14rem;
+    font-weight: 400;
+    color: #fff;
+    line-height: 0.34rem;
+    margin-left: 0.1rem;
+  }
+
+  :deep(.ant-input-group-addon) {
+    left: 0 !important;
+  }
+}
+
+.button-reset {
+  border: 0;
+  outline: none;
+  width: 0.8rem;
+  height: 0.36rem;
+  background: #e1edfa;
+  border-radius: 0.04rem;
+  font-size: 0.14rem;
+  font-weight: 400;
+  color: #0087ff;
+  line-height: 0.34rem;
+  margin-left: 2.5rem;
+  cursor: pointer;
+}
+
+.details-pageconetent {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 0.67rem;
+  position: relative;
+  background: rgba(245, 243, 243, 0.3);
+
+  .details-pageconetent-left {
+    max-height: 6.9rem;
+    position: absolute;
+    width: 2.5rem;
+    top: 0.17rem;
+    left: 2.5rem;
+    margin-right: 0.17rem;
+    overflow: auto;
+  }
+
+  .top {
+    min-height: 7.2rem;
+    position: relative;
+    width: 11.5rem;
+    display: flex;
+    padding-top: 0.2rem;
+    flex-direction: column;
+    font-size: 0.16rem;
+    justify-content: left;
+    background: #f3f5f9;
+
+    .pagination {
+      background: #f3f5f9;
+      padding-bottom: 0.6rem;
+    }
+
+    .top-title {
+      padding: 0.2rem;
+      display: flex;
+      font-size: 18px;
+
+      .tabAll {
+        font-size: 18px;
+        color: #000000;
+        margin-right: 35px;
+        cursor: pointer;
+      }
+
+      .tabAll:nth-child(1) {
+        margin-left: 20px;
+      }
+
+      .sel {
+        font-weight: 600;
+        color: #0087ff;
+        border-bottom: 0.02rem solid #0087ff;
+      }
+    }
+  }
+}
+
+:deep(.ant-card-grid) {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 1;
+  word-break: break-all;
+}
+</style>