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

back/src/views/modules/ability/bsabilityai.vue

@@ -154,7 +154,7 @@
               >详情</el-button
             >
             <el-button type="text" size="small" @click="showDocument(scope.row)"
-              >开发文档</el-button
+              >技术文档</el-button
             >
             <el-button
               type="text"

back/src/views/modules/ability/bsabilityservice.vue

@@ -149,7 +149,7 @@
               >详情</el-button
             >
             <el-button type="text" size="small" @click="showDocument(scope.row)"
-              >开发文档</el-button
+              >技术文档</el-button
             >
             <el-button
               type="text"

back/src/views/modules/activiti/demo/abilitydemandapply.vue

@@ -64,25 +64,55 @@
       </el-form-item>
     </el-form>
     <!--  流程综合组件   -->
-    <ren-process-multiple
+    <!-- <ren-process-multiple
       v-if="processVisible"
       updateInstanceIdUrl="/processForm/tabilityapplication/updateInstanceId"
       saveFormUrl="/processForm/tabilityapplication"
       dataFormName="dataForm"
       ref="renProcessMultiple"
-    ></ren-process-multiple>
+    ></ren-process-multiple> -->
+     <!-- 审批 -->
+    <div class="agreeOr" v-if="taskId">
+      <div>
+        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+        <el-button type="danger" plain @click="showDialog('拒绝')"
+          >驳回</el-button
+        >
+      </div>
+    </div>
+    <!-- 审批弹窗 -->
+     <el-dialog
+      title="审批意见"
+      :close-on-click-modal="false"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose"
+    >
+      <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose2">取 消</el-button>
+        <el-button
+          type="primary"
+          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
   </el-card>
 </template>
 
 <script>
 // 引入工作流公共方法
 import processModule from '@/mixins/process-module'
+import qs from 'qs'
+import debounce from 'lodash/debounce'
+import bus from '@/views/bus.js'
 export default {
   // 注入公共方法
   mixins: [processModule],
   data () {
     return {
-      visible: false,
+      // visible: false,
       // 表单属性是否可编辑
       fieldDisabled: false,
       dataForm: {
@@ -94,7 +124,13 @@ export default {
         system: '',
         scene: '',
         basis: ''
-      }
+      },
+      // 审批
+      dialogVisible: false,
+      dialogType: '',
+      input: '',
+      visible: true,
+      taskId: ''
     }
   },
   created () {
@@ -113,6 +149,8 @@ export default {
     }
     // 初始化综合组件
     this.initProcessMultiple(callbacks)
+    this.taskId = this.$route.params.taskId
+    this.dataForm.taskId = this.$route.params.taskId
   },
   computed: {
     dataRule () {
@@ -164,6 +202,128 @@ export default {
         })
         .catch(() => {})
     },
+    // 审批
+    showDialog (title) {
+      this.dialogVisible = true
+      this.dialogType = title
+    },
+    handleClose (done) {
+      this.$confirm('确认关闭？')
+        .then((_) => {
+          this.input = ''
+          done()
+        })
+        .catch((_) => {})
+    },
+    handleClose2 () {
+      this.dialogVisible = false
+      this.input = ''
+    },
+    // 同意与退回
+    agreeOrNot: debounce(
+      function (data) {
+        this.dataForm.taskId = this.$route.params.taskId
+        if (this.dialogType === '同意') {
+          if (this.input !== '') {
+            console.log('this.dataForm', this.dataForm)
+            const params = qs.stringify({
+              taskId: this.dataForm.taskId,
+              comment: this.input
+            })
+            console.log(params)
+            this.$http
+              .post('/act/task/complete?' + params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  this.$message.error(res.msg)
+                  if (this.callbacks.taskHandleErrorCallback) {
+                    this.callbacks.taskHandleErrorCallback(res)
+                  }
+                  return
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                this.$message({
+                  message: this.$t('prompt.success'),
+                  type: 'success',
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false
+                    this.dialogVisible = false
+                    if (this.callbacks.taskHandleSuccessCallback) {
+                      this.callbacks.taskHandleSuccessCallback(res)
+                    }
+                  }
+                })
+              })
+              .catch(() => {})
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
+        } else if (this.dialogType === '拒绝') {
+          if (this.input !== '') {
+            const params = qs.stringify({
+              taskId: this.dataForm.taskId,
+              comment: this.input
+            })
+            this.$http
+              .post('/act/task/backToFirst?', params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  this.$message.error(res.msg)
+                  if (this.callbacks.taskHandleErrorCallback) {
+                    this.callbacks.taskHandleErrorCallback(res)
+                  }
+                  return
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                this.$message({
+                  message: this.$t('prompt.success'),
+                  type: 'success',
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false
+                    if (this.callbacks.taskHandleSuccessCallback) {
+                      this.callbacks.taskHandleSuccessCallback(res)
+                    }
+                  }
+                })
+              })
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
+        }
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+    tabRemoveHandle (tabName) {
+      console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+      if (tabName === 'home') {
+        return false
+      }
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name !== tabName
+      )
+      if (this.$store.state.contentTabs.length <= 0) {
+        this.$store.state.sidebarMenuActiveName =
+          this.$store.state.contentTabsActiveName = 'home'
+        return false
+      }
+      // 当前选中tab被删除
+      if (tabName === this.$store.state.contentTabsActiveName) {
+        const tab =
+          this.$store.state.contentTabs[
+            this.$store.state.contentTabs.length - 1
+          ]
+        this.$router.push({
+          name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
+          params: { ...tab.params },
+          query: { ...tab.query }
+        })
+      }
+    },
     // 启动流程出错回调
     startProcessErrorCallback (data) {
       console.log(data)
@@ -173,3 +333,12 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+.agreeOr {
+  & > div {
+    // text-align: right;
+    padding-right: 40px;
+    margin: 20px 0;
+  }
+}
+</style>

back/src/views/modules/activiti/demo/comments.vue

@@ -23,18 +23,49 @@
       </el-form>
     </div>
     <!--  流程综合组件   -->
-    <ren-process-multiple
+    <!-- <ren-process-multiple
       v-if="processVisible"
       updateInstanceIdUrl="/processForm/tabilityapplication/updateInstanceId"
       saveFormUrl="/processForm/tabilityapplication"
       dataFormName="dataForm"
       ref="renProcessMultiple"
-    ></ren-process-multiple>
+    ></ren-process-multiple> -->
+    <!-- 审批 -->
+    <div class="agreeOr" v-if="taskId">
+      <div>
+        <el-button type="primary" @click="showDialog('同意')">同意</el-button>
+        <el-button type="danger" plain @click="showDialog('拒绝')"
+          >驳回</el-button
+        >
+      </div>
+    </div>
+    <!-- 审批弹窗 -->
+     <el-dialog
+      title="审批意见"
+      :close-on-click-modal="false"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose"
+    >
+      <el-input v-model="input" placeholder="请输入审批意见"></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose2">取 消</el-button>
+        <el-button
+          type="primary"
+          @click.native="agreeOrNot($store.state.contentTabsActiveName)"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import processModule from '@/mixins/process-module'
+import qs from 'qs'
+import debounce from 'lodash/debounce'
+import bus from '@/views/bus.js'
+
 export default {
   // 注入公共方法
   mixins: [processModule],
@@ -50,12 +81,19 @@ export default {
   data () {
     return {
       // processVisible: true,
-      visible: false,
+      // visible: false,
       // 表单属性是否可编辑
       fieldDisabled: false,
       dataForm: [],
       id: '',
-      shifoushizujian: true
+      shifoushizujian: true,
+      // 审批
+      dialogVisible: false,
+      dialogType: '',
+      input: '',
+      visible: true,
+      taskId: ''
+
     }
   },
   watch: {},
@@ -91,6 +129,128 @@ export default {
         // }
         console.log('this.dataForm', this.dataForm)
       })
+    },
+    // 审批
+    showDialog (title) {
+      this.dialogVisible = true
+      this.dialogType = title
+    },
+    handleClose (done) {
+      this.$confirm('确认关闭？')
+        .then((_) => {
+          this.input = ''
+          done()
+        })
+        .catch((_) => {})
+    },
+    handleClose2 () {
+      this.dialogVisible = false
+      this.input = ''
+    },
+    // 同意与退回
+    agreeOrNot: debounce(
+      function (data) {
+        this.dataForm.taskId = this.$route.params.taskId
+        if (this.dialogType === '同意') {
+          if (this.input !== '') {
+            console.log('this.dataForm', this.dataForm)
+            const params = qs.stringify({
+              taskId: this.dataForm.taskId,
+              comment: this.input
+            })
+            console.log(params)
+            this.$http
+              .post('/act/task/complete?' + params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  this.$message.error(res.msg)
+                  if (this.callbacks.taskHandleErrorCallback) {
+                    this.callbacks.taskHandleErrorCallback(res)
+                  }
+                  return
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                this.$message({
+                  message: this.$t('prompt.success'),
+                  type: 'success',
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false
+                    this.dialogVisible = false
+                    if (this.callbacks.taskHandleSuccessCallback) {
+                      this.callbacks.taskHandleSuccessCallback(res)
+                    }
+                  }
+                })
+              })
+              .catch(() => {})
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
+        } else if (this.dialogType === '拒绝') {
+          if (this.input !== '') {
+            const params = qs.stringify({
+              taskId: this.dataForm.taskId,
+              comment: this.input
+            })
+            this.$http
+              .post('/act/task/backToFirst?', params)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  this.$message.error(res.msg)
+                  if (this.callbacks.taskHandleErrorCallback) {
+                    this.callbacks.taskHandleErrorCallback(res)
+                  }
+                  return
+                }
+                bus.$emit('AbilityResourcesRemovedInit')
+                this.$message({
+                  message: this.$t('prompt.success'),
+                  type: 'success',
+                  duration: 500,
+                  onClose: () => {
+                    this.visible = false
+                    if (this.callbacks.taskHandleSuccessCallback) {
+                      this.callbacks.taskHandleSuccessCallback(res)
+                    }
+                  }
+                })
+              })
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
+        }
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+    tabRemoveHandle (tabName) {
+      console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+      if (tabName === 'home') {
+        return false
+      }
+      this.$store.state.contentTabs = this.$store.state.contentTabs.filter(
+        (item) => item.name !== tabName
+      )
+      if (this.$store.state.contentTabs.length <= 0) {
+        this.$store.state.sidebarMenuActiveName =
+          this.$store.state.contentTabsActiveName = 'home'
+        return false
+      }
+      // 当前选中tab被删除
+      if (tabName === this.$store.state.contentTabsActiveName) {
+        const tab =
+          this.$store.state.contentTabs[
+            this.$store.state.contentTabs.length - 1
+          ]
+        this.$router.push({
+          name: /^iframe_.+/.test(tab.name) ? 'iframe' : tab.name,
+          params: { ...tab.params },
+          query: { ...tab.query }
+        })
+      }
     }
   },
   created () {
@@ -108,10 +268,24 @@ export default {
     }
     // 初始化综合组件
     this.initProcessMultiple(callbacks)
+    this.taskId = this.$route.params.taskId
+    this.dataForm.taskId = this.$route.params.taskId
   },
   mounted () {}
 }
 </script>
+<style lang="scss" >
+.kuandukuandukuandu {
+  max-width: 1500px;
+}
+.agreeOr {
+  & > div {
+    // text-align: right;
+    padding-right: 40px;
+    margin: 20px 0;
+  }
+}
+</style>
 <style lang="scss" scoped>
 ::v-deep .el-textarea__inner {
   height: 100px;

back/src/views/modules/activiti/demo/putaway-process3.vue

@@ -106,7 +106,7 @@
         </el-radio-group> -->
         <el-button type="primary" @click="showDialog('同意')">同意</el-button>
         <el-button type="danger" plain @click="showDialog('拒绝')"
-          >拒绝</el-button
+          >驳回</el-button
         >
         <!-- <el-input v-if="agreeOrList ==='同意' " v-model="inputAgree" placeholder="请输入同意意见"></el-input>
         <el-input v-if="agreeOrList ==='退回'" v-model="inputNo" placeholder="请输入退回意见"></el-input>
@@ -229,6 +229,7 @@ export default {
       function (data) {
         this.dataForm.taskId = this.$route.params.taskId
         if (this.dialogType === '同意') {
+          if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
             const params = qs.stringify({
               taskId: this.dataForm.taskId,
@@ -260,7 +261,12 @@ export default {
                 })
               })
               .catch(() => {})
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
         } else if (this.dialogType === '拒绝') {
+          if (this.input !== '') {
             const params = qs.stringify({
               taskId: this.dataForm.taskId,
               comment: this.input
@@ -288,9 +294,11 @@ export default {
                   }
                 })
               })
-        }
             this.tabRemoveHandle(data)
-        // this.getDataList(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
+        }
       },
       1000,
       { leading: true, trailing: false }

back/src/views/modules/myAgent/demo/ability-resource-shelf.vue

@@ -200,6 +200,7 @@ export default {
     agreeOrNot: debounce(
       function (data) {
         if (this.dialogType === '同意') {
+          if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
             const params = qs.stringify({
               taskId: this.taskId,
@@ -232,7 +233,12 @@ export default {
                 })
               })
               .catch(() => {})
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
         } else if (this.dialogType === '驳回') {
+          if (this.input !== '') {
             const params = qs.stringify({
               taskId: this.taskId,
               comment: this.input
@@ -261,8 +267,11 @@ export default {
                   }
                 })
               })
-        }
             this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
+        }
       },
       1000,
       { leading: true, trailing: false }

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -380,6 +380,7 @@ export default {
     agreeOrNot: debounce(
       function (data) {
         if (this.dialogType === '同意') {
+          if (this.input !== '') {
             console.log('this.dataForm', this.dataForm)
             const params = qs.stringify({
               taskId: this.dataForm.taskId,
@@ -411,7 +412,12 @@ export default {
                 })
               })
               .catch(() => {})
+            this.tabRemoveHandle(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
         } else if (this.dialogType === '驳回') {
+          if (this.input !== '') {
             const params = qs.stringify({
               taskId: this.dataForm.taskId,
               comment: this.input
@@ -439,9 +445,11 @@ export default {
                   }
                 })
               })
-        }
             this.tabRemoveHandle(data)
-        // this.getDataList(data)
+          } else {
+            this.$message.error('请输入审批意见！')
+          }
+        }
       },
       1000,
       { leading: true, trailing: false }

front/src/views/demandCenter/demandDetails.vue

@@ -299,7 +299,7 @@
       if (res.data.code == '0') {
         demandCommentApply({ id: res.data.data.id }).then((res1) => {
           if (res1.data.code == '0') {
-            message.success('提交评价成功，请注意查看消息通知！')
+            message.success('提交评论成功，请注意查看消息通知！')
             myComment.value = ''
             evaluateList()
           }

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

@@ -10,43 +10,89 @@
         }}
       </div>
       <div class="condition" :key="showKey">
-        <ul v-if="selectCardsname === '融合服务' || selectCardsname === '赋能场景'">
+        <ul
-          <li v-for="(item, i) in orderList" :key="item.value" @click="changeOrder(i, item.value, item.orderType)">
+          v-if="
+            selectCardsname === '融合服务' || selectCardsname === '赋能场景'
+          "
+        >
+          <li
+            v-for="(item, i) in orderList"
+            :key="item.value"
+            @click="changeOrder(i, item.value, item.orderType)"
+          >
             {{ item.name }}
-            <span class="arrow" :class="item.orderType == 'ASC' ? 'down' : ''"></span>
+            <span
+              class="arrow"
+              :class="item.orderType == 'ASC' ? 'down' : ''"
+            ></span>
           </li>
         </ul>
         <ul v-else>
-          <li v-for="item in selList" :key="item.value" @click="changeCondition(item.value)" v-show="
+          <li
+            v-for="item in selList"
+            :key="item.value"
+            @click="changeCondition(item.value)"
+            v-show="
               item.show &&
               item.name !== '评分' &&
               selectCardsname !== '数据资源'
-          ">
+            "
+          >
             {{ item.name }}
-            <span class="arrow" :class="item.value == selData ? 'down' : ''"></span>
+            <span
+              class="arrow"
+              :class="item.value == selData ? 'down' : ''"
+            ></span>
           </li>
         </ul>
       </div>
     </div>
-    <div class="result-list" v-for="(item, index) in resourceList.data" :key="item.index">
+    <div
+      class="result-list"
+      v-for="(item, index) in resourceList.data"
+      :key="item.index"
+    >
       <div class="item" :key="showKey">
-        <div class="left" style="display: flex; align-items: center" v-if="
+        <div
+          class="left"
+          style="display: flex; align-items: center"
+          v-if="
             item.type === '应用资源' &&
             item.infoList &&
             item.infoList.filter((val) => val.attrType == '应用图片')[0]
-        ">
+          "
-          <a-image :width="106" :preview="false" :src="
+        >
+          <a-image
+            :width="106"
+            :preview="false"
+            :src="
               item.infoList.filter((val) => val.attrType == '应用图片')[0]
                 .attrValue
-          " />
+            "
+          />
         </div>
-        <div class="left" style="display: flex;
+        <div
-          align-items: center"
+          class="left"
-          v-else-if="(selectCardsname === '融合服务' || selectCardsname === '赋能场景') && item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]">
+          style="display: flex; align-items: center"
-          <a-image :width="106" :preview="false"
+          v-else-if="
-            :src="item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0].attrValue" />
+            (selectCardsname === '融合服务' ||
+              selectCardsname === '赋能场景') &&
+            item.fuseAttrList &&
+            item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
+          "
+        >
+          <a-image
+            :width="106"
+            :preview="false"
+            :src="
+              item.fuseAttrList.filter((val) => val.attrType == '服务图片')[0]
+                .attrValue
+            "
+          />
         </div>
-        <div class="left" :class="
+        <div
+          class="left"
+          :class="
             item.type == '应用资源'
               ? 'yyzy'
               : !item.type
@@ -71,35 +117,76 @@
                   .attrValue == '业务组件'
               ? 'ywzj'
               : ''
-        " v-else-if="
+          "
-  selectCardsname !== '基础设施' && selectCardsname !== '融合服务' && selectCardsname !== '赋能场景'
+          v-else-if="
-"></div>
+            selectCardsname !== '基础设施' &&
+            selectCardsname !== '融合服务' &&
+            selectCardsname !== '赋能场景'
+          "
+        ></div>
         <div class="left jcss" v-else-if="selectCardsname === '基础设施'"></div>
-        <div class="left rhfw" v-else-if="selectCardsname === '融合服务' || selectCardsname === '赋能场景'"></div>
+        <div
+          class="left rhfw"
+          v-else-if="
+            selectCardsname === '融合服务' || selectCardsname === '赋能场景'
+          "
+        ></div>
         <div class="right">
           <div class="header">
             <span style="display: flex; align-items: center; width: 680px">
               {{ item.name }}
-              <svg t="1652322568870" class="icon" viewBox="0 0 3072 1024" version="1.1"
+              <svg
-                xmlns="http://www.w3.org/2000/svg" p-id="3062" width="40" height="40" v-if="item.applyState == '通过'"
+                t="1652322568870"
-                style="margin-left: 10px">
+                class="icon"
+                viewBox="0 0 3072 1024"
+                version="1.1"
+                xmlns="http://www.w3.org/2000/svg"
+                p-id="3062"
+                width="40"
+                height="40"
+                v-if="item.applyState == '通过'"
+                style="margin-left: 10px; min-width: 40px"
+              >
                 <path
                   d="M2958.222222 0a113.777778 113.777778 0 0 1 113.777778 113.777778v796.444444a113.777778 113.777778 0 0 1-113.777778 113.777778H500.053333a113.777778 113.777778 0 0 1-85.617777-38.798222L32.824889 549.432889a56.888889 56.888889 0 0 1 0-74.922667L414.435556 38.798222A113.777778 113.777778 0 0 1 499.996444 0H2958.222222z m0 56.888889H500.053333a56.888889 56.888889 0 0 0-42.837333 19.399111L75.605333 512l381.610667 435.712a56.888889 56.888889 0 0 0 42.780444 19.399111H2958.222222a56.888889 56.888889 0 0 0 56.888889-56.888889V113.777778a56.888889 56.888889 0 0 0-56.888889-56.888889z"
-                  fill="#d81e06" p-id="3063"></path>
+                  fill="#d81e06"
+                  p-id="3063"
+                ></path>
                 <path
                   d="M398.222222 398.222222a113.777778 113.777778 0 1 1 0 227.555556 113.777778 113.777778 0 0 1 0-227.555556z m0 56.888889a56.888889 56.888889 0 1 0 0 113.777778 56.888889 56.888889 0 0 0 0-113.777778z"
-                  fill="#d81e06" p-id="3064"></path>
+                  fill="#d81e06"
+                  p-id="3064"
+                ></path>
                 <path
                   d="M1309.582222 491.064889v-273.066667h-505.173333v47.786667h455.338667v178.176h-378.88V342.926222h-49.152v358.4c0 55.978667 27.306667 84.650667 82.602666 84.650667h370.005334c28.672-1.365333 51.2-8.874667 66.218666-23.210667 16.384-17.749333 27.989333-68.266667 34.816-152.917333l-47.786666-15.018667-1.706667 26.737778c-4.664889 58.766222-12.970667 93.582222-24.917333 104.334222-10.24 8.192-23.893333 12.288-40.277334 12.288h-342.698666c-31.402667 0-47.104-15.701333-47.104-45.738666v-201.386667h428.714666z m430.08-307.2v102.4h-219.136v386.389333h48.469334v-46.421333h170.666666v178.858667h50.517334v-178.858667h167.936v41.642667h48.469333V286.264889h-216.405333v-102.4h-50.517334z m-170.666666 395.946667v-102.4h170.666666v102.4h-170.666666z m221.184 0v-102.4h167.936v102.4h-167.936z m-221.184-146.773334V332.003556h170.666666v101.034666h-170.666666z m221.184 0V332.003556h167.936v101.034666h-167.936z m733.866666-251.221333v44.373333h-165.205333v40.277334h165.205333v45.738666h-137.898666v39.594667h137.898666V398.222222h-184.32v40.96h417.792V398.222222h-186.368v-46.421333h144.725334v-39.594667h-144.725334v-45.738666h169.301334v-40.277334h-169.301334v-44.373333h-47.104z m-85.333333 429.397333h220.501333v49.834667h-220.501333v-49.834667z m220.501333-38.229333h-220.501333v-50.517333h220.501333v50.517333z m-220.501333 126.293333h220.501333v38.912c0 15.701333-8.874667 23.893333-25.258666 23.893334l-54.613334-2.048 11.605334 43.690666h57.344c38.229333 0 58.026667-18.432 58.026666-55.296v-266.24H2391.608889V807.822222h47.104v-108.544z m-222.549333-509.952l-34.816 33.450667c49.152 36.864 88.064 71.68 116.736 104.448l33.450666-34.133333a795.079111 795.079111 0 0 0-115.370666-103.765334z m-82.602667 201.386667h144.725333v299.690667c20.48-19.114667 41.642667-40.277333 64.853334-64.170667l12.970666 51.882667a923.932444 923.932444 0 0 1-121.514666 105.813333l-19.114667-43.690667c10.24-9.557333 15.701333-19.797333 15.701333-31.402666V437.816889h-97.621333v-47.104z"
-                  fill="#d81e06" p-id="3065"></path>
+                  fill="#d81e06"
+                  p-id="3065"
+                ></path>
               </svg>
             </span>
             <div class="header-right">
-              <div v-if="selectCardsname === '融合服务' || selectCardsname === '赋能场景'" class="label-content">
+              <div
-                <template v-if="item.fuseAttrList && item.fuseAttrList.filter((val) => val.attrType == '应用领域')[0]">
+                v-if="
-                  <span class="label"
+                  selectCardsname === '融合服务' ||
-                    v-for="(data, index) in item.fuseAttrList.filter((val) => val.attrType == '应用领域')[0].attrValue.split(';')"
+                  selectCardsname === '赋能场景'
-                    :key="index">
+                "
+                class="label-content"
+              >
+                <template
+                  v-if="
+                    item.fuseAttrList &&
+                    item.fuseAttrList.filter(
+                      (val) => val.attrType == '应用领域'
+                    )[0]
+                  "
+                >
+                  <span
+                    class="label"
+                    v-for="(data, index) in item.fuseAttrList
+                      .filter((val) => val.attrType == '应用领域')[0]
+                      .attrValue.split(';')"
+                    :key="index"
+                  >
                     {{ data }}
                   </span>
                 </template>
@@ -131,13 +218,21 @@
             >
               <span>{{ item.shareType || '--' }}</span>
             </div> -->
-            <div v-if="
+            <div
-              selectCardsname !== '融合服务' && selectCardsname !== '赋能场景' && selectCardsname !== '基础设施'
+              v-if="
-            ">
+                selectCardsname !== '融合服务' &&
+                selectCardsname !== '赋能场景' &&
+                selectCardsname !== '基础设施'
+              "
+            >
               <span>{{ item.deptName || '--' }}</span>
             </div>
           </div>
-          <div v-if="selectCardsname !== '基础设施'" style="margin-top: 0.1rem" class="description">
+          <div
+            v-if="selectCardsname !== '基础设施'"
+            style="margin-top: 0.1rem"
+            class="description"
+          >
             <a-tooltip>
               <template #title>{{ item.description }}</template>
               {{ item.description || '--' }}
@@ -146,26 +241,32 @@
           <div class="btn">
             <div class="bottom" v-if="selectCardsname !== '基础设施'">
               <div>
-                <div v-if="
+                <div
+                  v-if="
                     selectCardsname !== '数据资源' &&
                     selectCardsname !== '融合服务' &&
                     selectCardsname !== '赋能场景'
-                ">
+                  "
+                >
                   浏览量：{{ item.visits || 0 }}次
                 </div>
-                <div v-if="
+                <div
+                  v-if="
                     selectCardsname !== '数据资源' &&
                     selectCardsname !== '融合服务' &&
                     selectCardsname !== '赋能场景' &&
                     (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
-                ">
+                  "
+                >
                   申请量：{{ item.applyCount || 0 }}次
                 </div>
-                <div v-if="
+                <div
+                  v-if="
                     selectCardsname === '数据资源' &&
                     selectCardsname !== '融合服务' &&
                     selectCardsname !== '赋能场景'
-                ">
+                  "
+                >
                   数据量：{{ item.sjlCount || 0 }}
                 </div>
                 <div v-if="selectCardsname !== '数据资源'">
@@ -184,28 +285,59 @@
             </div>
             <div class="right" v-if="selectCardsname !== '基础设施'">
               <div class="shopping" :key="shoppingKey">
-                <template v-if="
+                <template
+                  v-if="
                     selectCardsname == '组件服务' ||
                     (selectCardsname == '应用资源' && whoShow1.itShowQingDao)
-                ">
+                  "
-                  <span class="shopping-down" v-if="item.isInShoppingCart"></span>
+                >
-                  <span class="shopping-on" v-else @click="addShoppingCart(item, index)"></span>
+                  <span
+                    class="shopping-down"
+                    v-if="item.isInShoppingCart"
+                  ></span>
+                  <span
+                    class="shopping-on"
+                    v-else
+                    @click="addShoppingCart(item, index)"
+                  ></span>
                 </template>
               </div>
               <div class="sc">
-                <span class="sc-down" v-if="item.isCollect == 'false'" @click="addCollect(item)"></span>
+                <span
-                <span class="sc-on" v-if="item.isCollect == 'true'" @click="addCollect(item)"></span>
+                  class="sc-down"
+                  v-if="item.isCollect == 'false'"
+                  @click="addCollect(item)"
+                ></span>
+                <span
+                  class="sc-on"
+                  v-if="item.isCollect == 'true'"
+                  @click="addCollect(item)"
+                ></span>
               </div>
-              <div class="shopping pk" :key="pk" v-show="
+              <div
+                class="shopping pk"
+                :key="pk"
+                v-show="
                   cardType == '组件服务' && findComponentName(item, '智能算法')
-              ">
+                "
+              >
                 <span class="pk-on" @click="goComparePk(item, index)"></span>
               </div>
-              <a-button type="primary" @click="toView('details', item)" v-if="!whoShow1.itShowBaoTou">
+              <a-button
+                type="primary"
+                @click="toView('details', item)"
+                v-if="!whoShow1.itShowBaoTou"
+              >
                 查看详情
               </a-button>
-              <a-button style="margin-left: 10px" v-show="selectCardsname === '融合服务' || selectCardsname === '赋能场景'"
+              <a-button
-                @click="handleAKeyApplication(item)">
+                style="margin-left: 10px"
+                v-show="
+                  selectCardsname === '融合服务' ||
+                  selectCardsname === '赋能场景'
+                "
+                @click="handleAKeyApplication(item)"
+              >
                 一键申请
               </a-button>
               <!-- <a-button
@@ -216,10 +348,14 @@
               >
                 免费试用
               </a-button> -->
-              <a-button type="primary" @click="toView('apply', item)" v-show="
+              <a-button
+                type="primary"
+                @click="toView('apply', item)"
+                v-show="
                   cardType == '组件服务' ||
                   (cardType == '应用资源' && whoShow1.itShowQingDao)
-              ">
+                "
+              >
                 {{
                   item.shareCondition == '免批申请' ? '免批申请' : '立即申请'
                 }}
@@ -234,7 +370,12 @@
         </div>
       </div>
     </div>
-    <a-modal v-model:visible="visible" title="视频预览" :width="750" destroyOnClose>
+    <a-modal
+      v-model:visible="visible"
+      title="视频预览"
+      :width="750"
+      destroyOnClose
+    >
       <template #footer></template>
       <div style="width: 100%; display: flex; justify-content: center">
         <div style="width: 100%; height: 100%">
@@ -593,11 +734,11 @@ export default {
       // 融合服务--一键申请
       // 一键申请
       const handleAKeyApplication = (item) => {
-      let _applyList = [];
+        let _applyList = []
         let fuseResourceList = item.fuseResourceList || []
-      let jcssArray = fuseResourceList.filter(v => v.type === '基础设施')
+        let jcssArray = fuseResourceList.filter((v) => v.type === '基础设施')
-      let otherArray = fuseResourceList.filter(v => v.type !== '基础设施')
+        let otherArray = fuseResourceList.filter((v) => v.type !== '基础设施')
-      jcssArray = jcssArray.map(v => {
+        jcssArray = jcssArray.map((v) => {
           v = Object.assign(v, v.resource)
           return v
         })
@@ -622,7 +763,7 @@ export default {
         }
         otherArray.map((v) => {
           let resource = v.resource || {}
-        console.log('resource------------>', resource);
+          console.log('resource------------>', resource)
           let obj = {
             arr: [
               {
@@ -678,7 +819,10 @@ export default {
         if (!typeObj) {
           selData.value = 'total'
         }
-      if (typeObj && (typeObj.type === '融合服务' || typeObj.type === '赋能场景')) {
+        if (
+          typeObj &&
+          (typeObj.type === '融合服务' || typeObj.type === '赋能场景')
+        ) {
           orderList.value = [
             {
               value: 'collectCount',
@@ -960,6 +1104,7 @@ export default {
                 margin-right: 0.1rem;
                 border-radius: 0.13rem;
                 background: #0087ff;
+                color: #fff;
               }
             }
           }

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

@@ -1,32 +1,20 @@
 <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>

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>
@@ -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
+        <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>
@@ -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;
+  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;
+}
+
+.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 {
+.rela {
-    background: url('~@/assets/capabilityCloud/doc.png') no-repeat;
+  width: 100%;
-    background-size: 100%;
+  height: 100%;
-  }
+  position: relative;
-
-  .newGuide {
-    background: url('~@/assets/capabilityCloud/newGuide.png') no-repeat;
-    background-size: 100%;
 }
 
 .new-menu-box {
@@ -266,10 +285,4 @@
   align-items: center;
   justify-content: center;
 }
-
-  .rela {
-    width: 100%;
-    height: 100%;
-    position: relative;
-  }
 </style>