Merge branch 'hi-ucs-dev' into release

back/src/views/modules/ability/IntegratedServices-add.vue

@@ -88,9 +88,8 @@
         </el-form>
       </div>
       <template slot="footer">
-        <el-button type="primary" @click="dataFormSubmitHandle()">提交</el-button>
         <el-button @click="closeModal">{{ $t("cancel") }}</el-button>
-
+        <el-button type="primary" @click="dataFormSubmitHandle()">提交</el-button>
       </template>
     </el-dialog>
   </div>

back/src/views/modules/ability/assignedScene/area-add.vue

@@ -3,7 +3,6 @@
     <el-dialog custom-class="customClass" :visible.sync="areaVisibleCopy" :title="modalTypeText[modalType]"
       @close="closeModal" :close-on-click-modal="false" :close-on-press-escape="false">
 
-
       <!-- 挂载和修改   -->
       <div class="right">
         <el-form :model="dataForm" :rules="rules" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
@@ -52,12 +51,11 @@
             </div>
           </div>
 
- 
         </el-form>
       </div>
       <template slot="footer">
-        <el-button type="primary" @click="dataFormSubmitHandle()">提交</el-button>
         <el-button @click="closeModal">{{ $t("cancel") }}</el-button>
+        <el-button type="primary" @click="dataFormSubmitHandle()">提交</el-button>
 
       </template>
     </el-dialog>
@@ -130,7 +128,7 @@ export default {
         fuseAttrList: [
           {
             attrType: '构建步骤',
-            attrValue: [{ question: '', answer: [{ 'answer': '' }, { 'answer': '' }] }]
+            attrValue: [{ question: '', answer: [{ answer: '' }, { answer: '' }] }]
           },
           {
             attrType: '基础设施',
@@ -156,7 +154,7 @@ export default {
             attrType: '服务图片',
             attrValue: ''
           }
-        ],
+        ]
 
       },
       rules: {
@@ -228,11 +226,9 @@ export default {
       this.$emit('closeModal')
     },
 
-
     // 表单提交
     dataFormSubmitHandle: debounce(
       function () {
-
         this.$refs.dataForm.validate((valid) => {
           if (!valid) {
             this.$message.error('请检查表单是否填写完整')
@@ -254,9 +250,8 @@ export default {
 
           this.dataForm.fuseAttrList.forEach(item => {
             if (item.attrType !== '服务图片') {
-            item.attrValue = JSON.stringify(item.attrValue);
+              item.attrValue = JSON.stringify(item.attrValue)
             }
-
           })
           this.$http
             [methodsObj[this.modalType]]('/fuse', _obj)
@@ -333,7 +328,6 @@ export default {
   },
   beforeDestroy () {
     this.clearForm()
-
   }
 }
 </script>
@@ -368,14 +362,11 @@ export default {
   background-position-y: 22px;
 }
 
-
-
 .right {
   width: 770px;
   margin-left: 100px;
   margin-top: 24px;
 
-
   .info-inner {
 
     margin-left: 10px;
@@ -392,7 +383,6 @@ export default {
 
     border-radius: 2px;
 
-
   }
 
   .baseTitle {
@@ -404,7 +394,6 @@ export default {
     background: url("~@/assets/img/biaoti.png") no-repeat;
     background-position-y: 2px;
 
-
   }
 
   .baseInner {
@@ -438,7 +427,6 @@ export default {
   height: 580px;
   overflow: auto;
 
-
 }
 
 .icon-input ::v-deep .el-input__inner {
@@ -558,4 +546,3 @@ export default {
   display: block;
 }
 </style>
-  

back/src/views/modules/ability/assignedScene/city-add.vue

@@ -22,7 +22,6 @@
         </div>
       </div>
 
-
       <!-- 挂载和修改   -->
       <div class="right">
         <el-form :model="dataForm" :rules="rules" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()"
@@ -140,8 +139,8 @@
         </el-form>
       </div>
       <template slot="footer">
-        <el-button type="primary" @click="dataFormSubmitHandle()">提交</el-button>
         <el-button @click="closeModal">{{ $t("cancel") }}</el-button>
+        <el-button type="primary" @click="dataFormSubmitHandle()">提交</el-button>
 
       </template>
     </el-dialog>
@@ -160,7 +159,6 @@ import InfrastructureModal from './components/infrastructure-modal.vue'
 import Cookies from 'js-cookie'
 import upload from '@/views/modules/components/upload'
 
-
 export const getDescJson = (text) => {
   return {
     descObj: {
@@ -231,11 +229,11 @@ export default {
       dataTypeList: [{ value: '数据', label: '数据' }],
       sceneAreas: [], // 赋能领域
 
-      steps: [{ 'name': '基本信息', 'id': "anchor1" },
+      steps: [{ name: '基本信息', id: 'anchor1' },
-      { 'name': '场景痛点', 'id': "anchor2" },
+        { name: '场景痛点', id: 'anchor2' },
-      { 'name': '解决方案', 'id': "anchor3" },
+        { name: '解决方案', id: 'anchor3' },
-      { 'name': '使用能力', 'id': "anchor4" },
+        { name: '使用能力', id: 'anchor4' },
-      { 'name': '构建步骤', 'id': "anchor5" }],
+        { name: '构建步骤', id: 'anchor5' }],
       fileUploadUrl: window.SITE_CONFIG.apiURL + '/upload',
 
       painKeyTextObj: getDescJson('痛点'),
@@ -253,7 +251,7 @@ export default {
         fuseAttrList: [
           {
             attrType: '构建步骤',
-            attrValue: [{ question: '', answer: [{ 'answer': '' }, { 'answer': '' }] }]
+            attrValue: [{ question: '', answer: [{ answer: '' }, { answer: '' }] }]
           },
           {
             attrType: '基础设施',
@@ -279,7 +277,7 @@ export default {
             attrType: '服务图片',
             attrValue: ''
           }
-        ],
+        ]
 
       },
       rules: {
@@ -327,13 +325,11 @@ export default {
 
   methods: {
 
-
     handleStep (item, index) {
       this.activeStepIndex = index
       this.selectNow = item.id // 设置选中的锚点为当前点击的
-      let top = document.querySelector('#' + item.id).offsetTop - 100
+      const top = document.querySelector('#' + item.id).offsetTop - 100
-      document.querySelectorAll(".customClass .el-dialog__body")[0].scrollTop = top
+      document.querySelectorAll('.customClass .el-dialog__body')[0].scrollTop = top
-
     },
     // 获取赋能场景
     getSceneArea () {
@@ -362,7 +358,6 @@ export default {
           v.attrValue = data.list
         }
       })
-
     },
     // 更新数量
     updateCount (data) {
@@ -375,13 +370,11 @@ export default {
       if (data.title === '数据资源') {
         this.dataForm.dataSourceCount = data.count
       }
-
     },
 
     // 表单提交
     dataFormSubmitHandle: debounce(
       function () {
-
         this.$refs.dataForm.validate((valid) => {
           if (!valid) {
             this.$message.error('请检查表单是否填写完整')
@@ -402,9 +395,8 @@ export default {
           })
           this.dataForm.fuseAttrList.forEach(item => {
             if (item.attrType !== '服务图片') {
-            item.attrValue = JSON.stringify(item.attrValue);
+              item.attrValue = JSON.stringify(item.attrValue)
             }
-
           })
           this.$http
             [methodsObj[this.modalType]]('/fuse', _obj)
@@ -440,11 +432,7 @@ export default {
         }
         const _imgObj = data.fuseAttrList.find(v => v.attrType == '服务图片') || {}
         this.imageUrl = _imgObj.attrValue
-       
-
-
       })
-
     },
     handleAvatarSuccess (res, file) {
       if (res.code !== 0) {
@@ -489,42 +477,33 @@ export default {
     }
   },
   mounted () {
-    const that = this;
+    const that = this
     this.$nextTick(() => {
-      document.querySelector(".el-dialog__body").onscroll = function () {
+      document.querySelector('.el-dialog__body').onscroll = function () {
-
+        const top = document.querySelectorAll('.customClass .el-dialog__body')[0].scrollTop - 100
-        let top = document.querySelectorAll(".customClass .el-dialog__body")[0].scrollTop - 100
 
         if (top < document.querySelector('#anchor1').offsetTop - 100) {
           that.activeStepIndexs = 0
-        }
+        } else if (top < document.querySelector('#anchor2').offsetTop - 100) {
-        else if (top < document.querySelector('#anchor2').offsetTop - 100) {
           that.activeStepIndexs = 1
-        }
+        } else if (top < document.querySelector('#anchor3').offsetTop - 100) {
-        else if (top < document.querySelector('#anchor3').offsetTop - 100) {
           that.activeStepIndexs = 2
-        }
+        } else if (top < document.querySelector('#anchor4').offsetTop - 100) {
-        else if (top < document.querySelector('#anchor4').offsetTop - 100) {
           that.activeStepIndexs = 3
-        }
+        } else if (top < document.querySelector('#anchor5').offsetTop - 100) {
-        else if (top < document.querySelector('#anchor5').offsetTop - 100) {
           that.activeStepIndexs = 4
         } else {
           that.activeStepIndexs = 0
         }
         if (that.activeStepIndex !== that.activeStepIndexs) {
-          that.activeStepIndex = that.activeStepIndexs;
+          that.activeStepIndex = that.activeStepIndexs
-          that.$forceUpdate();
+          that.$forceUpdate()
         }
       }
-
     })
-
-
   },
   beforeDestroy () {
     this.clearForm()
-
   }
 }
 </script>
@@ -632,9 +611,6 @@ export default {
       border: 4px solid #1160e2;
     }
 
-
-
-
     .advice {
       font-size: 10px;
       color: #1160e2;
@@ -653,7 +629,6 @@ export default {
   margin-left: 157px;
   margin-top: -5px;
 
-
   .info-inner {
 
     margin-left: 10px;
@@ -670,7 +645,6 @@ export default {
 
     border-radius: 2px;
 
-
   }
 
   .baseTitle {
@@ -682,7 +656,6 @@ export default {
     background: url("~@/assets/img/biaoti.png") no-repeat;
     background-position-y: 2px;
 
-
   }
 
   .baseInner {
@@ -716,7 +689,6 @@ export default {
   height: 580px;
   overflow: auto;
 
-
 }
 
 .icon-input ::v-deep .el-input__inner {
@@ -836,4 +808,3 @@ export default {
   display: block;
 }
 </style>
-  

back/src/views/modules/ability/assignedScene/components/ability-add.vue

@@ -63,7 +63,7 @@
           <template slot-scope="scope">
             <el-popconfirm
                         confirm-button-text="确认"
-                        cancel-button-text="不用了"
+                        cancel-button-text="取消"
                         icon="el-icon-info"
                         icon-color="red"
                         title="确定删除该实例数据吗？"
@@ -86,117 +86,117 @@ export default {
   props: {
     dataForm: {
       type: Object,
-      default: () => {},
+      default: () => {}
     },
     title: {
       type: String,
-      default: "",
+      default: ''
     },
     typeList: {
       type: Array,
-      default: () => [],
+      default: () => []
-    },
+    }
   },
   watch: {
     dataInfo: {
       handler (newVal) {
-        this.dataInfo = newVal;
+        this.dataInfo = newVal
-        this.$emit("update", {
+        this.$emit('update', {
           title: this.title,
-          list: newVal,
+          list: newVal
-        });
+        })
       },
       deep: true,
-      immediate: true,
+      immediate: true
     },
     count: {
       handler (newVal) {
-        this.count = newVal;
+        this.count = newVal
-        this.$emit("updateCount", {
+        this.$emit('updateCount', {
           title: this.title,
-          count: newVal,
+          count: newVal
-        });
+        })
       },
       deep: true,
-      immediate: true,
+      immediate: true
-    },
+    }
   },
   data () {
     return {
-      count: "",
+      count: '',
-      dataInfo: [],
+      dataInfo: []
-    };
+    }
   },
 
   methods: {
     addBaseInfo () {
-      let data = {
+      const data = {
-        name: "",
+        name: '',
-        type: "",
+        type: '',
-        dept: "",
+        dept: ''
-      };
+      }
-      this.dataInfo.push(data);
+      this.dataInfo.push(data)
     },
     handleDelete (row) {
-      this.dataInfo.splice(row, 1);
+      this.dataInfo.splice(row, 1)
     },
     getDataInfo (dataForm) {
-      let arr = [];
+      let arr = []
       if (dataForm && (dataForm.id || dataForm.id === 0)) {
-        if (this.title === "基础设施") {
+        if (this.title === '基础设施') {
-          this.count = dataForm.infrastructureCount;
+          this.count = dataForm.infrastructureCount
         }
-        if (this.title === "组件服务") {
+        if (this.title === '组件服务') {
-          this.count = dataForm.componentCount;
+          this.count = dataForm.componentCount
         }
-        if (this.title === "数据资源") {
+        if (this.title === '数据资源') {
-          this.count = dataForm.dataSourceCount;
+          this.count = dataForm.dataSourceCount
         }
 
-        let fuseAttrList = dataForm.fuseAttrList || [];
+        const fuseAttrList = dataForm.fuseAttrList || []
-        let obj = fuseAttrList.find((v) => v.attrType === this.title) || {};
+        const obj = fuseAttrList.find((v) => v.attrType === this.title) || {}
-        let attrValue = JSON.parse(obj.attrValue || "[]");
+        const attrValue = JSON.parse(obj.attrValue || '[]')
         if (attrValue.length > 0) {
           attrValue.map((v) => {
-            arr.push(v);
+            arr.push(v)
-          });
+          })
         } else {
-          arr = [];
+          arr = []
         }
       } else {
-        arr = [];
+        arr = []
       }
 
-      this.dataInfo = arr;
+      this.dataInfo = arr
     },
     // 新增
     addItem () {
-      let index = this.dataInfo.length - 1;
+      const index = this.dataInfo.length - 1
-      if (this.dataInfo[index][this.keyTextObj.descObj.key] === "") {
+      if (this.dataInfo[index][this.keyTextObj.descObj.key] === '') {
-        return this.$message.warning("请填写完整信息！");
+        return this.$message.warning('请填写完整信息！')
       }
       this.dataInfo.push({
-        [this.keyTextObj.descObj.key]: "",
+        [this.keyTextObj.descObj.key]: ''
-      });
+      })
     },
     // 删除
     deleteItem (index) {
-      this.$confirm("确认是否删除?", "提示", {
+      this.$confirm('确认是否删除?', '提示', {
-        confirmButtonText: "确定",
+        confirmButtonText: '确定',
-        cancelButtonText: "取消",
+        cancelButtonText: '取消',
-        type: "warning",
+        type: 'warning'
       })
         .then(() => {
           this.$message({
-            type: "success",
+            type: 'success',
-            message: "删除成功!",
+            message: '删除成功!'
-          });
-          this.dataInfo.splice(index, 1);
           })
-        .catch(() => {});
+          this.dataInfo.splice(index, 1)
-    },
+        })
-  },
+        .catch(() => {})
-};
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-table thead {

back/src/views/modules/ability/assignedScene/index.vue

@@ -71,10 +71,10 @@
 </template>
 
 <script>
-import mixinViewModule from "@/mixins/view-module";
+import mixinViewModule from '@/mixins/view-module'
 
-import cityAdd from "./city-add";
+import cityAdd from './city-add'
-import areaAdd from "./area-add";
+import areaAdd from './area-add'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -88,15 +88,15 @@ export default {
       tableData: [],
       childName: '',
       mixinViewModuleOptions: {
-        getDataListURL: "/fuse/page",
+        getDataListURL: '/fuse/page',
-        exportURL: "/ability/bsabilityai/export",
+        exportURL: '/ability/bsabilityai/export',
-        deleteURL: "/fuse",
+        deleteURL: '/fuse',
         getDataListIsPage: true,
-        deleteIsBatch: false,
+        deleteIsBatch: false
       },
       disabled: false,
       dataForm: {
-        name: "",
+        name: '',
         order: 'desc',
         orderField: 'create_date',
         type: '赋能场景',
@@ -104,20 +104,20 @@ export default {
 
       },
       qp: false,
-      modalType: 'add',
+      modalType: 'add'
-    };
+    }
   },
   components: {
     areaAdd,
     cityAdd
   },
   mounted () {
-    window.addEventListener("resize", this.a);
+    window.addEventListener('resize', this.a)
-    this.fullScreen();
+    this.fullScreen()
   },
   methods: {
     handleChose (index) {
-      this.choose = index;
+      this.choose = index
       this.searchData()
     },
     deleteRow (id) {
@@ -131,21 +131,21 @@ export default {
         }).then(res => {
           console.log('删除成功', res)
           if (res.data.code !== 0) {
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
           this.$message({
             message: '删除成功',
-            type: "success",
+            type: 'success',
             duration: 500,
             onClose: () => {
               this.query()
-            },
+            }
-          });
+          })
         }).catch(err => {
-          this.$message.error(err);
+          this.$message.error(err)
         })
       }).catch(() => {
-      });
+      })
     },
     // 查询
     searchData () {
@@ -154,7 +154,7 @@ export default {
     },
     // 重置
     reset () {
-      this.dataForm.name = "";
+      this.dataForm.name = ''
       this.query()
     },
     // 修改
@@ -165,7 +165,7 @@ export default {
         this.areaVisible = true
       }
 
-      this.modalType = 'update';
+      this.modalType = 'update'
       const cloneVal = JSON.parse(JSON.stringify(val))
       this.$nextTick(() => {
         if (this.choose == 0) {
@@ -173,13 +173,12 @@ export default {
         } else {
           this.$refs.areaAdd.getDetail(cloneVal)
         }
-     
       })
     },
     // 挂接
     addServe () {
       // this.addOrUpdateVisible = true
-      this.modalType = 'add';
+      this.modalType = 'add'
       if (this.choose === 0) {
         this.cityVisible = true
       } else {
@@ -187,35 +186,39 @@ export default {
       }
     },
     closeModal () {
-      this.cityVisible = false;
+      this.cityVisible = false
-      this.areaVisible=false;
+      this.areaVisible = false
     },
     // 详情
     showDetail (val) {
-      window.open(window.SITE_CONFIG.previewUrl + '#/integrationServicesDetails?id=' + val.id)
+      if (val.district == 0) {
+        window.open(window.SITE_CONFIG.previewUrl + '#/integrationServicesDetails?id=' + val.id + '&districtType=0&type=典型赋能场景')
+      } else {
+        window.open(window.SITE_CONFIG.previewUrl + '#/integrationServicesDetails?id=' + val.id + '&districtType=1&type=典型赋能场景')
+      }
     },
     fullScreen () {
       if (window.outerHeight === screen.availHeight) {
         if (window.outerWidth === screen.availWidth) {
           console.log(
-            "全屏1",
+            '全屏1'
-          );
+          )
-          this.qp = false;
+          this.qp = false
         } else {
           console.log(
-            "不是全屏2",
+            '不是全屏2'
-          );
+          )
-          this.qp = true;
+          this.qp = true
         }
       } else {
         console.log(
-          "不是全屏3",
+          '不是全屏3'
-        );
+        )
-        this.qp = true;
+        this.qp = true
+      }
+    }
+  }
 }
-    },
-  },
-};
 </script>
 <style lang="scss" scoped>
 .second-title {

back/src/views/modules/workBench/components/bottom-view.vue

@@ -16,13 +16,14 @@
         </div>
         <div class="more" @click="jumpTo">查看更多 ></div>
       </div>
-      <div
+      <!-- <div
       class="no-data"
       v-else
       style="display: flex; align-items: center; justify-content: center"
     >
       暂无数据
-    </div>
+    </div> -->
+    <el-empty v-else style="display: flex;flex-direction: column;justify-content: center; align-items: center;" description="暂无数据" :image-size="150"></el-empty>
 
     </div>
     <!-- 部门推荐能力 -->

back/src/views/modules/workBench/components/dept-chart-view.vue

@@ -3,7 +3,8 @@
         <div class="title">{{ title }}</div>
         <div v-if="dataListCopy.length > 0" style="width:260px; height:232px" class="dept-chart-view" :id="id">
         </div>
-        <div class="no-data" v-else>暂无数据</div>
+        <!-- <div class="no-data" v-else>暂无数据</div> -->
+        <el-empty v-else style="display: flex;flex-direction: column;justify-content: center; align-items: center;" description="暂无数据" :image-size="150"></el-empty>
     </div>
 
 </template>

back/src/views/modules/workBench/components/frequency-top5-view.vue

@@ -33,7 +33,8 @@
                 <div class="count-text">{{ formatCount(data.count) }}</div>
             </div>
         </div>
-        <div class="no-data" v-else>暂无数据</div>
+        <!-- <div class="no-data" v-else>暂无数据</div> -->
+        <el-empty v-else style="display: flex;flex-direction: column;justify-content: center; align-items: center;" description="暂无数据" :image-size="150"></el-empty>
 
     </div>
 </template>

back/src/views/modules/workBench/components/risk-view.vue

@@ -21,13 +21,14 @@
         </div>
       </div>
     </div>
-    <div
+    <!-- <div
       class="no-data"
       v-else
       style="display: flex; align-items: center; justify-content: center"
     >
       暂无数据
-    </div>
+    </div> -->
+    <el-empty v-else style="display: flex;flex-direction: column;justify-content: center; align-items: center;" description="暂无数据" :image-size="150"></el-empty>
   </div>
 </template>
 <script>

front/src/views/home/infrastructurePage.vue

@@ -357,11 +357,15 @@
                   :showSearch="true"
                 >
                   <a-select-option
-                    :value="item.value"
+                    :value="item.label"
                     v-for="item in deptList"
                     :key="item.value"
                   >
+                    <a-tooltip v-if="item.label.length > 9">
+                      <template #title>{{ item.label }}</template>
                       {{ item.label }}
+                    </a-tooltip>
+                    <template v-else>{{ item.label }}</template>
                   </a-select-option>
                 </a-select>
               </a-form-item>
@@ -408,23 +412,12 @@
             :wrapper-col="{ span: 14, offset: 4 }"
             style="text-align: center; margin-top: 0.4rem"
           >
-          <a-button
+            <a-button class="tijiao" @click="onSubmit">提交</a-button>
-             class="tijiao"
-            
-              @click="onSubmit"
-            >
-              提交
-            </a-button>
             <a-button class="quxiao" @click="appointmentRoom = false">
               取消
             </a-button>
-   
           </a-form-item>
         </a-form>
-       
-          
-            
-   
       </a-modal>
     </div>
     <div v-if="room">
@@ -882,7 +875,7 @@
     deptList.value = []
     res.data.data.map((val) => {
       deptList.value.push({
-        value: val.name,
+        value: val.id,
         label: val.name,
       })
     })
@@ -1215,7 +1208,8 @@
     if (item && item.status != 1) {
       return
       // return message.warning('当前设备离线, 不可预览！')
-    }handleChose
+    }
+    handleChose
     console.log('打开视频', id)
     const param = {
       key: id,
@@ -2520,7 +2514,6 @@
   })
 </script>
 <style lang="less" scoped>
- 
   .quxiao {
     margin-right: 12px;
     cursor: pointer;
@@ -2912,7 +2905,6 @@
   :deep(.ant-checkbox-indeterminate .ant-checkbox-inner::after) {
     background-color: #0058e1;
   }
-
 </style>
 <style lang="less">
   .eia-dropdown-class {

front/src/views/home/integrationServicesDetails.vue

@@ -2,16 +2,27 @@
 <template>
   <div class="IntegrationServicesDetails" :class="{ fixed2: scrollTop >= 600 }">
     <home-header></home-header>
-    <detail-back v-show="!hiddenBackFlag" :returnType="returnType" :districtType="districtType"></detail-back>
+    <detail-back
+      v-show="!hiddenBackFlag"
+      :returnType="returnType"
+      :districtType="districtType"
+    ></detail-back>
 
     <template v-if="districtType == 0 || returnType == '打包模式'">
       <!-- 头部基本信息 -->
-      <application-top-details :dataList="detailInfoObj" :navList="navList"></application-top-details>
+      <application-top-details
+        :dataList="detailInfoObj"
+        :navList="navList"
+      ></application-top-details>
       <!-- 导航 -->
       <div :class="{ fixed: scrollTop >= 600 }" style="z-index: 10012">
         <div class="application-navigation">
           <template v-for="nav in navList" :key="nav.key">
-            <div class="nav" :class="{ selectNow: nav.key == selectNow }" @click="selectNav(nav.key)">
+            <div
+              class="nav"
+              :class="{ selectNow: nav.key == selectNow }"
+              @click="selectNav(nav.key)"
+            >
               {{ nav.name }}
               <span class="line"></span>
             </div>
@@ -30,11 +41,16 @@
           </div>
 
           <div class="content" style="margin-left: 0.5rem">
-            <div class="content-item" v-for="(item, i) in painPoint" :key="i" style="
+            <div
+              class="content-item"
+              v-for="(item, i) in painPoint"
+              :key="i"
+              style="
                 margin-bottom: 0.2rem;
                 font-size: 0.18rem;
                 line-height: 0.3rem;
-            ">
+              "
+            >
               {{ i + 1 + '、' + item.description }}
             </div>
           </div>
@@ -42,17 +58,26 @@
       </div>
 
       <!-- 解决方案 -->
-      <div id="integration-solution" class="solution scrollBox" style="background: #eee">
+      <div
+        id="integration-solution"
+        class="solution scrollBox"
+        style="background: #eee"
+      >
         <div class="title-1">
           <DetalsTitle title="解决方案" type="SOLUTION"></DetalsTitle>
         </div>
         <div class="flex-row-center">
           <div class="content" style="background: #fff; margin-top: 0.2rem">
-            <div class="content-item" v-for="(item, i) in solution" :key="i" style="
+            <div
+              class="content-item"
+              v-for="(item, i) in solution"
+              :key="i"
+              style="
                 margin-bottom: 0.2rem;
                 font-size: 0.18rem;
                 line-height: 0.3rem;
-            ">
+              "
+            >
               {{ i + 1 + '、' + item.description }}
             </div>
           </div>
@@ -64,11 +89,26 @@
         <div class="title-1">
           <DetalsTitle title="使用能力" type="ABILITY"></DetalsTitle>
         </div>
-        <div class="flex-row-center combine-content" v-for="(item, i) in combineList" :key="i" style="display: block">
+        <div
-          <div class="top" style="font-size: 0.24rem; text-align: center; margin-bottom: 0.3rem">
+          class="flex-row-center combine-content"
+          v-for="(item, i) in combineList"
+          :key="i"
+          style="display: block"
+        >
+          <div
+            class="top"
+            style="
+              font-size: 0.24rem;
+              text-align: center;
+              margin-bottom: 0.3rem;
+            "
+          >
             {{ i == 0 ? '基础设施' : i == 1 ? '组件服务' : '数据资源' }}
           </div>
-          <div class="data-count" style="font-size: 0.14rem; text-align: right; margin-bottom: 0.2rem">
+          <div
+            class="data-count"
+            style="font-size: 0.14rem; text-align: right; margin-bottom: 0.2rem"
+          >
             <span style="color: #909399">
               共
               {{
@@ -83,23 +123,63 @@
           <div class="bottom" style="display: flex; align-items: flex-start">
             <div class="title" :class="'title' + i"></div>
             <div class="table-box" v-if="returnType == '典型赋能场景'">
-              <el-table class="table" :data="item.list" stripe :header-cell-style="{ 'text-align': 'center' }">
+              <el-table
-                <el-table-column prop="name" label="资源名称" align="center" width="200"
+                class="table"
-                  show-overflow-tooltip="true"></el-table-column>
+                :data="item.list"
-                <el-table-column prop="type" label="资源类型" align="center" width="100"
+                stripe
-                  show-overflow-tooltip="true"></el-table-column>
+                :header-cell-style="{ 'text-align': 'center' }"
-                <el-table-column prop="dept" label="来源部门" align="center" width="300"
+              >
-                  show-overflow-tooltip="true"></el-table-column>
+                <el-table-column
+                  prop="name"
+                  label="资源名称"
+                  align="center"
+                  width="200"
+                  show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                  prop="type"
+                  label="资源类型"
+                  align="center"
+                  width="100"
+                  show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                  prop="dept"
+                  label="来源部门"
+                  align="center"
+                  width="300"
+                  show-overflow-tooltip="true"
+                ></el-table-column>
               </el-table>
             </div>
             <div class="table-box" v-else>
-              <el-table class="table" :data="item.list" stripe :header-cell-style="{ 'text-align': 'center' }">
+              <el-table
-                <el-table-column prop="name" label="资源名称" align="center" width="200"
+                class="table"
-                  show-overflow-tooltip="true"></el-table-column>
+                :data="item.list"
-                <el-table-column prop="platform" label="资源类型" align="center" width="100"
+                stripe
-                  show-overflow-tooltip="true"></el-table-column>
+                :header-cell-style="{ 'text-align': 'center' }"
-                <el-table-column prop="dept" label="能力来源" align="center" width="300"
+              >
-                  show-overflow-tooltip="true"></el-table-column>
+                <el-table-column
+                  prop="name"
+                  label="资源名称"
+                  align="center"
+                  width="200"
+                  show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                  prop="platform"
+                  label="资源类型"
+                  align="center"
+                  width="100"
+                  show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                  prop="dept"
+                  label="能力来源"
+                  align="center"
+                  width="300"
+                  show-overflow-tooltip="true"
+                ></el-table-column>
               </el-table>
             </div>
           </div>
@@ -107,7 +187,11 @@
       </div>
 
       <!-- 构建步骤 -->
-      <div id="integration-step" class="step scrollBox" style="background: #eee">
+      <div
+        id="integration-step"
+        class="step scrollBox"
+        style="background: #eee"
+      >
         <div class="title-1">
           <DetalsTitle title="构建步骤" type="STEP"></DetalsTitle>
         </div>
@@ -132,31 +216,43 @@
             <div class="li1" v-for="(item, i) in step" :key="i">
               <div>
                 <div class="node">
-
                   <div class="step-span">{{ i + 1 }}</div>
                   <div>
-                    <div class="step-question">第{{ i+ 1}}步:{{ item.question }}</div>
+                    <div class="step-question">
-                    <div class="question-son" v-for="(itemson, i) in item.answer" :key="i">
+                      第{{ i + 1 }}步:{{ item.question }}
-                      <img src="~@/assets/home/arrow.png" style="margin-right:8px" />{{ i+ 1}}>{{ itemson.answer }}
+                    </div>
+                    <div
+                      class="question-son"
+                      v-for="(itemson, i) in item.answer"
+                      :key="i"
+                    >
+                      <img
+                        src="~@/assets/home/arrow.png"
+                        style="margin-right: 8px"
+                      />
+                      {{ i + 1 }}>{{ itemson.answer }}
                     </div>
                   </div>
-
                 </div>
 
                 <div class="borderLeft"></div>
               </div>
               <div class="advice"></div>
             </div>
-
           </div>
         </div>
-
       </div>
     </template>
     <template v-else>
       <div class="area">
-        <a-image style="width:615px;height:345px" :preview="false" :src="bgImg || imgSrcYyzy" />
+        <a-image
-        <div class="label-name">{{ detailInfoObj.name }} <span class="label">
+          style="width: 615px; height: 345px"
+          :preview="false"
+          :src="bgImg || imgSrcYyzy"
+        />
+        <div class="label-name">
+          {{ detailInfoObj.name }}
+          <span class="label">
             {{ detailInfoObj.type }}
           </span>
           <span class="label1">
@@ -294,6 +390,10 @@ onMounted(() => {
     })
   })
 
+  //进入场景入口
+  const openScene = (val) => {
+    window.open(val, '_blank')
+  }
   const selectNav = (key) => {
     selectNow.value = key
     mybus.emit('flyToView', selectNow.value)
@@ -340,7 +440,6 @@ const getIntegrationServicesDeatil = (id) => {
           let fuseResourceList = res.data.data.fuseAttrList || []
 
           combineList.value.forEach((item) => {
-
             let arr = []
             let resource = fuseResourceList.filter(
               (v) => v.attrType == item.title
@@ -349,16 +448,13 @@ const getIntegrationServicesDeatil = (id) => {
             //   let a=resource[0].attrValue
             let resourceArrList = JSON.parse(resource[0].attrValue)
             if (resourceArrList.length > 0) {
-
               arr = resourceArrList.map((res) => ({
                 name: res.name,
                 dept: res.dept,
                 type: res.type,
-
               }))
               item.list = arr
             }
-
           })
         } else {
           // 融合关系
@@ -404,7 +500,6 @@ const getIntegrationServicesDeatil = (id) => {
           })
         }
 
-
         detailInfoObj.value.infoList = []
         detailInfoObj.value.infoList.push(questionObj)
         detailInfoObj.value.infoList.push(areaObj)
@@ -450,7 +545,6 @@ onBeforeUnmount(() => {
       margin-top: 32px;
     }
 
-
     .label {
       padding: 0.01rem 0.1rem;
       margin-right: 0.1rem;
@@ -477,9 +571,7 @@ onBeforeUnmount(() => {
       height: 32px;
       border-radius: 2px;
       border: 1px #0058e1 solid;
-
     }
-
   }
 
   .area-desc {
@@ -602,9 +694,11 @@ onBeforeUnmount(() => {
         height: 1.5rem;
         width: 6.2rem;
         border-radius: 0.2rem;
-      background: linear-gradient(to right,
+        background: linear-gradient(
+          to right,
           rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4));
+          rgba(148, 163, 252, 0.4)
+        );
         padding: 0 0.3rem;
         display: flex;
         justify-content: center;
@@ -698,7 +792,6 @@ onBeforeUnmount(() => {
       background: #fff;
 
       .left-process {
-
         padding-left: 18px;
         padding-top: 24px;
 
@@ -719,7 +812,6 @@ onBeforeUnmount(() => {
           left: -1px;
         }
 
-
         .step-question {
           color: #0058e1;
           font-weight: bold;
@@ -739,7 +831,6 @@ onBeforeUnmount(() => {
         }
 
         .node {
-
           cursor: pointer;
           font-size: 16px;
           line-height: 22.5px;
@@ -763,8 +854,6 @@ onBeforeUnmount(() => {
           background-color: #fff;
         }
 
-
-
         .advice {
           font-size: 10px;
           color: #0058e1;
@@ -775,10 +864,7 @@ onBeforeUnmount(() => {
         .li1:last-child .borderLeft {
           display: none;
         }
-
       }
-
-
     }
   }
 
@@ -837,7 +923,8 @@ onBeforeUnmount(() => {
         font-size: 16px;
       }
 
-    .data-count {}
+      .data-count {
+      }
     }
 
     .name-box {

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

@@ -21,6 +21,15 @@
       <span class="xv-qui-zhong-xin">需求中心</span>
       <span class="neng-li-shen-qing-liu-cheng">能力申请流程</span>
       <span class="neng-li-xv-qiu-liu-cheng">能力需求流程</span>
+      <i class="data-property-library-flow absolute flow-1"></i>
+      <i class="data-property-library-flow absolute flow-2"></i>
+      <i class="data-property-library-flow absolute flow-3"></i>
+      <i class="data-property-library-flow absolute flow-4"></i>
+      <i class="data-property-library-flow absolute flow-5"></i>
+      <i class="data-property-library-flow absolute flow-6"></i>
+      <i class="data-property-library-flow absolute flow-7"></i>
+      <i class="data-property-library-flow absolute flow-8"></i>
+      <i class="data-property-library-flow absolute flow-9"></i>
     </div>
   </div>
 </template>
@@ -47,6 +56,7 @@
       }
     }
     .TheOverallProcess-content {
+      width:1920px;
       height: 855px;
       background: url('~@/assets/menu/TheOverallProcess-bg.png');
       position: relative;
@@ -166,6 +176,75 @@
         left: 125px;
         top: 102px;
       }
+      .data-property-library-flow {
+        width: 50px;
+        height: 38px;
+        background-image: url("~@/assets/menu/line-flow.png");
+      }
+      .absolute {
+          position: absolute;
+      }
+      .flow-1 {
+          offset-path: path("m982,198c0,0 0,68 0,68");
+          animation: move 2s linear infinite;
+          -webkit-animation: move 2s linear infinite;
+      }
+      .flow-2 {
+          offset-path: path("m928,281c0,0 0,-71 0,-71");
+          animation: move 2s linear infinite;
+          -webkit-animation: move 2s linear infinite;
+      }
+      .flow-3 {
+          offset-path: path("m539,359c0,0 318,-1 318,-1");
+          animation: move 2s linear infinite;
+          -webkit-animation: move 2s linear infinite;
+          animation-delay: 1s;
+          -webkit-animation-delay: 1s;
+      }
+      .flow-4 {
+          offset-path: path("m856,412c0,0 -308,0 -308,0");
+          animation: move 3s linear infinite;
+          -webkit-animation: move 3s linear infinite;
+          animation-delay: 2s;
+          -webkit-animation-delay: 2s;
+      }
+      .flow-5 {
+          offset-path: path("m454,480c0,0 0,160 0,160c0,0 401,0 401,0");
+          animation: move 4s linear infinite;
+          -webkit-animation: move 4s linear infinite;
+      }
+      .flow-6 {
+          offset-path: path("m402,478c0,0 0,295 0,295c0,0 1067,0 1067,0c0,0 -1,-273 -1,-273");
+          animation: move 6s linear infinite;
+          -webkit-animation: move 6s linear infinite;
+      }
+      .flow-7 {
+          offset-path: path("m1392,383c0,0 -332,0 -332,0");
+          animation: move 2s linear infinite;
+          -webkit-animation: move 2s linear infinite;
+      }
+      .flow-8 {
+          offset-path: path("m1457,295c0,0 0,-181 0,-181c0,0 -397,0 -397,0");
+          animation: move 3s linear infinite;
+          -webkit-animation: move 3s linear infinite;
+          animation-delay: 1s;
+          -webkit-animation-delay: 1s;
+      }
+      .flow-9 {
+          offset-path: path("m955,483c0,0 0,74 0,74");
+          animation: move 2s linear infinite;
+          -webkit-animation: move 2s linear infinite;  
+          animation-delay: 1s;
+          -webkit-animation-delay: 1s;
+      }
+      @keyframes move {
+          0% {
+              offset-distance: 0%;
+          }
+          100% {
+              offset-distance: 100%;
+          }
+      }
     }
   }
 </style>

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

@@ -55,6 +55,22 @@
         >
           {{ item.btnText }} >>
         </div>
+        <template v-if="item.name=='资源下架'">
+          <div class="resources-cont">
+            <p>能力归属方资源发生变更或停用，可对改能力进行下架申请</p>
+            <p>能力归属方下架前需要先检查能力使用情况，如果能力处于被使用状态，需要提前协调使用方后再进行能力下架</p>
+          </div>
+          <div class="resources-step">
+            <p>开始</p>
+            <p>能力使用状态检查</p>
+            <p>通知使用方</p>
+            <p>能力下架申请</p>
+            <p>市大数据局审核</p>
+            <p>完成下架</p>
+          </div>
+
+        </template>
+
       </div>
       <!-- 联系我们 -->
       <!--<div class="img-bg callus-box">
@@ -460,6 +476,7 @@
   }
   .img-box-new {
     margin-bottom: -60px;
+    position: relative;
   }
 
   .service-box {
@@ -535,6 +552,48 @@
     height: 544px;
     background-image: url('../../../assets/menu/down.png');
   }
+  .resources-cont{
+    position: absolute;
+    top:298px;
+    left:315px;
+    width:1294px;
+    height: 100px;
+    // border:1px solid red;
+    display: flex;
+    justify-content: space-between;
+    p{
+      width: 636px;
+      padding: 0 35px;
+      line-height: 30px;
+      font-size: 16px;
+      font-family: microsoft Yahei;
+      // border:1px solid blue;
+    }
+    p:first-child{
+      text-align: center;
+    }
+
+
+  }
+  .resources-step{
+    top: 440px;
+    position: absolute;
+    left: 333px;
+    width: 1326px;
+    height: 107px;
+    display: flex;
+    p{
+      width: 183px;
+      line-height: 106px;
+      font-weight: 500;
+      text-align: center;
+      font-size: 18px;
+      margin-right: 36px;
+      font-family: microsoft Yahei;
+    }
+
+
+  }
 
   .list-box {
     display: flex;

front/src/views/personalCenter/components/MyApply.vue

@@ -97,10 +97,142 @@
         <a-empty  /></div>
     
     </template>
-    <!--数据资源和视频资源-->
+    <!--数据资源-->
     <template v-else-if="chooseTab == 1">
-      <div style="height: 740px;background: #fff;    padding-top: 250px;" >
+      <div style="height: 740px;background: #fff;    padding-top: 50px;" >
-      <a-empty></a-empty>
+        <div v-if="contentList.data.length > 0">
+      <div class="content">
+        <div
+          class="content-body"
+          v-for="item in contentList.data"
+          :key="item.index"
+        >
+          <div class="withdraw" v-if="item.approveStatus === '不通过'"></div>
+          <div class="content-body-title">
+            <span>
+              申请单号：{{
+                item.applyNumber || item.GUID || item.BSNUM || '--'
+              }}
+            </span>
+            <div></div>
+          </div>
+          <a-tooltip>
+            <template #title>
+              {{
+                item.cameraList
+                  ? item.system
+                  : item.title || item.name || item.title || item.BUSINESS_NAME
+              }}
+            </template>
+            <div class="content-body-title">
+              <span>
+                名称：{{
+                  item.cameraList
+                    ? item.system
+                    : item.title ||
+                      item.name ||
+                      item.title ||
+                      item.BUSINESS_NAME
+                }}
+              </span>
+              <div></div>
+            </div>
+          </a-tooltip>
+          <div class="content-body-content">
+            <p class="content-body-content-son">
+              审核结果：{{ item.bmyijian === 0 ? '审核中' : '审核完成' }}
+            </p>
+            <div>
+              申请日期：{{
+                item.createDate ||
+                item.startTime ||
+                item.tbsj ||
+                (item.CREATE_TIME &&
+                  moment(item.CREATE_TIME.time + 480 * 60 * 1000).format(
+                    'YYYY-MM-DD HH:mm:ss'
+                  ))
+              }}
+            </div>
+            <!-- 西海岸--增加过期时间显示 -->
+            <div v-if="isXiHaiAn">过期时间：{{ item.expireDate || '' }}</div>
+          </div>
+          <div class="button-box">
+            <div
+              class="button"
+              v-if="typeName == '设备申请' && phoneSate.includes(item.state)"
+              @click="showPhoneModal(item)"
+            >
+              联系方式
+            </div>
+            <div class="button" @click="showDetail(item)">查看详情</div>
+            <div
+              class="button"
+              @click="showAdd(item)"
+              v-if="typeName !== '能力申请' && item.backToFirst"
+            >
+              修改
+            </div>
+            <svg
+              t="1652233950228"
+              class="icon"
+              viewBox="0 0 1024 1024"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              p-id="5970"
+              data-spm-anchor-id="a313x.7781069.0.i8"
+              width="80"
+              height="80"
+              v-if="
+                item.processDefinitionName != '能力资源下架' &&
+                item.approveStatus !== '不通过' &&
+                (item.resourceStatus == 4 || item.resourceStatus == 5)
+              "
+              style="position: absolute; top: 20px; left: -850px"
+            >
+              <path
+                d="M955.22053 256C813.82053 11.2 500.72053-72.6 255.92053 68.8S-72.67947 523.2 68.72053 768 523.22053 1096.6 768.02053 955.2c244.7-141.2 328.6-454.1 187.4-698.8 0-0.1-0.1-0.3-0.2-0.4zM762.02053 944.7c-239 138.1-544.8 56.2-682.9-182.8S22.92053 217.1 261.92053 79.1s544.8-56.2 682.9 182.8c137.9 239 56.1 544.6-182.8 682.8z"
+                fill="#515151"
+                opacity=".5"
+                p-id="5971"
+              ></path>
+              <path
+                d="M898.12053 289.2C775.02053 76 502.42053 2.9 289.22053 126 76.02053 249.1 3.02053 521.6 126.02053 734.8 249.12053 948 521.62053 1021.1 734.82053 898 947.92053 774.9 1021.02053 502.4 898.12053 289.2zM731.62053 892.8C521.32053 1014.3 252.42053 942.2 131.02053 731.9 9.52053 521.6 81.62053 252.7 291.92053 131.3 502.12053 9.9 771.02053 81.8 892.42053 292c121.5 210.3 49.5 479.3-160.8 600.8z"
+                fill="#515151"
+                opacity=".5"
+                p-id="5972"
+              ></path>
+              <path
+                d="M323.62053 176.8c3.6-2 6 0.8 8.8 2.8 6 4.4 12.4 8.8 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.4 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.6 0.6-2zM200.72053 289.2c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 14.8 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.4-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.4-1.2 0-1.6 0.8-2.4l0.2 0.4z m276.6-159.6c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.8-1.2-0.4-1.6 0.4-2.4l0.2 0.4z m141.9 29.6c3.6-2 6 0.8 8.8 2.8l18.8 12.8c7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4-7.7 0.4-15.2 0.8-22.4 0.8-4.4 6.8-8.4 13.2-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.5-1.2 0.2-1.6 0.6-2zM150.02053 430c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-4 14-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.5 0.6-2z m558.9 414.4c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.1 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-1.1 0.8-1.1 1.6-1.1h0.1z m-158.8 50c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.1-3.7-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2-1 4.2-1.7 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.4-0.8 0.8-0.8 1.7-0.7z m276.5-159.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8s-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.2 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0-0.8 0.8-1.2 1.6-1.2l0.1 0.1z m45.6-137.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.2-0.7 0.6-0.7 1.4-0.7h0.3zM402.72053 868c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-0.8 1-1.1 1.7-1.1z"
+                fill="#515151"
+                opacity=".5"
+                p-id="5973"
+              ></path>
+              <path
+                d="M386.42053 590.4l-43.8-75.9L207.02053 592.7l10.2 17.7L334.02053 543l23.4 40.4-90.5 52.2-13.5-23.4-18.7 10.8 53.1 92c9.1 15.8 21.2 19.5 36.4 10.7l98.8-57c6.2-3.6 11-9.3 13.4-16.1-1.4-15.9-6.2-31.2-14.2-45l-21.4 4.8c6.7 10.3 11 21.9 12.8 34-1 3.3-3.2 6-6.1 7.8l-88.3 51c-6.2 3.6-11.1 2.1-14.8-4.3l-27.3-47.4 109.3-63.1z m2.9-103.2l10.4 18.1 65.6-37.9 79.9 138.4 18.6-10.8-55.9-96.9c18.8-0.9 43.2-0.6 73 0.7l1.5-23.1c-29.8-0.3-58.4 0.4-86 2.6l-12.5-21.6 74.9-43.2-10.4-18.1-159.1 91.8zM669.52053 329l38.2 66.2 61.4-35.4-38.1-66.1-61.5 35.3z m72.4 24.2l-26.3 15.2-19-33 26.3-15.2 19 33zM599.02053 356.7l7.9 13.7-23.3 13.5 9.8 17 21.8-12.6c7.5 18.7 6.6 39.6-2.5 57.6l20.7 4.4c10.3-23.1 10.3-49.4 0-72.5l18.8-10.9c6 9.2 10.7 19.2 14.2 29.7 0.3 5-2.6 9.7-7.2 11.7-2.9 1.2-6.4 2.8-10.9 4.9l14.1 14.1c3.7-1.3 7.3-2.9 10.7-4.8 8.6-3.9 14.4-12.2 15.2-21.6-5.4-22.1-14.6-43-27.4-61.8l-36.1 20.8-7.9-13.7-17.9 10.5z m29.9 108.1l10 17.4 53.2-30.7c-7.8 23.7-20.6 45.4-37.5 63.6l20.6 11.1c18.6-24.2 30-53.1 33-83.4l29.8 51.5 18.4-10.7-29.8-51.5c27.4 11.5 57.2 16.3 86.9 14.1l3.5-23.5c-24.7 5.1-50.1 5-74.8-0.1l53.5-30.9-10-17.3-69.3 40-7.3-12.6-18.4 10.7L698.02053 425l-69.1 39.8z"
+                fill="#515151"
+                opacity=".5"
+                p-id="5974"
+              ></path>
+            </svg>
+          </div>
+        </div>
+      </div>
+      <div class="bottom">
+        <a-pagination
+          size="small"
+          pageSize="4"
+          :total="total"
+          :current="page"
+          @change="handleCurrentChange"
+          @showSizeChange="handlePageSizeChange"
+          :showSizeChanger="false"
+        />
+      </div>
+    </div>
+    <div style="height: 640px;background: #fff;    padding-top: 200px;" v-else>
+      <a-empty  />
+    </div>
+     
       </div>
     </template>
     <!--UCS内部资源-->
@@ -405,7 +537,6 @@ const phoneVisible = ref(false)
 
 // 选择类型
 const changeType = (item, index) => {
-  debugger
   contentList.data = []
   formState.value.name = ''
 
@@ -425,11 +556,16 @@ const getChooseeList = () => {
     getCloudList()
   } else if (index == 3) {//视频
     getVideoList()
+  }else if (index == 1) {//数据
+    getDataList()
   }
 }
 //选择tab
 const handleTab = (index) => {
   chooseTab.value = index
+  if(index==1){
+    typeName.value = '数据资源'
+  }
   Object.keys(yunForm).map((key) => {
     delete yunForm[key]
   })
@@ -442,6 +578,13 @@ const handleTab = (index) => {
     cloudList.data=[]
     getCloudResource()
     getVideoList()
+  }else if (index == 1) {//数据
+    contentList.data=[]
+    getDataList()
+  }else{
+    contentList.data=[]
+    typeName.value = '能力申请'
+   getApplyList()
   }
 }
 const cloudSearchReserve = () => {
@@ -452,6 +595,8 @@ const cloudSearchReserve = () => {
     getCloudList()
   } else if (index == 3) {//视频
     getVideoList()
+  }else if (index == 1) {//数据
+    getDataList()
   }
 }
 //查询云资源数据
@@ -590,6 +735,7 @@ const showCloudDetail = (item) => {
   baseInfo.value = item
 
 }
+//ucs内部资源和数据资源用这个详情
 const showDetail = (item) => {
   cilckRowData.value = item
   // 西海岸-申请时间过期，提示
@@ -614,10 +760,10 @@ const showDetail = (item) => {
         message.error('数据请求失败！')
       }
     })
-  } else if (typeName.value == '数据资源申请') {
+  } else if (typeName.value == '数据资源') {
     yaweiApproveDetails({ applyGuid: item.GUID })
       .then((res) => {
-        console.log('详情===========>', res.data.data)
+        console.log('数据资源详情===========>', res.data.data)
         if (res.data.code !== 0) {
           message.error('数据请求失败！')
           return
@@ -834,6 +980,7 @@ function replacement() {
   name.value = ''
   getApplyList(name.value)
 }
+//UCS内部资源
 const getApplyList = () => {
   const params = {
     page: page.value,
@@ -988,6 +1135,35 @@ const getApplyList = () => {
     showType.value = ''
   }
 }
+//数据资源
+const getDataList = () => {
+  yaweiApproveStatus({ page: page.value, size: 4, title: '' }).then(
+        (res) => {
+          if (res.data.code !== 0) {
+            num.value = []
+            total.value = 0
+            contentList.data = []
+            contentList2.data = []
+            showType.value = ''
+            return
+          }
+          // let data1=[{
+          //   GUID:'aa',
+          //   title:'11',
+          //   ywlxr:'111',
+          //   ywlxrdh:'123',
+          //   BUSINESS_NAME:'123'
+
+          // }]
+          console.log('数据资源申请===============>', res.data.data)
+          contentList.data = res.data.data.data
+          contentList.data=data1
+          num.value = []
+          total.value = res.data.data.cos
+          showType.value = '数据资源申请'
+        }
+  )
+}
 const onSubmit = () => {
   contentList.data = contentList2.data.filter(
     (val) => val.BUSINESS_NAME.indexOf(formState.value.name) > -1
@@ -995,10 +1171,12 @@ const onSubmit = () => {
 }
 const handleCurrentChange = (val) => {
   page.value = val
-  if (chooseTab.value == 2) {
+  if (chooseTab.value == 2) {//云资源
     getCloudList()
   } else if (chooseTab.value == 3) {//视频资源
     getVideoList()
+  } else if (chooseTab.value == 1) {//数据资源
+    getDataList()
   } else {
     getApplyList()
   }
@@ -1010,6 +1188,8 @@ const handlePageSizeChange = (val) => {
     getCloudList()
   } else if (chooseTab.value == 3) {//视频资源
     getVideoList()
+  } else if (chooseTab.value == 1) {//视频资源
+    getDataList()
   } else {
     getApplyList()
   }
@@ -1026,7 +1206,6 @@ const viewDetail = (processDefinitionName, id, ended, businessKey) => {
     })
   }
   if (processDefinitionName == '能力资源上架') {
-    console.log('showDetail', id, businessKey, ended)
     router.push({
       path: '/details',
       query: {
@@ -1127,7 +1306,6 @@ const showPhoneModal = () => {
 }
 
 mybus.on('closeModal', (obj) => {
-  debugger
   detailsVisible.value = false
   obj.name=obj.type
   changeType(obj, obj.index)