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

front/src/views/instructionManual/components/abilityDocTree.vue

@@ -1,50 +1,38 @@
 <template>
   <div class="list-box">
-    <div
+    <div class="list-item" v-for="(item, i) in newDataList" :key="i" @click.stop="showChildren(item)">
-      class="list-item"
-      v-for="(item, i) in newDataList"
-      :key="i"
-      @click.stop="showChildren(item)"
-    >
       <a-tooltip placement="top" :title="item.title" arrow-point-at-center>
-        <div
+        <div :class="[
-          :class="[
           newClickData.title === item.title ? 'select' : '',
           level === 1 ? 'parent' : '',
           judgeLeaf(item) ? 'leaf' : '',
-          ]"
+        ]" class="list-text">
-          class="list-text"
-        >
           {{ item.title }}
           <DownOutlined v-show="!item.show && !judgeLeaf(item)" />
           <UpOutlined v-show="item.show && !judgeLeaf(item)" />
         </div>
       </a-tooltip>
       <div style="margin-left: 10px" v-if="!judgeLeaf(item) && item.show">
-        <abilityDocTree
+        <abilityDocTree :dataList="item.children" @tree-click="handleTreeItem" :clickData="newClickData"
-          :dataList="item.children"
+          :level="newLevel + 1"></abilityDocTree>
-          @tree-click="handleTreeItem"
-          :clickData="newClickData"
-          :level="newLevel + 1"
-        ></abilityDocTree>
       </div>
     </div>
   </div>
 </template>
 <script setup>
-  import {
+import {
   defineComponent,
   onMounted,
   ref,
   watch,
   defineProps,
   nextTick,
-  } from 'vue'
+} from 'vue'
-  import { getDevelopDocTree } from '@/api/home'
+import { getDevelopDocTree } from '@/api/home'
-  import { message } from 'ant-design-vue'
+import { message } from 'ant-design-vue'
-  import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
+import { UpOutlined, DownOutlined } from '@ant-design/icons-vue'
 
-  const props = defineProps({
+const props = defineProps({
   dataList: {
     type: Array,
     default: () => [],
@@ -59,25 +47,25 @@
       ''
     },
   },
-  })
+})
 
-  // 数组
+// 数组
-  const newDataList = ref(props.dataList)
+const newDataList = ref(props.dataList)
-  // 级别
+// 级别
-  const newLevel = ref(props.level)
+const newLevel = ref(props.level)
 
-  const newClickData = ref(props.clickData)
+const newClickData = ref(props.clickData)
 
-  // 判断是不是叶子节点
+// 判断是不是叶子节点
-  const judgeLeaf = (item) => {
+const judgeLeaf = (item) => {
   if (item.children && item.children.length > 0) {
     return false
   } else {
     return true
   }
-  }
+}
 
-  const showChildren = (item) => {
+const showChildren = (item) => {
   if (!(item.children && item.children.length > 0)) {
     if (newClickData.value.title !== '') {
       handleTreeItem(item)
@@ -88,33 +76,33 @@
   if (item.children && item.children.length > 0) {
     item.show = !item.show
   }
-  }
+}
 
-  watch(
+watch(
   () => props.dataList,
   (val) => {
     if (val) {
       newDataList.value = val
     }
   }
-  )
+)
 
-  watch(
+watch(
   () => props.clickData,
   (val) => {
     if (val) {
       newClickData.value = val
     }
   }
-  )
+)
 
-  const emit = defineEmits(['treeClick'])
+const emit = defineEmits(['treeClick'])
-  const handleTreeItem = (item) => {
+const handleTreeItem = (item) => {
   emit('tree-click', item)
-  }
+}
 </script>
 <style lang="less" scoped>
-  .list-text {
+.list-text {
   font-size: 16px;
   color: #333;
   padding: 10px 0;
@@ -131,9 +119,9 @@
     color: #0058e1;
     cursor: pointer;
   }
-  }
+}
 
-  .parent {
+.parent {
   margin-bottom: 10px;
   background: rgba(0, 135, 225, 0.1);
   color: #333;
@@ -143,17 +131,17 @@
     background: #0058e1;
     cursor: pointer;
   }
-  }
+}
 
-  .leaf {
+.leaf {
   font-size: 14px;
   color: #555;
   cursor: pointer;
-  }
+}
 
-  .select {
+.select {
   color: #0058e1;
   font-weight: 600;
   cursor: pointer;
-  }
+}
 </style>

front/src/views/instructionManual/components/menuBook.vue

@@ -14,15 +14,10 @@
                             {{ item.name }}
                         </div>
                         <div class="name-box">
-              <div
+                            <div class="item-v" v-for="(v, j) in item.list" :key="j" :style="{
-                class="item-v"
-                v-for="(v, j) in item.list"
-                :key="j"
-                :style="{
                                 'background-image': `url(${item.imgBG || ''})`,
                                 width: `${item.width || ''}`,
-                }"
+                            }">
-              >
                                 {{ v }}
                             </div>
                         </div>
@@ -37,11 +32,8 @@
                     <div class="text">{{ item.name }}</div>
                     <div class="line"></div>
                 </div>
-        <div
+                <div class="img-bg" :class="item.className" :style="{ 'background-image': `url(${item.bgImg || ''})` }">
-          class="img-bg"
+                </div>
-          :class="item.className"
-          :style="{ 'background-image': `url(${item.bgImg || ''})` }"
-        ></div>
                 <div v-if="item.btnText" class="btn" @click="toWhere(item.name)">
                     {{ item.btnText }} >>
                 </div>
@@ -64,12 +56,7 @@
         </div> -->
             </div>
             <!-- 能力上架弹窗 -->
-      <a-modal
+            <a-modal v-model:visible="visible" @ok="handleOk" class="shangjia-class" @cancel="handlecancel">
-        v-model:visible="visible"
-        @ok="handleOk"
-        class="shangjia-class"
-        @cancel="handlecancel"
-      >
                 <div class="ant-modal-title" id="vcDialogTitle1">
                     <div class="showBg"></div>
                     能力上架申请
@@ -77,36 +64,19 @@
                 <div class="ability-to-type">
                     <div class="title">能力类型选择</div>
                     <div class="ability-to-type-content">
-            <div
+                        <div v-for="item in abilityToType" :key="item" @click="abilityToTypeFunction(item)" :class="
-              v-for="item in abilityToType"
-              :key="item"
-              @click="abilityToTypeFunction(item)"
-              :class="
                             abilityToTypeFunctionData == item ? 'ability-to-type-down' : ''
-              "
+                        ">
-            >
                             {{ item }}
                         </div>
                     </div>
                 </div>
-        <div
+                <div class="component-type" v-if="abilityToTypeFunctionData == '组件服务'">
-          class="component-type"
-          v-if="abilityToTypeFunctionData == '组件服务'"
-        >
                     <div class="title">组件类型选择</div>
                     <div class="component-type-content">
-            <!-- <a-checkbox-group
-                v-model:value="value1"
-                name="checkboxgroup"
-                :options="componentType"
-              /> -->
                         <a-radio-group v-model:value="componentTypeValue">
-              <a-radio
+                            <a-radio @click="componentTypeValueFunction(item)" v-for="item in componentType" :key="item"
-                @click="componentTypeValueFunction(item)"
+                                :value="item">
-                v-for="item in componentType"
-                :key="item"
-                :value="item"
-              >
                                 {{ item }}
                             </a-radio>
                         </a-radio-group>
@@ -117,16 +87,14 @@
     </div>
 </template>
 <script setup>
-  import HomeHeader from '@/views/home/components/header'
+import HomeHeader from '@/views/home/components/header'
-  import HomeFooter from '@/views/newHome/components/Footer'
+import HomeFooter from '@/views/newHome/components/Footer'
-  import { ref, onMounted, watch } from 'vue'
+import { ref, onMounted, watch } from 'vue'
-  import TheOverallProcess from './TheOverallProcess.vue'
+import TheOverallProcess from './TheOverallProcess.vue'
-  import { useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
-  import { message } from 'ant-design-vue'
+import { message } from 'ant-design-vue'
-
+const router = useRouter()
-  const router = useRouter()
+const seviceList = ref([
-
-  const seviceList = ref([
     {
         name: '组件服务',
         img: require('@/assets/menu/service-component.png'),
@@ -151,7 +119,6 @@
     {
         name: '基础设施',
         img: require('@/assets/menu/service-infrastructure.png'),
-
         list: ['视频资源', '云资源', '感知资源'],
         imgBG: require('../../../assets/menu/imgBG.png'),
         width: '124px',
@@ -159,14 +126,12 @@
     {
         name: '数据资源',
         img: require('@/assets/menu/service-data.png'),
-
         list: ['政务信息资源'],
         imgBG: require('../../../assets/menu/imgBG-long.png'),
         width: '200px',
     },
-  ])
+])
-
+const imgList = ref([
-  const imgList = ref([
     {
         name: '能力上架',
         bgImg: require('../../../assets/menu/shelves.png'),
@@ -191,37 +156,37 @@
         btnText: '立即下架',
         className: 'down-img',
     },
-  ])
+])
-  // 能力上架弹窗
+// 能力上架弹窗
-  function handlecancel() {
+function handlecancel() {
     abilityToTypeFunctionData.value = '组件服务'
     componentTypeValue.value = ''
-  }
+}
-  let abilityToTypeFunctionData = ref('组件服务')
+let abilityToTypeFunctionData = ref('组件服务')
-  function abilityToTypeFunction(item) {
+function abilityToTypeFunction(item) {
     abilityToTypeFunctionData.value = item
-  }
+}
-  let abilityToType = ref(['组件服务', '应用资源'])
+let abilityToType = ref(['组件服务', '应用资源'])
-  let componentType = ref([
+let componentType = ref([
     '智能算法',
     '图层服务',
     '开发组件',
     // '办公组件',
     '业务组件',
     // '其他',
-  ])
+])
-  const visible = ref(false)
+const visible = ref(false)
-  let componentTypeValueOld = ref('')
+let componentTypeValueOld = ref('')
-  function componentTypeValueFunction(item) {
+function componentTypeValueFunction(item) {
     if (componentTypeValueOld.value != item) {
         componentTypeValue.value = item
         componentTypeValueOld.value = item
     } else {
         componentTypeValue.value = ''
     }
-  }
+}
-  let componentTypeValue = ref('')
+let componentTypeValue = ref('')
-  const handleOk = (e) => {
+const handleOk = (e) => {
     let snum = ref({})
     if (abilityToTypeFunctionData.value == '组件服务') {
         if (!componentTypeValue.value || componentTypeValue.value == '') {
@@ -255,10 +220,9 @@
     abilityToTypeFunctionData.value = '组件服务'
     componentTypeValue.value = ''
     console.log(e)
-  }
+}
-
+// 跳转
-  // 跳转
+const toWhere = (data) => {
-  const toWhere = (data) => {
     console.log(data, 'wwwwwww')
     if (data === '能力上架') {
         visible.value = true
@@ -282,13 +246,13 @@
         })
         window.location.href = newpage.href
     }
-  }
+}
-  watch(abilityToTypeFunctionData, () => {
+watch(abilityToTypeFunctionData, () => {
     componentTypeValue.value = ''
-  })
+})
 </script>
 <style lang="less">
-  .shangjia-class {
+.shangjia-class {
     position: fixed;
     left: 50%;
     top: 50%;
@@ -301,18 +265,22 @@
         height: 0.16rem;
         width: 0.16rem;
     }
+
     .ant-radio-inner::after {
         background-color: unset;
         background: url('~@/assets/personalCenter/xuanzhong.png') no-repeat;
         background-size: cover;
         background-position: center;
     }
+
     .ant-modal-content {
         border-radius: 0.1rem;
+
         .ability-to-type,
         .component-type {
             display: flex;
             margin-top: 0.2rem;
+
             .title {
                 white-space: nowrap;
                 margin-right: 0.2rem;
@@ -320,11 +288,13 @@
                 align-items: center;
                 height: 0.26rem;
             }
+
             .component-type-content {
                 width: 100%;
                 height: unset;
                 border: unset;
                 background: unset;
+
                 .ant-radio-group {
                     display: grid;
                     grid-template-columns: 1fr 1fr 1fr;
@@ -340,6 +310,7 @@
                 height: unset;
                 border: unset;
                 background: unset;
+
                 div {
                     margin-right: 0.15rem;
                     cursor: pointer;
@@ -373,6 +344,7 @@
         border: 0;
         text-align: center;
         padding-bottom: 0.2rem;
+
         button {
             margin-right: 0.2rem;
             border-radius: 0.08rem;
@@ -387,15 +359,15 @@
         background-position: center;
         margin-right: 0.1rem;
     }
-  }
+}
 </style>
 <style lang="less" scoped>
-  .menu-box {
+.menu-box {
     width: 1920px;
     // padding-bottom: 40px;
-  }
+}
 
-  .title {
+.title {
     margin-bottom: 20px;
 
     .text {
@@ -419,9 +391,9 @@
     .text-white {
         color: #fff;
     }
-  }
+}
 
-  .btn {
+.btn {
     width: 150px;
     height: 50px;
     line-height: 50px;
@@ -436,13 +408,13 @@
     &:hover {
         background: #e5eefc;
     }
-  }
+}
 
-  .img-box {
+.img-box {
     margin-bottom: 50px;
-  }
+}
 
-  .service-box {
+.service-box {
     width: 1920px;
     height: 613px;
     background-size: 100% 100%;
@@ -453,65 +425,70 @@
         height: 350px;
         margin: 0 auto;
     }
-  }
+}
-  .callus-box {
+
+.callus-box {
     width: 1920px;
     height: 214px;
     background-size: 100% 100%;
     background-image: url('../../../assets/menu/callus.png');
+
     .list-box {
         width: 1560px;
         // height: 350px;
         margin: 0 auto;
+
         p {
             font-size: 24px;
             color: #ffffff;
             font-weight: bold;
+
             span {
                 font-size: 30px;
             }
         }
+
         p:nth-child(1) {
             margin-right: 100px;
         }
     }
-  }
+}
 
-  .img-bg {
+.img-bg {
     width: 1920px;
     background-size: 100% 100%;
-  }
+}
 
-  .process-img {
+.process-img {
     height: 855px;
     background-image: url('../../../assets/menu/process.png');
-  }
+}
 
-  .shelves-img {
+.shelves-img {
     height: 497px;
     width: 1107px;
     margin: 0 auto;
     background-image: url('../../../assets/menu/shelves.png');
-  }
+}
 
-  .apply-img {
+.apply-img {
     height: 752px;
     background-image: url('../../../assets/menu/apply.png');
-  }
+}
 
-  .demand-img {
+.demand-img {
     height: 525px;
     width: 1300px;
     margin: 0 auto;
     background-image: url('../../../assets/menu/demand.png');
-  }
+}
 
-  .down-img {
+.down-img {
     height: 544px;
     background-image: url('../../../assets/menu/down.png');
-  }
+}
 
-  .list-box {
+.list-box {
     display: flex;
     align-items: center;
     justify-content: center;
@@ -550,12 +527,14 @@
             margin: 0 0 20px;
             background-size: 100% 100%;
         }
+
         .item-v:nth-child(2n) {
             margin-left: 16px;
         }
+
         // .item-v:last-child {
         //   width: 200px;
         // }
     }
-  }
+}
 </style>

front/src/views/instructionManual/index.vue

@@ -1,84 +1,69 @@
 <template>
   <home-header></home-header>
   <div class="menu-container">
-    <div class="menu-box">
     <div id="container" class="content-menu">
       <div class="left">
-          <div
+        <div class="first-title-text doc" :style="{ color: '技术文档' === titleData.name ? '#0058e1' : '' }"
-            class="first-title-text"
+          @click="changeName({ name: '技术文档' })">
-            v-for="(data, i) in titleList"
+          技术文档
-            :key="i"
-            @click="changeName(data)"
-            :style="{ color: data.name === titleData.name ? '#0058e1' : '' }"
-          >
-            <div class="img" :class="data.className"></div>
-            {{ data.name }}
         </div>
-          <abilityDocTree
+        <abilityDocTree style="max-height:400px;overflow-y:auto" :dataList="treeArray" @treeClick="treeClick"
-            :dataList="treeArray"
+          :clickData="clickData"></abilityDocTree>
-            @treeClick="treeClick"
-            :clickData="clickData"
-          ></abilityDocTree>
       </div>
+
+      <div class="first-title-text new-guide-box" :style="{ color: '使用手册' === titleData.name ? '#0058e1' : '' }"
+        @click="changeName({ name: '使用手册' })">
+        <div class="guide-text">使用手册</div>
+      </div>
+
       <!-- 技术文档 -->
-        <div class="right" v-if="titleData.name !== '新手指引'">
+      <div class="right" v-if="titleData.name !== '使用手册'">
         <div style="height: 100%">
-            <iframe
+          <iframe name="iframeName" width="1300" height="100%" id="iframeId" :frameborder="0"
-              name="iframeName"
+            :src="doc_base_url + clickData.doc"></iframe>
-              width="1300"
-              height="100%"
-              id="iframeId"
-              :frameborder="0"
-              :src="doc_base_url + clickData.doc"
-            ></iframe>
         </div>
       </div>
-        <!-- 使用手册 -->
-        <div class="manual" v-if="titleData.name === '新手指引'">
-          <p>使用手册</p>
-        </div>
-      </div>
-      <menuBook v-if="titleData.name === '新手指引'"></menuBook>
     </div>
+    <menuBook v-if="titleData.name === '使用手册'"></menuBook>
   </div>
 
   <home-footer v-if="footShow"></home-footer>
 </template>
 <script setup>
-  import HomeHeader from '@/views/home/components/header'
+import HomeHeader from '@/views/home/components/header'
-  import abilityDocTree from './components/abilityDocTree'
+import abilityDocTree from './components/abilityDocTree'
-  import menuBook from './components/menuBook'
+import menuBook from './components/menuBook'
-  import { ref, onMounted } from 'vue'
+import { ref, onMounted } from 'vue'
-  import { message } from 'ant-design-vue'
+import { message } from 'ant-design-vue'
-  import { getDevelopDocTree } from '@/api/home'
+import { getDevelopDocTree } from '@/api/home'
-  import HomeFooter from '@/views/newHome/components/Footer'
+import HomeFooter from '@/views/newHome/components/Footer'
-  // import flatten from '@turf/flatten'
+// import flatten from '@turf/flatten'
 
-  const titleList = ref([
+const titleList = ref([
   {
-      name: '新手指引',
+    name: '使用手册',
     className: 'newGuide',
   },
   {
     name: '技术文档',
     className: 'doc',
   },
-  ])
+])
-  const titleData = ref(titleList.value[0])
+const titleData = ref(titleList.value[0])
-  const clickData = ref({})
+const clickData = ref({})
-  const treeArray = ref([])
+const treeArray = ref([])
-  const treeArrayCopy = ref([])
+const treeArrayCopy = ref([])
-  let typeList = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
+let typeList = ['组件服务', '应用资源', '基础设施', '数据资源', '知识库']
-  let doc_base_url = ref(window.SITE_CONFIG['frontUrl'])
+let doc_base_url = ref(window.SITE_CONFIG['frontUrl'])
 
-  const treeClick = (item) => {
+const treeClick = (item) => {
   footShow.value = false
   clickData.value = item
   console.log('clickData------------>', item)
   titleData.value = titleList.value[1]
-  }
+}
 
-  const getTreeData = () => {
+const getTreeData = () => {
   getDevelopDocTree({})
     .then((res) => {
       console.log('res------文档树------>', res)
@@ -91,12 +76,12 @@
     .catch((err) => {
       message.error(err)
     })
-  }
+}
-  const footShow = ref(true)
+const footShow = ref(true)
 
-  const changeName = (item) => {
+const changeName = (item) => {
   titleData.value = item
-    if (item.name == '新手指引') {
+  if (item.name == '使用手册') {
     footShow.value = true
     clickData.value = {}
   }
@@ -121,9 +106,9 @@
       getFirstData(treeArrayCopy.value[0] || {})
     }
   }
-  }
+}
 
-  const formData = (children = [], dataItem) => {
+const formData = (children = [], dataItem) => {
   children.map((item, index) => {
     let _obj = Object.assign({}, item, {
       title: item.title,
@@ -139,28 +124,27 @@
     }
     dataItem.children.push(_obj)
   })
-  }
+}
 
-  const getFirstData = (firstObj = {}) => {
+const getFirstData = (firstObj = {}) => {
   if (firstObj && firstObj.children && firstObj.children.length > 0) {
     getFirstData(firstObj.children[0])
   } else {
     clickData.value = firstObj
   }
-  }
+}
 
-  onMounted(() => {
+onMounted(() => {
   getTreeData()
-  })
+})
 </script>
 
 <style scoped lang="less">
-  .menu-box {
+.menu-box {
-    // overflow: hidden;
   height: 100%;
-  }
+}
 
-  .first-title-text {
+.first-title-text {
   cursor: pointer;
   font-size: 18px;
   color: #333;
@@ -171,49 +155,82 @@
   &:hover {
     color: #0058e1;
   }
-  }
+}
 
-  .menu-container {
+.doc {
+  font-weight: bold;
+}
+
+.menu-container {
   width: 100%;
   padding-top: 0.74rem;
-  }
+  min-height: 1000px;
+  position: relative;
+}
 
-  .content-menu {
+.content-menu {
   width: 1800px;
   display: flex;
   justify-content: flex-start;
   margin: 0 auto;
   box-sizing: border-box;
-    position: relative;
+}
-    // position: fixed;
-    // left: 50%;
-    // bottom: 0;
-    // transform: translateX(-50%);
-    // top: 0.6rem;
-    // top: 0;
-  }
 
-  .left {
+.left {
-    z-index: 10;
   width: 200px;
-    padding: 20px;
+  padding-left: 10px;
-    margin-right: 20px;
+  padding-top: 10px;
-    background: rgba(244, 245, 248, 1);
+  background: #f4f5f8;
-    overflow-y: scroll;
   position: absolute;
-    top: 200px;
+  top: 300px;
-    left: 20px;
+  left: 85px;
-  }
+  max-height: 400px;
+}
 
-  .right {
+.new-guide-box {
+  position: absolute;
+  top: 300px;
+  right: 205px;
+  width: 74px;
+  height: 136px;
+  background: url('~@/assets/menu/new-bg.png') no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  padding-bottom: 0;
+}
+
+.guide-text {
+  width: 25px;
+  text-align: center;
+  word-wrap: break-word;
+  font-size: 20px;
+  color: #0058e1;
+}
+
+.right {
   width: 1300px;
   height: calc(100% - 20px);
   position: absolute;
-    top: 10px;
-    left: 300px;
   min-height: 600px;
-  }
+  left: 50%;
-  .manual {
+  transform: translateX(-50%);
+}
+
+.left {
+  width: 200px;
+  padding-left: 10px;
+  padding-top: 10px;
+  background: #f4f5f8;
+  position: absolute;
+  top: 300px;
+  left: 85px;
+  max-height: 400px;
+}
+
+.manual {
   cursor: pointer;
   z-index: 10;
   width: 74px;
@@ -227,49 +244,45 @@
   justify-content: center;
   align-items: center;
   padding: unset !important;
+
   p {
     color: #005be1;
     font-size: 20px;
     margin-bottom: 0;
     width: 20px;
   }
-  }
+}
 
-  .sidebar {
+.sidebar {
   right: 0 !important;
-  }
+}
 
-  .content {
+.newGuide {
+  background: url('~@/assets/capabilityCloud/newGuide.png') no-repeat;
+  background-size: 100%;
+}
+
+.content {
   right: 16rem !important;
   left: 0 !important;
-  }
+}
 
-  .img {
+.img {
   height: 20px;
   width: 20px;
   margin-right: 8px;
-  }
+}
 
-  .doc {
+.rela {
-    background: url('~@/assets/capabilityCloud/doc.png') no-repeat;
+  width: 100%;
-    background-size: 100%;
+  height: 100%;
-  }
+  position: relative;
+}
 
-  .newGuide {
+.new-menu-box {
-    background: url('~@/assets/capabilityCloud/newGuide.png') no-repeat;
-    background-size: 100%;
-  }
-
-  .new-menu-box {
   height: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
-  }
+}
-
-  .rela {
-    width: 100%;
-    height: 100%;
-    position: relative;
-  }
 </style>