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,32 +1,20 @@
 <template>
   <div class="list-box">
-    <div
-      class="list-item"
-      v-for="(item, i) in newDataList"
-      :key="i"
-      @click.stop="showChildren(item)"
-    >
+    <div 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
-          :class="[
+        <div :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
-          :dataList="item.children"
-          @tree-click="handleTreeItem"
-          :clickData="newClickData"
-          :level="newLevel + 1"
-        ></abilityDocTree>
+        <abilityDocTree :dataList="item.children" @tree-click="handleTreeItem" :clickData="newClickData"
+          :level="newLevel + 1"></abilityDocTree>
       </div>
     </div>
   </div>

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

@@ -14,15 +14,10 @@
                             {{ item.name }}
                         </div>
                         <div class="name-box">
-              <div
-                class="item-v"
-                v-for="(v, j) in item.list"
-                :key="j"
-                :style="{
+                            <div 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
-          class="img-bg"
-          :class="item.className"
-          :style="{ 'background-image': `url(${item.bgImg || ''})` }"
-        ></div>
+                <div class="img-bg" :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
-        v-model:visible="visible"
-        @ok="handleOk"
-        class="shangjia-class"
-        @cancel="handlecancel"
-      >
+            <a-modal 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
-              v-for="item in abilityToType"
-              :key="item"
-              @click="abilityToTypeFunction(item)"
-              :class="
+                        <div v-for="item in abilityToType" :key="item" @click="abilityToTypeFunction(item)" :class="
                             abilityToTypeFunctionData == item ? 'ability-to-type-down' : ''
-              "
-            >
+                        ">
                             {{ item }}
                         </div>
                     </div>
                 </div>
-        <div
-          class="component-type"
-          v-if="abilityToTypeFunctionData == '组件服务'"
-        >
+                <div 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
-                @click="componentTypeValueFunction(item)"
-                v-for="item in componentType"
-                :key="item"
-                :value="item"
-              >
+                            <a-radio @click="componentTypeValueFunction(item)" v-for="item in componentType" :key="item"
+                                :value="item">
                                 {{ item }}
                             </a-radio>
                         </a-radio-group>
@@ -123,9 +93,7 @@
 import TheOverallProcess from './TheOverallProcess.vue'
 import { useRouter } from 'vue-router'
 import { message } from 'ant-design-vue'
-
 const router = useRouter()
-
 const seviceList = ref([
     {
         name: '组件服务',
@@ -151,7 +119,6 @@
     {
         name: '基础设施',
         img: require('@/assets/menu/service-infrastructure.png'),
-
         list: ['视频资源', '云资源', '感知资源'],
         imgBG: require('../../../assets/menu/imgBG.png'),
         width: '124px',
@@ -159,13 +126,11 @@
     {
         name: '数据资源',
         img: require('@/assets/menu/service-data.png'),
-
         list: ['政务信息资源'],
         imgBG: require('../../../assets/menu/imgBG-long.png'),
         width: '200px',
     },
 ])
-
 const imgList = ref([
     {
         name: '能力上架',
@@ -256,7 +221,6 @@
     componentTypeValue.value = ''
     console.log(e)
 }
-
 // 跳转
 const toWhere = (data) => {
     console.log(data, 'wwwwwww')
@@ -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;
@@ -454,23 +426,28 @@
         margin: 0 auto;
     }
 }
+
 .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;
         }
@@ -550,9 +527,11 @@
             margin: 0 0 20px;
             background-size: 100% 100%;
         }
+
         .item-v:nth-child(2n) {
             margin-left: 16px;
         }
+
         // .item-v:last-child {
         //   width: 200px;
         // }

front/src/views/instructionManual/index.vue

@@ -1,45 +1,30 @@
 <template>
   <home-header></home-header>
   <div class="menu-container">
-    <div class="menu-box">
     <div id="container" class="content-menu">
       <div class="left">
-          <div
-            class="first-title-text"
-            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 class="first-title-text doc" :style="{ color: '技术文档' === titleData.name ? '#0058e1' : '' }"
+          @click="changeName({ name: '技术文档' })">
+          技术文档
         </div>
-          <abilityDocTree
-            :dataList="treeArray"
-            @treeClick="treeClick"
-            :clickData="clickData"
-          ></abilityDocTree>
+        <abilityDocTree style="max-height:400px;overflow-y:auto" :dataList="treeArray" @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
-              name="iframeName"
-              width="1300"
-              height="100%"
-              id="iframeId"
-              :frameborder="0"
-              :src="doc_base_url + clickData.doc"
-            ></iframe>
+          <iframe name="iframeName" 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>
@@ -56,7 +41,7 @@
 
 const titleList = ref([
   {
-      name: '新手指引',
+    name: '使用手册',
     className: 'newGuide',
   },
   {
@@ -96,7 +81,7 @@
 
 const changeName = (item) => {
   titleData.value = item
-    if (item.name == '新手指引') {
+  if (item.name == '使用手册') {
     footShow.value = true
     clickData.value = {}
   }
@@ -156,7 +141,6 @@
 
 <style scoped lang="less">
 .menu-box {
-    // overflow: hidden;
   height: 100%;
 }
 
@@ -173,9 +157,15 @@
   }
 }
 
+.doc {
+  font-weight: bold;
+}
+
 .menu-container {
   width: 100%;
   padding-top: 0.74rem;
+  min-height: 1000px;
+  position: relative;
 }
 
 .content-menu {
@@ -184,35 +174,62 @@
   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 {
-    z-index: 10;
   width: 200px;
-    padding: 20px;
-    margin-right: 20px;
-    background: rgba(244, 245, 248, 1);
-    overflow-y: scroll;
+  padding-left: 10px;
+  padding-top: 10px;
+  background: #f4f5f8;
   position: absolute;
-    top: 200px;
-    left: 20px;
+  top: 300px;
+  left: 85px;
+  max-height: 400px;
+}
+
+.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%;
+  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;
@@ -227,6 +244,7 @@
   justify-content: center;
   align-items: center;
   padding: unset !important;
+
   p {
     color: #005be1;
     font-size: 20px;
@@ -239,6 +257,11 @@
   right: 0 !important;
 }
 
+.newGuide {
+  background: url('~@/assets/capabilityCloud/newGuide.png') no-repeat;
+  background-size: 100%;
+}
+
 .content {
   right: 16rem !important;
   left: 0 !important;
@@ -250,14 +273,10 @@
   margin-right: 8px;
 }
 
-  .doc {
-    background: url('~@/assets/capabilityCloud/doc.png') no-repeat;
-    background-size: 100%;
-  }
-
-  .newGuide {
-    background: url('~@/assets/capabilityCloud/newGuide.png') no-repeat;
-    background-size: 100%;
+.rela {
+  width: 100%;
+  height: 100%;
+  position: relative;
 }
 
 .new-menu-box {
@@ -266,10 +285,4 @@
   align-items: center;
   justify-content: center;
 }
-
-  .rela {
-    width: 100%;
-    height: 100%;
-    position: relative;
-  }
 </style>