diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index ea095c7b..4305c07b 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -2,9 +2,6 @@
   <div>
     <home-header></home-header>
     <div id="apply-container">
-      <!-- <aside>
-        <aside-menu></aside-menu>
-      </aside> -->
       <article>
         <div class="from-card" v-if="applySuccess && !applyAll">
           <AbilityToApplyFor :dataList="list"></AbilityToApplyFor>
@@ -126,59 +123,6 @@
                   />
                 </a-form-item>
               </div>
-              <!-- <div>
-                <a-form-item
-                  label="期望效果"
-                  name="effectWish"
-                  :rules="[{ required: true, message: '请输入期望效果' }]"
-                >
-                  <a-textarea
-                    placeholder="请输入期望效果"
-                    v-model:value="formName.effectWish"
-                    :rows="4"
-                  />
-                </a-form-item>
-              </div> -->
-              <!-- <a-form-item
-                style="color: #666; font-size: 16px"
-                label="申请单附件"
-                name="applyDoc"
-              >
-                <a-upload
-                  v-model:file-list="fileList"
-                  name="file"
-                  :action="`${baseURL}/upload`"
-                  :headers="headers"
-                  @change="handleChange"
-                  :before-upload="beforeUpload"
-                  :maxCount="1"
-                >
-                  <a-button
-                    style="
-                      width: 100px;
-                      height: 30px;
-                      margin-right: 10px;
-                      background: #edf4fc;
-                      color: #0087ff;
-                      font-size: 14px;
-                      border-radius: 6px;
-                      border: 1px solid #bbd3ef;
-                      padding: 0;
-                      text-align: center;
-                    "
-                  >
-                    <upload-outlined></upload-outlined>
-                    文件上传
-                  </a-button>
-                  <span style="font-size: 14px; color: #999">
-                    支持doc、docx、jpg、png、jpeg、pdf、xlxs、ppt类型文件
-                  </span>
-                  <div v-if="fileList.length < 1">
-                    <plus-outlined />
-                    <div style="margin-top: 8px">上传限一个文件</div>
-                  </div>
-                </a-upload>
-              </a-form-item> -->
               <div class="bottom-btn">
                 <a-button
                   style="
@@ -232,290 +176,237 @@
   </div>
 </template>
 <script>
-  import AbilityToApplyFor from './AbilityToApplyFor.vue'
-  import HomeHeader from '@/views/home/components/header'
-  import { reactive, ref, watch, onBeforeUnmount } from 'vue'
-  import { useRouter } from 'vue-router'
-  import { message } from 'ant-design-vue'
-  import qs from 'qs'
-  // import { UploadOutlined } from '@ant-design/icons-vue'
-  import { Upload } from 'ant-design-vue'
-  import {
-    lastestPage,
-    tabilityapplication,
-    startOfBusinessKey,
-    updateInstanceId,
-    submitApply,
-    applyAllApplication,
-    getUser,
-    getUserInfo,
-    relaunch,
-    selectOne,
-  } from '@/api/home'
-  import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
-  import mybus from '@/myplugins/mybus'
-  import { sgcDel, getApplyForm } from '@/api/personalCenter'
-  import { pageWithAttrs } from '@/api/home'
-  // import { baseURL } from '@/config'
-  // import AsideMenu from './components/asideMenu.vue'
-  export default {
-    name: '',
-    props: {},
-    components: {
-      HomeHeader,
-      AbilityToApplyFor,
-      // AsideMenu,
-      // UploadOutlined,
-    },
-    setup() {
-      const router = useRouter()
-      const disabled = ref(false)
-      const flag = ref(false)
-      const list = ref(JSON.parse(localStorage.getItem('applyList')))
-      const applyAll = router.currentRoute.value.query.applyAll
-      const num = ref(0)
-      if (!applyAll) {
-        list.value.map((item) => {
-          item.arr.map((val) => {
-            console.log(item, '组件===========================')
-            let obj = item.children
-              ? item.children.filter((type) => type.id == val.id)[0]
-              : val.type !== '应用资源'
-            if (obj) {
-              console.log('11111111111111111111111111111', obj, flag.value)
-              if (obj.type !== '应用资源') {
-                flag.value = true
-              }
+import AbilityToApplyFor from './AbilityToApplyFor.vue'
+import HomeHeader from '@/views/home/components/header'
+import { reactive, ref, watch, onBeforeUnmount } from 'vue'
+import { useRouter } from 'vue-router'
+import { message } from 'ant-design-vue'
+import qs from 'qs'
+import { Upload } from 'ant-design-vue'
+import {
+  lastestPage,
+  tabilityapplication,
+  startOfBusinessKey,
+  updateInstanceId,
+  submitApply,
+  applyAllApplication,
+  getUser,
+  getUserInfo,
+  relaunch,
+  selectOne,
+} from '@/api/home'
+import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
+import mybus from '@/myplugins/mybus'
+import { sgcDel, getApplyForm } from '@/api/personalCenter'
+import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
+export default {
+  name: '',
+  props: {},
+  components: {
+    HomeHeader,
+    AbilityToApplyFor,
+  },
+  setup() {
+    const router = useRouter()
+    const disabled = ref(false)
+    const flag = ref(false)
+    const list = ref(JSON.parse(localStorage.getItem('applyList')))
+    const integrationServicesItemInfo = ref(
+      JSON.parse(localStorage.getItem('integrationServicesItemInfo') || '{}')
+    )
+    console.log(
+      'integrationServicesItemInfo------------>',
+      integrationServicesItemInfo
+    )
+
+    const applyAll = router.currentRoute.value.query.applyAll
+    const num = ref(0)
+    if (!applyAll) {
+      list.value.map((item) => {
+        item.arr.map((val) => {
+          console.log(item, '组件===========================')
+          let obj = item.children
+            ? item.children.filter((type) => type.id == val.id)[0]
+            : val.type !== '应用资源'
+          if (obj) {
+            console.log('11111111111111111111111111111', obj, flag.value)
+            if (obj.type !== '应用资源') {
+              flag.value = true
             }
+          }
+        })
+        if (item.checkedList) {
+          console.log(item)
+          num.value += Number(item.checkedList.length)
+        }
+      })
+    }
+    console.log('list', list.value)
+    const baseURL = window.SITE_CONFIG.apiURL
+    let record = ref('1')
+    const text = ref('')
+    const formName = reactive({
+      title: applyAll
+        ? '全部应用资源申请'
+        : list.value[0].arr && list.value[0].arr[0].type == '单兵设备'
+        ? '单兵设备申请'
+        : list.value[0].children
+        ? '申请' +
+          list.value[0].children
+            .filter((val) => val.id == list.value[0].checkedList[0])[0]
+            .resourceName.concat(
+              num.value > 1 ? '等' + num.value + '项能力' : ''
+            )
+        : '申请' + list.value[0].arr[0].resourceName, // 标题
+      applicationSystem: '', // 应用系统
+      applicationScene: [], // 应用领域
+      applicationBackground: '', // 应用背景
+      effectWish: '', // 期望效果
+      user: '',
+      userId: '',
+      phone: '',
+      unit: '',
+      system: [],
+      enclosure: '', //附件
+      enclosureName: '', //附件
+    })
+    const dataList = ref([])
+    const id = router.currentRoute.value.query.id
+    const taskId = router.currentRoute.value.query.taskId
+    const businessKey = ref(router.currentRoute.value.query.id)
+    if (id) {
+      getApplyForm(id).then((res) => {
+        console.log('修改==============>', res.data.data)
+        formName.applicationSystem = res.data.data.applicationSystem || ''
+        formName.applicationScene = res.data.data.applicationScene || []
+        formName.applicationBackground =
+          res.data.data.applicationBackground || ''
+        formName.effectWish = res.data.data.effectWish || ''
+        formName.phone = res.data.data.phone || ''
+        formName.enclosure = res.data.data.enclosure || ''
+        formName.enclosureName = res.data.data.enclosureName || ''
+        if (res.data.data.enclosure) {
+          fileList.value.push({
+            name: res.data.data.enclosureName,
+            url: res.data.data.enclosure,
           })
-          if (item.checkedList) {
-            console.log(item)
-            num.value += Number(item.checkedList.length)
-          }
-        })
-      }
-      console.log(
-        'list',
-        list.value
-        // list.value[0].children.filter(
-        //   (val) => val.id == list.value[0].checkedList[0]
-        // )[0].resourceName
-      )
-      const baseURL = window.SITE_CONFIG.apiURL
-      let record = ref('1')
-      const text = ref('')
-      const formName = reactive({
-        title: applyAll
-          ? '全部应用资源申请'
-          : list.value[0].arr && list.value[0].arr[0].type == '单兵设备'
-          ? '单兵设备申请'
-          : list.value[0].children
-          ? '申请' +
-            list.value[0].children
-              .filter((val) => val.id == list.value[0].checkedList[0])[0]
-              .resourceName.concat(
-                num.value > 1 ? '等' + num.value + '项能力' : ''
-              )
-          : '申请' + list.value[0].arr[0].resourceName, // 标题
-        applicationSystem: '', // 应用系统
-        // applicationSystem: [], // 应用系统
-        applicationScene: [], // 应用领域
-        applicationBackground: '', // 应用背景
-        effectWish: '', // 期望效果
-        user: '',
-        userId: '',
-        phone: '',
-        unit: '',
-        system: [],
-        enclosure: '', //附件
-        enclosureName: '', //附件
+        }
       })
-      const dataList = ref([])
-      const id = router.currentRoute.value.query.id
-      const taskId = router.currentRoute.value.query.taskId
-      const businessKey = ref(router.currentRoute.value.query.id)
-      if (id) {
-        getApplyForm(id).then((res) => {
-          console.log('修改==============>', res.data.data)
-          // formName.id = res.data.data.id || ''
-          formName.applicationSystem = res.data.data.applicationSystem || ''
-          formName.applicationScene = res.data.data.applicationScene || []
-          formName.applicationBackground =
-            res.data.data.applicationBackground || ''
-          formName.effectWish = res.data.data.effectWish || ''
-          formName.phone = res.data.data.phone || ''
-          // formName.system = res.data.data.system || []
-          formName.enclosure = res.data.data.enclosure || ''
-          formName.enclosureName = res.data.data.enclosureName || ''
-          if (res.data.data.enclosure) {
-            fileList.value.push({
-              name: res.data.data.enclosureName,
-              url: res.data.data.enclosure,
-            })
-          }
-        })
-      }
-      getUser().then((res) => {
-        formName.user = res.data.data.realName
-        formName.userId = res.data.data.id
-        getUserInfo(formName.userId).then((res) => {
-          if (res.data.data.mobile) {
-            formName.phone = res.data.data.mobile
-          }
-          formName.unit = res.data.data.deptName
+    }
+    getUser().then((res) => {
+      formName.user = res.data.data.realName
+      formName.userId = res.data.data.id
+      getUserInfo(formName.userId).then((res) => {
+        if (res.data.data.mobile) {
+          formName.phone = res.data.data.mobile
+        }
+        formName.unit = res.data.data.deptName
+      })
+    })
+    const applicationSceneOpthion = ref([])
+    getCategoryTreePage({
+      page: 1,
+      limit: 20,
+      dictTypeId: '1513712507692818433',
+      deFlage: 0,
+    }).then((res) => {
+      res.data.data.list.map((val) => {
+        applicationSceneOpthion.value.push({
+          value: val.dictLabel,
+          label: val.dictLabel,
         })
       })
-      // console.log('本地存储====================》', list.value)
-      const applicationSceneOpthion = ref([])
-      getCategoryTreePage({
-        page: 1,
-        limit: 20,
-        dictTypeId: '1513712507692818433',
-        deFlage: 0,
-      }).then((res) => {
-        res.data.data.list.map((val) => {
-          applicationSceneOpthion.value.push({
-            value: val.dictLabel,
-            label: val.dictLabel,
-          })
-        })
-        // console.log('字典值========>', applicationSceneOpthion.value)
-      })
-      // console.log(formName.system)
-      const formRef = ref()
-      const applySuccess = ref(true)
-      // const rootObj = null
-      const dataForm = {
-        processDefinitionKey: 'abilityprocess',
-      }
-      const callbacks = {
-        startProcessSuccessCallback: null,
-        startProcessErrorCallback: null,
-        formSaveSuccessCallback: null,
-        formSaveErrorCallback: null,
-      }
-      const instanceIdUrl = '/processForm/tabilityapplication/updateInstanceId'
-      const formUrl = '/processForm/tabilityapplication'
-      //退出返回上一页
-      const resetFields = () => {
-        window.history.go(-1)
-      }
-      const processStartHandle = () => {
-        formRef.value.validate().then(() => {
-          if (!formUrl) {
-            return message.error('请设置保存表单的URL')
-          }
-          if (!formName) {
-            return message.error('请设置表单名称')
-          }
-          if (id) {
-            endProcess({ instanceId: taskId }).then((end) => {
-              if (end.data.code == 0) {
-                let ids = []
-                let falgNum = 0
-                let sxt = true
-                formName.system = []
-                console.log('list==================', list.value)
-                list.value.map((val) => {
-                  val.arr.map((item) => {
-                    if (item.type !== '基础设施') {
-                      falgNum++
-                    }
-                  })
-                })
-                list.value.map((val) => {
-                  val.arr.map((item) => {
-                    if (item.type !== '基础设施') {
-                      formName.system.push({
-                        resourceId: item.resourceId,
-                        resourceName: item.resourceName,
-                      })
-                      falgNum++
-                      console.log(item.id)
-                      if (item.id) {
-                        ids.push(item.id)
-                      }
-                    } else {
-                      let obj = {}
-                      Object.assign(obj, formName)
-                      console.log('摄像头===============>', obj, item)
-                      obj.system = []
-                      item.note1 = JSON.parse(item.note1)
-                      item.note1.map((sxt) => {
-                        obj.system.push({
-                          resourceId: sxt.idtCameraChannel + '',
-                          resourceName: sxt.channelName,
-                          cameraId: sxt.channelId, // 改接口后删除
-                          channelCode: sxt.channelCode,
-                          channelId: sxt.channelId,
-                          channelName: sxt.channelName,
-                          checkStatus: sxt.checkStatus + '',
-                          gpsX: sxt.gpsX,
-                          gpsY: sxt.gpsY,
-                          idtCameraChannel: sxt.idtCameraChannel + '',
-                          nodeName: sxt.nodeName,
-                          parentId: sxt.parentId,
-                          status: sxt.status + '',
-                        })
-                      })
-                      submitApply(obj).then((res) => {
-                        // applySuccess.value = false
-                        console.log('摄像头申请================>', res)
-                        if (item.id) {
-                          sgcDel({ ids: [item.id] }).then((res1) => {
-                            if (res1.data.msg === 'success') {
-                              if (falgNum == 0 && sxt) {
-                                message.success(
-                                  '申请提交成功，请到消息中心查看！'
-                                )
-                                sxt = false
-                              }
-                              mybus.emit('getSgcNum')
-                              router.push({
-                                path: '/DetailsPageconetent',
-                                query: {
-                                  select: '组件服务',
-                                },
-                              })
-                            }
-                          })
-                        } else {
-                          if (
-                            res.data.msg === 'success' &&
-                            falgNum == 0 &&
-                            sxt
-                          ) {
-                            message.success('申请提交成功，请到消息中心查看！')
-                            sxt = false
-                          }
-                          router.push({
-                            path: '/DetailsPageconetent',
-                            query: {
-                              select: '组件服务',
-                            },
-                          })
-                        }
-                      })
-                    }
-                  })
-                })
-                console.log(
-                  '提交数据==========================>',
-                  formName,
-                  ids
-                )
-                if (formName.system.length !== 0) {
-                  if (formName.applicationSystem.length == 0) {
-                    formName.applicationSystem = ''
+      // console.log('字典值========>', applicationSceneOpthion.value)
+    })
+    // console.log(formName.system)
+    const formRef = ref()
+    const applySuccess = ref(true)
+    const dataForm = {
+      processDefinitionKey: 'abilityprocess',
+    }
+    const callbacks = {
+      startProcessSuccessCallback: null,
+      startProcessErrorCallback: null,
+      formSaveSuccessCallback: null,
+      formSaveErrorCallback: null,
+    }
+    const instanceIdUrl = '/processForm/tabilityapplication/updateInstanceId'
+    const formUrl = '/processForm/tabilityapplication'
+    //退出返回上一页
+    const resetFields = () => {
+      window.history.go(-1)
+    }
+    const processStartHandle = () => {
+      debugger
+      formRef.value.validate().then(() => {
+        if (!formUrl) {
+          return message.error('请设置保存表单的URL')
+        }
+        if (!formName) {
+          return message.error('请设置表单名称')
+        }
+        if (id) {
+          endProcess({ instanceId: taskId }).then((end) => {
+            if (end.data.code == 0) {
+              let ids = []
+              let falgNum = 0
+              let sxt = true
+              formName.system = []
+              console.log('list==================', list.value)
+              list.value.map((val) => {
+                val.arr.map((item) => {
+                  if (item.type !== '基础设施') {
+                    falgNum++
                   }
-                  submitApply(formName).then((res) => {
-                    // applySuccess.value = false
-                    message.success('申请提交成功，请到消息中心查看！')
-                    console.log('能力申请================>', res)
-                    if (res.data.code == 0) {
-                      if (ids && ids.length > 0) {
-                        sgcDel({ ids: ids }).then((res) => {
-                          if (res.data.msg === 'success') {
+                })
+              })
+              list.value.map((val) => {
+                val.arr.map((item) => {
+                  if (item.type !== '基础设施') {
+                    formName.system.push({
+                      resourceId: item.resourceId,
+                      resourceName: item.resourceName,
+                    })
+                    falgNum++
+                    console.log(item.id)
+                    if (item.id) {
+                      ids.push(item.id)
+                    }
+                  } else {
+                    let obj = {}
+                    Object.assign(obj, formName)
+                    console.log('摄像头===============>', obj, item)
+                    obj.system = []
+                    item.note1 = JSON.parse(item.note1)
+                    item.note1.map((sxt) => {
+                      obj.system.push({
+                        resourceId: sxt.idtCameraChannel + '',
+                        resourceName: sxt.channelName,
+                        cameraId: sxt.channelId, // 改接口后删除
+                        channelCode: sxt.channelCode,
+                        channelId: sxt.channelId,
+                        channelName: sxt.channelName,
+                        checkStatus: sxt.checkStatus + '',
+                        gpsX: sxt.gpsX,
+                        gpsY: sxt.gpsY,
+                        idtCameraChannel: sxt.idtCameraChannel + '',
+                        nodeName: sxt.nodeName,
+                        parentId: sxt.parentId,
+                        status: sxt.status + '',
+                      })
+                    })
+                    submitApply(obj).then((res) => {
+                      // applySuccess.value = false
+                      console.log('摄像头申请================>', res)
+                      if (item.id) {
+                        sgcDel({ ids: [item.id] }).then((res1) => {
+                          if (res1.data.msg === 'success') {
+                            if (falgNum == 0 && sxt) {
+                              message.success(
+                                '申请提交成功，请到消息中心查看！'
+                              )
+                              sxt = false
+                            }
                             mybus.emit('getSgcNum')
                             router.push({
                               path: '/DetailsPageconetent',
@@ -526,6 +417,10 @@
                           }
                         })
                       } else {
+                        if (res.data.msg === 'success' && falgNum == 0 && sxt) {
+                          message.success('申请提交成功，请到消息中心查看！')
+                          sxt = false
+                        }
                         router.push({
                           path: '/DetailsPageconetent',
                           query: {
@@ -533,19 +428,197 @@
                           },
                         })
                       }
-                    } else {
-                      message.error('申请失败！')
-                    }
-                  })
+                    })
+                  }
+                })
+              })
+              console.log(
+                '提交数据============submitApply==============>',
+                formName,
+                ids
+              )
+              if (formName.system.length !== 0) {
+                if (formName.applicationSystem.length == 0) {
+                  formName.applicationSystem = ''
                 }
+                submitApply(formName).then((res) => {
+                  // applySuccess.value = false
+                  message.success('申请提交成功，请到消息中心查看！')
+                  console.log('能力申请================>', res)
+                  if (res.data.code == 0) {
+                    if (ids && ids.length > 0) {
+                      sgcDel({ ids: ids }).then((res) => {
+                        if (res.data.msg === 'success') {
+                          mybus.emit('getSgcNum')
+                          router.push({
+                            path: '/DetailsPageconetent',
+                            query: {
+                              select: '组件服务',
+                            },
+                          })
+                        }
+                      })
+                    } else {
+                      // todo 融合服务
+                      if (Object.keys(integrationServicesItemInfo).length > 0) {
+                        updateIntegrationServiceAction()
+                      }
+                      router.push({
+                        path: '/DetailsPageconetent',
+                        query: {
+                          select: '组件服务',
+                        },
+                      })
+                    }
+                  } else {
+                    message.error('申请失败！')
+                  }
+                })
               }
-            })
+            }
+          })
+        } else {
+          if (!applyAll) {
+            console.log(list.value[0].arr[0])
+            // 单兵设备为了演示 添加  不做处理
+            if (list.value[0].arr[0].type == '单兵设备') {
+              message.success('单兵设备申请提交成功！')
+              router.push({
+                path: '/DetailsPageconetent',
+                query: {
+                  select: '组件服务',
+                },
+              })
+            } else {
+              let ids = []
+              let falgNum = 0
+              let sxt = true
+              formName.system = []
+              console.log('list==================', list.value)
+              list.value.map((val) => {
+                val.arr.map((item) => {
+                  if (item.type !== '基础设施') {
+                    falgNum++
+                  }
+                })
+              })
+              list.value.map((val) => {
+                val.arr.map((item) => {
+                  if (item.type !== '基础设施') {
+                    formName.system.push({
+                      resourceId: item.resourceId,
+                      resourceName: item.resourceName,
+                    })
+                    falgNum++
+                    console.log(item.id)
+                    if (item.id) {
+                      ids.push(item.id)
+                    }
+                  } else {
+                    let obj = {}
+                    Object.assign(obj, formName)
+                    console.log('摄像头===============>', obj, item)
+                    obj.system = []
+                    item.note1 = JSON.parse(item.note1)
+                    item.note1.map((sxt) => {
+                      obj.system.push({
+                        resourceId: sxt.idtCameraChannel + '',
+                        resourceName: sxt.channelName,
+                        cameraId: sxt.channelId, // 改接口后删除
+                        channelCode: sxt.channelCode,
+                        channelId: sxt.channelId,
+                        channelName: sxt.channelName,
+                        checkStatus: sxt.checkStatus + '',
+                        gpsX: sxt.gpsX,
+                        gpsY: sxt.gpsY,
+                        idtCameraChannel: sxt.idtCameraChannel + '',
+                        nodeName: sxt.nodeName,
+                        parentId: sxt.parentId,
+                        status: sxt.status + '',
+                      })
+                    })
+                    submitApply(obj).then((res) => {
+                      // applySuccess.value = false
+                      console.log('摄像头申请================>', res)
+                      if (item.id) {
+                        sgcDel({ ids: [item.id] }).then((res1) => {
+                          if (res1.data.msg === 'success') {
+                            if (falgNum == 0 && sxt) {
+                              message.success(
+                                '申请提交成功，请到消息中心查看！'
+                              )
+                              sxt = false
+                            }
+                            mybus.emit('getSgcNum')
+                            router.push({
+                              path: '/DetailsPageconetent',
+                              query: {
+                                select: '组件服务',
+                              },
+                            })
+                          }
+                        })
+                      } else {
+                        if (res.data.msg === 'success' && falgNum == 0 && sxt) {
+                          message.success('申请提交成功，请到消息中心查看！')
+                          sxt = false
+                        }
+                        router.push({
+                          path: '/DetailsPageconetent',
+                          query: {
+                            select: '组件服务',
+                          },
+                        })
+                      }
+                    })
+                  }
+                })
+              })
+              console.log('提交数据==========================>', formName, ids)
+              if (formName.system.length !== 0) {
+                if (formName.applicationSystem.length == 0) {
+                  formName.applicationSystem = ''
+                }
+                submitApply(formName).then((res) => {
+                  // applySuccess.value = false
+                  message.success('申请提交成功，请到消息中心查看！')
+                  console.log('能力申请================>', res)
+                  if (res.data.code == 0) {
+                    if (ids && ids.length > 0) {
+                      sgcDel({ ids: ids }).then((res) => {
+                        if (res.data.msg === 'success') {
+                          mybus.emit('getSgcNum')
+                          router.push({
+                            path: '/DetailsPageconetent',
+                            query: {
+                              select: '组件服务',
+                            },
+                          })
+                        }
+                      })
+                    } else {
+                      // todo 融合服务
+                      if (Object.keys(integrationServicesItemInfo).length > 0) {
+                        updateIntegrationServiceAction()
+                      }
+                      router.push({
+                        path: '/DetailsPageconetent',
+                        query: {
+                          select: '组件服务',
+                        },
+                      })
+                    }
+                  } else {
+                    message.error('申请失败！')
+                  }
+                })
+              }
+            }
           } else {
-            if (!applyAll) {
-              console.log(list.value[0].arr[0])
-              // 单兵设备为了演示 添加  不做处理
-              if (list.value[0].arr[0].type == '单兵设备') {
-                message.success('单兵设备申请提交成功！')
+            formName.applicationSystem = ''
+            applyAllApplication(formName).then((res) => {
+              if (res.data.code == 0) {
+                message.success('申请提交成功，请到消息中心查看！')
                 router.push({
                   path: '/DetailsPageconetent',
                   query: {
@@ -553,430 +626,290 @@
                   },
                 })
               } else {
-                let ids = []
-                let falgNum = 0
-                let sxt = true
-                formName.system = []
-                console.log('list==================', list.value)
-                list.value.map((val) => {
-                  val.arr.map((item) => {
-                    if (item.type !== '基础设施') {
-                      falgNum++
-                    }
-                  })
-                })
-                list.value.map((val) => {
-                  val.arr.map((item) => {
-                    if (item.type !== '基础设施') {
-                      formName.system.push({
-                        resourceId: item.resourceId,
-                        resourceName: item.resourceName,
-                      })
-                      falgNum++
-                      console.log(item.id)
-                      if (item.id) {
-                        ids.push(item.id)
-                      }
-                    } else {
-                      let obj = {}
-                      Object.assign(obj, formName)
-                      console.log('摄像头===============>', obj, item)
-                      obj.system = []
-                      item.note1 = JSON.parse(item.note1)
-                      item.note1.map((sxt) => {
-                        obj.system.push({
-                          resourceId: sxt.idtCameraChannel + '',
-                          resourceName: sxt.channelName,
-                          cameraId: sxt.channelId, // 改接口后删除
-                          channelCode: sxt.channelCode,
-                          channelId: sxt.channelId,
-                          channelName: sxt.channelName,
-                          checkStatus: sxt.checkStatus + '',
-                          gpsX: sxt.gpsX,
-                          gpsY: sxt.gpsY,
-                          idtCameraChannel: sxt.idtCameraChannel + '',
-                          nodeName: sxt.nodeName,
-                          parentId: sxt.parentId,
-                          status: sxt.status + '',
-                        })
-                      })
-                      submitApply(obj).then((res) => {
-                        // applySuccess.value = false
-                        console.log('摄像头申请================>', res)
-                        if (item.id) {
-                          sgcDel({ ids: [item.id] }).then((res1) => {
-                            if (res1.data.msg === 'success') {
-                              if (falgNum == 0 && sxt) {
-                                message.success(
-                                  '申请提交成功，请到消息中心查看！'
-                                )
-                                sxt = false
-                              }
-                              mybus.emit('getSgcNum')
-                              router.push({
-                                path: '/DetailsPageconetent',
-                                query: {
-                                  select: '组件服务',
-                                },
-                              })
-                            }
-                          })
-                        } else {
-                          if (
-                            res.data.msg === 'success' &&
-                            falgNum == 0 &&
-                            sxt
-                          ) {
-                            message.success('申请提交成功，请到消息中心查看！')
-                            sxt = false
-                          }
-                          router.push({
-                            path: '/DetailsPageconetent',
-                            query: {
-                              select: '组件服务',
-                            },
-                          })
-                        }
-                      })
-                    }
-                  })
-                })
-                console.log(
-                  '提交数据==========================>',
-                  formName,
-                  ids
-                )
-                if (formName.system.length !== 0) {
-                  if (formName.applicationSystem.length == 0) {
-                    formName.applicationSystem = ''
-                  }
-                  submitApply(formName).then((res) => {
-                    // applySuccess.value = false
-                    message.success('申请提交成功，请到消息中心查看！')
-                    console.log('能力申请================>', res)
-                    if (res.data.code == 0) {
-                      if (ids && ids.length > 0) {
-                        sgcDel({ ids: ids }).then((res) => {
-                          if (res.data.msg === 'success') {
-                            mybus.emit('getSgcNum')
-                            router.push({
-                              path: '/DetailsPageconetent',
-                              query: {
-                                select: '组件服务',
-                              },
-                            })
-                          }
-                        })
-                      } else {
-                        router.push({
-                          path: '/DetailsPageconetent',
-                          query: {
-                            select: '组件服务',
-                          },
-                        })
-                      }
-                    } else {
-                      message.error('申请失败！')
-                    }
-                  })
-                }
+                message.error('申请失败！')
               }
-            } else {
-              formName.applicationSystem = ''
-              applyAllApplication(formName).then((res) => {
-                if (res.data.code == 0) {
-                  message.success('申请提交成功，请到消息中心查看！')
-                  router.push({
-                    path: '/DetailsPageconetent',
-                    query: {
-                      select: '组件服务',
-                    },
-                  })
-                } else {
-                  message.error('申请失败！')
-                }
-              })
+            })
+          }
+        }
+      })
+    }
+    // 启动流程
+    const startProcess = (processDefinitionKey, businessKey, formData) => {
+      var data = {
+        processDefinitionKey: processDefinitionKey,
+        businessKey: businessKey,
+        variables: formData,
+      }
+      startOfBusinessKey(data)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            if (callbacks.startProcessErrorCallback) {
+              callbacks.startProcessErrorCallback(res.data)
             }
           }
-        })
-      }
-      // 启动流程
-      const startProcess = (processDefinitionKey, businessKey, formData) => {
-        var data = {
-          processDefinitionKey: processDefinitionKey,
-          businessKey: businessKey,
-          variables: formData,
-        }
-        // proxy.$http['post']('/act/running/startOfBusinessKey', data)
-        startOfBusinessKey(data)
-          .then(({ data: res }) => {
-            // applySuccess.value = false
-            if (res.code !== 0) {
-              if (callbacks.startProcessErrorCallback) {
-                callbacks.startProcessErrorCallback(res.data)
+          message({
+            message: '操作成功',
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              if (callbacks.startProcessSuccessCallback) {
+                callbacks.startProcessSuccessCallback(res.data)
               }
-            }
-            message({
-              message: '操作成功',
-              type: 'success',
-              duration: 500,
-              onClose: () => {
-                if (callbacks.startProcessSuccessCallback) {
-                  callbacks.startProcessSuccessCallback(res.data)
-                }
-              },
-            })
-            if (instanceIdUrl) {
-              var params = qs.stringify({
-                processInstanceId: res.data.processInstanceId,
-                processDefinitionKey: processDefinitionKey,
-                businessKey: businessKey,
-              })
-              // proxy.$http['post'](instanceIdUrl + '?' + params)
-              updateInstanceId(params).then(
-                // ({ data: res }) => {}
-                () => {}
-              )
-            }
+            },
           })
-          .catch(() => {})
-      }
-      const options = ref([
-        {
-          value: '政法委',
-          label: '政法委',
-        },
-        {
-          value: '公安局',
-          label: '公安局',
-        },
-        {
-          value: '卫健委',
-          label: '卫健委',
-        },
-        {
-          value: '城市管理局',
-          label: '城市管理局',
-        },
-        {
-          value: '生态环境局',
-          label: '生态环境局',
-        },
-        {
-          value: '交通运输局',
-          label: '交通运输局',
-        },
-      ])
-      const systemOptions = ref([])
-      const systemOptions2 = ref([])
-      const handleChange = (info) => {
-        if (info.file.status !== 'uploading') {
-          // console.log(info.file, info.fileList)
-        }
-        if (info.file.status === 'done') {
-          message.success(`${info.file.name} 上传成功`)
-          formName.enclosure = info.file.response.data
-          formName.enclosureName = info.file.name
-        } else if (info.file.status === 'error') {
-          message.error(`${info.file.name} 上传失败`)
-        }
-      }
-      const beforeUpload = (file) => {
-        const isPNG =
-          file.type === 'image/png' ||
-          'image/doc' ||
-          'image/docx' ||
-          'image/jpg' ||
-          'image/png' ||
-          'image/jpeg' ||
-          'image/pdf' ||
-          'image/xlxs' ||
-          'image/ppt'
-        if (!isPNG) {
-          message.error(`上传失败`)
-        }
-        return isPNG || Upload.LIST_IGNORE
-      }
-      const fileList = ref([])
-      // 应用系统下拉
-      const systemHandleChange = (value) => {
-        console.log(`selected ${value}`)
-      }
-      const systemHandleSearch = (value) => {
-        // console.log(`search ${value}`)
-        // text.value = value
-        // systemOptions.value = systemOptions2.value.filter(
-        //   (item) => item.label.search(text.value) > -1
-        // )
-        let valueArray = []
-        systemOptions.value.map((val) => {
-          valueArray.push(val.value)
-        })
-        if (valueArray.indexOf(value) == -1) {
-          systemOptions.value.push({
-            value: value,
-            label: value,
-          })
-        }
-      }
-      pageWithAttrs({
-        pageNum: 1,
-        pageSize: 99999,
-        type: '应用资源',
-        name: '',
-        infoList: [],
-      }).then((res) => {
-        if (res.data.code == 0) {
-          if (res.data.data.records.length == 0) {
-            message.warning('该关键词，暂无应用资源！')
-          } else {
-            res.data.data.records.map((val) => {
-              systemOptions2.value.push({
-                value: val.name,
-                label: val.name,
-              })
+          if (instanceIdUrl) {
+            var params = qs.stringify({
+              processInstanceId: res.data.processInstanceId,
+              processDefinitionKey: processDefinitionKey,
+              businessKey: businessKey,
             })
-            // console.log('第一次获取===================>', systemOptions2.value)
+            updateInstanceId(params).then(
+              () => {}
+            )
           }
+        })
+        .catch(() => {})
+    }
+    const options = ref([
+      {
+        value: '政法委',
+        label: '政法委',
+      },
+      {
+        value: '公安局',
+        label: '公安局',
+      },
+      {
+        value: '卫健委',
+        label: '卫健委',
+      },
+      {
+        value: '城市管理局',
+        label: '城市管理局',
+      },
+      {
+        value: '生态环境局',
+        label: '生态环境局',
+      },
+      {
+        value: '交通运输局',
+        label: '交通运输局',
+      },
+    ])
+    const systemOptions = ref([])
+    const systemOptions2 = ref([])
+    const handleChange = (info) => {
+      if (info.file.status !== 'uploading') {
+        // console.log(info.file, info.fileList)
+      }
+      if (info.file.status === 'done') {
+        message.success(`${info.file.name} 上传成功`)
+        formName.enclosure = info.file.response.data
+        formName.enclosureName = info.file.name
+      } else if (info.file.status === 'error') {
+        message.error(`${info.file.name} 上传失败`)
+      }
+    }
+    const beforeUpload = (file) => {
+      const isPNG =
+        file.type === 'image/png' ||
+        'image/doc' ||
+        'image/docx' ||
+        'image/jpg' ||
+        'image/png' ||
+        'image/jpeg' ||
+        'image/pdf' ||
+        'image/xlxs' ||
+        'image/ppt'
+      if (!isPNG) {
+        message.error(`上传失败`)
+      }
+      return isPNG || Upload.LIST_IGNORE
+    }
+    const fileList = ref([])
+    // 应用系统下拉
+    const systemHandleChange = (value) => {
+      console.log(`selected ${value}`)
+    }
+    const systemHandleSearch = (value) => {
+      let valueArray = []
+      systemOptions.value.map((val) => {
+        valueArray.push(val.value)
+      })
+      if (valueArray.indexOf(value) == -1) {
+        systemOptions.value.push({
+          value: value,
+          label: value,
+        })
+      }
+    }
+    pageWithAttrs({
+      pageNum: 1,
+      pageSize: 99999,
+      type: '应用资源',
+      name: '',
+      infoList: [],
+    }).then((res) => {
+      if (res.data.code == 0) {
+        if (res.data.data.records.length == 0) {
+          message.warning('该关键词，暂无应用资源！')
         } else {
-          message.error('应用系统获取数据失败!')
+          res.data.data.records.map((val) => {
+            systemOptions2.value.push({
+              value: val.name,
+              label: val.name,
+            })
+          })
+          // console.log('第一次获取===================>', systemOptions2.value)
         }
-      })
-      const handleBlur = () => {
-        console.log('blur')
+      } else {
+        message.error('应用系统获取数据失败!')
       }
-      const handleFocus = () => {
-        console.log('focus')
-        // console.log(formName.applicationSystem)
-        // formName.applicationSystem = []
-        let arrId = []
-        for (var valueIndex of systemOptions2.value) {
-          if (arrId.indexOf(valueIndex['value']) == -1) {
-            arrId.push(valueIndex['value'])
-            systemOptions.value.push(valueIndex)
-          }
+    })
+    const handleBlur = () => {
+      console.log('blur')
+    }
+    const handleFocus = () => {
+      console.log('focus')
+      let arrId = []
+      for (var valueIndex of systemOptions2.value) {
+        if (arrId.indexOf(valueIndex['value']) == -1) {
+          arrId.push(valueIndex['value'])
+          systemOptions.value.push(valueIndex)
         }
-        // systemOptions.value = systemOptions2.value
-        // systemOptions.value = []
       }
-      // const filterOption = (input, option) => {
-      //   return option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      // }
-      onBeforeUnmount(() => {
-        mybus.off('reomveOldData')
+    }
+ 
+    onBeforeUnmount(() => {
+      mybus.off('reomveOldData')
+    })
+
+    // 融合服务-更新 todo
+    const updateIntegrationServiceAction = () => {
+      let _applyCount = Number(integrationServicesItemInfo.value.applyCount || 0) + 1
+      let _data = Object.assign({}, integrationServicesItemInfo.value, {
+        applyCount: _applyCount,
       })
-      return {
-        formRef,
-        formName,
-        instanceIdUrl,
-        formUrl,
-        processStartHandle,
-        resetFields,
-        startProcess,
-        options,
-        fileList,
-        list,
-        headers: {
-          authorization: 'authorization-text',
-        },
-        handleChange,
-        applySuccess,
-        disabled,
-        baseURL,
-        beforeUpload,
-        dataList,
-        systemHandleChange,
-        systemHandleSearch,
-        handleBlur,
-        handleFocus,
-        systemOptions,
-        applicationSceneOpthion,
-        flag,
-        applyAll,
-      }
-    },
-  }
+      updateIntegrationServices(_data)
+        .then((res) => {
+          console.log('res---更新--------->', res)
+        })
+        .catch((err) => {
+          console.log('err----更新-------->', err)
+        })
+    }
+    return {
+      formRef,
+      formName,
+      instanceIdUrl,
+      formUrl,
+      processStartHandle,
+      resetFields,
+      startProcess,
+      options,
+      fileList,
+      list,
+      headers: {
+        authorization: 'authorization-text',
+      },
+      handleChange,
+      applySuccess,
+      disabled,
+      baseURL,
+      beforeUpload,
+      dataList,
+      systemHandleChange,
+      systemHandleSearch,
+      handleBlur,
+      handleFocus,
+      systemOptions,
+      applicationSceneOpthion,
+      flag,
+      applyAll,
+    }
+  },
+}
 </script>
 <style scoped lang="less">
-  #apply-container {
-    // background-color: #f5f8fc;
-    height: 100%;
-    width: 100%;
-    margin: 0.8rem auto 0;
+#apply-container {
+  // background-color: #f5f8fc;
+  height: 100%;
+  width: 100%;
+  margin: 0.8rem auto 0;
+  display: flex;
+  justify-content: space-between;
+  aside {
+    width: 282px;
+    height: 96%;
+    overflow-y: auto;
+    background-color: #fff;
+    margin: 1% 0 3%;
+  }
+  article {
+    width: 1090px;
+    height: 99%;
+    overflow-y: auto;
+    background-color: #fff;
+    margin: 1% auto;
+  }
+  .form-container {
+    padding: 20px 20px 30px 20px;
+    .title {
+      font-size: 20px;
+      color: #000;
+      font-weight: bold;
+      margin-bottom: 20px;
+    }
+  }
+  .base-info {
     display: flex;
     justify-content: space-between;
-    aside {
-      width: 282px;
-      height: 96%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 1% 0 3%;
-    }
-    article {
-      width: 1090px;
-      height: 99%;
-      overflow-y: auto;
-      background-color: #fff;
-      margin: 1% auto;
-    }
-    .form-container {
-      padding: 20px 20px 30px 20px;
-      .title {
-        font-size: 20px;
-        color: #000;
-        font-weight: bold;
-        margin-bottom: 20px;
+  }
+  :deep(.ant-form-item-label) {
+    label {
+      color: #666;
+      font-size: 16px;
+      &::after {
+        content: '';
       }
     }
-    .base-info {
-      display: flex;
-      justify-content: space-between;
-    }
-    :deep(.ant-form-item-label) {
-      label {
-        color: #666;
-        font-size: 16px;
-        &::after {
-          content: '';
-        }
-      }
-    }
-    :deep(.ant-form-item-required) {
-      &::before {
-        font-size: 8px;
-        margin-right: 10px;
-      }
-    }
-    :deep(.ant-input) {
-      border: 1px solid #e0e0e0;
-      border-radius: 6px;
-    }
-    .success {
-      div {
-        width: 100px;
-        margin: 80px auto 40px;
-      }
-      text-align: center;
-      font-size: 20px;
-      font-weight: bold;
-      color: #000;
+  }
+  :deep(.ant-form-item-required) {
+    &::before {
+      font-size: 8px;
+      margin-right: 10px;
     }
   }
-  .applicationScene {
-    :deep(.ant-select-selector) {
-      overflow-x: scroll;
-    }
-    :deep(.ant-select-selection-overflow) {
-      flex-wrap: nowrap;
+  :deep(.ant-input) {
+    border: 1px solid #e0e0e0;
+    border-radius: 6px;
+  }
+  .success {
+    div {
+      width: 100px;
+      margin: 80px auto 40px;
     }
+    text-align: center;
+    font-size: 20px;
+    font-weight: bold;
+    color: #000;
   }
-  textarea {
-    resize: none;
-    font-size: 14px;
+}
+.applicationScene {
+  :deep(.ant-select-selector) {
+    overflow-x: scroll;
   }
-  .bottom-btn {
-    display: flex;
-    justify-content: center;
-    // position: fixed;
+  :deep(.ant-select-selection-overflow) {
+    flex-wrap: nowrap;
   }
+}
+textarea {
+  resize: none;
+  font-size: 14px;
+}
+.bottom-btn {
+  display: flex;
+  justify-content: center;
+  // position: fixed;
+}
 </style>
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index e9361ecb..0096d28f 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -255,10 +255,6 @@
       case '融合服务':
         router.push({
           path: '/integrationServices',
-          //  path: '/DetailsPageconetent',
-          query: {
-            select: '融合服务',
-          },
         })
         break
       case 'CIM专区':
diff --git a/front/src/views/home/components/integrationServiceOrder.vue b/front/src/views/home/components/integrationServiceOrder.vue
new file mode 100644
index 00000000..224874c8
--- /dev/null
+++ b/front/src/views/home/components/integrationServiceOrder.vue
@@ -0,0 +1,103 @@
+<template>
+  <ul class="integrationServiceOrder">
+    <li
+      v-for="(item, i) in integrationOrderList"
+      :key="i"
+      @click="
+        changeOrder(i, item.value, item.orderType == 'DESC' ? 'ASC' : 'DESC')
+      "
+    >
+      {{ item.name }}
+      <span
+        class="arrow"
+        :class="
+          integrationOrder.orderType == 'ASC' &&
+          integrationOrder.orderField == item.value
+            ? 'down'
+            : ''
+        "
+      ></span>
+    </li>
+  </ul>
+</template>
+<script setup>
+import { ref, reactive, nextTick, defineExpose } from 'vue'
+import mybus from '@/myplugins/mybus'
+
+const orderList = [
+  {
+    value: 'apply_count',
+    name: '申请量',
+    orderType: 'DESC',
+  },
+  {
+    value: 'collectCount',
+    name: '收藏量',
+    orderType: 'DESC',
+  },
+  {
+    value: 'create_date',
+    name: '发布时间',
+    orderType: 'DESC',
+  },
+  {
+    value: 'update_date',
+    name: '更新时间',
+    orderType: 'DESC',
+  },
+]
+const integrationOrderList = ref(JSON.parse(JSON.stringify(orderList)))
+const integrationOrder = reactive({
+  orderField: '',
+  orderType: '',
+})
+
+// 融合服务--排序
+const changeOrder = (i, val, type) => {
+  let newType = type
+  integrationOrder.orderField = val
+  integrationOrder.orderType = newType
+  integrationOrderList.value[i].orderType = newType
+  mybus.emit('changeCondition', {
+    orderField: val,
+    orderType: newType,
+  })
+}
+
+const reset = () => {
+  integrationOrderList.value = JSON.parse(JSON.stringify(orderList))
+  integrationOrder.orderField = ''
+  integrationOrder.orderType = ''
+}
+defineExpose({
+  reset,
+})
+</script>
+<style lang="less" scoped>
+.integrationServiceOrder {
+  display: flex;
+
+  li {
+    width: 90px;
+    height: 12px;
+    text-align: center;
+    cursor: pointer;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .arrow {
+      display: inline-block;
+      width: 12px;
+      height: 12px;
+      background: url('~@/assets/newHome/arrow.png');
+      margin-left: 10px;
+    }
+
+    .down {
+      background: url('~@/assets/newHome/down.png');
+      margin-top: 6px;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 9a2cbcf7..f4f87432 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -1,7 +1,6 @@
 <template>
   <div id="search-result-list-container">
     <div class="shai-xuan">
-      <!-- <div class="circle">!</div> -->
       <div class="result">
         检测结果:
         <span>{{ resourceTotal || '' }}</span>
@@ -10,23 +9,12 @@
         }}
       </div>
       <div class="condition" :key="showKey">
-        <ul
+        <IntegrationServiceOrder
+          ref="integrationServiceOrderDom"
           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>
-          </li>
-        </ul>
+        ></IntegrationServiceOrder>
         <ul v-else>
           <li
             v-for="item in selList"
@@ -167,48 +155,6 @@
                   p-id="3065"
                 ></path>
               </svg>
-              <!-- 审核中 -->
-              <!-- <svg
-                t="1652322568870"
-                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 == '已申请' && item.approveStatus == '审核中'
-                "
-                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>
-                <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>
-              </svg>
-              <span
-                v-if="
-                  item.applyState == '已申请' && item.approveStatus == '审核中'
-                "
-                style="
-                  font-size: 12px;
-                  -webkit-transform: scale(0.75);
-                  color: #d81e06;
-                  position: relative;
-                  left: -35px;
-                  top: -0.6px;
-                  font-weight: 500;
-                "
-              >
-                审核中
-              </span> -->
             </span>
             <div class="header-right">
               <div
@@ -285,7 +231,6 @@
                 <div
                   v-if="
                     selectCardsname !== '数据资源' &&
-                    selectCardsname !== '融合服务' &&
                     selectCardsname !== '赋能场景' &&
                     (selectCardsname !== '应用资源' || whoShow1.itShowQingDao)
                   "
@@ -407,941 +352,857 @@
   </div>
 </template>
 <script>
-  import { ref, reactive } from 'vue'
-  import { message } from 'ant-design-vue'
-  import { useRouter } from 'vue-router'
-  import { getUser, sgcInsert } from '@/api/home'
-  import { scInsert, scDel } from '@/api/personalCenter'
-  import mybus from '@/myplugins/mybus'
-  import { getHls } from '@/api/home.js'
-  export default {
-    name: '',
-    // props: ['resourceList', 'resourceTotal', 'selectCardsname'],
-    props: {
-      resourceList: {
-        type: Object,
-        default: () => {},
-      },
-      resourceTotal: {
-        type: String,
-        default: '0',
-      },
-      selectCardsname: {
-        type: String,
-        default: '组件服务',
-      },
+import { ref, reactive, nextTick } from 'vue'
+import { message } from 'ant-design-vue'
+import { useRouter } from 'vue-router'
+import { getUser, sgcInsert } from '@/api/home'
+import { scInsert, scDel } from '@/api/personalCenter'
+import mybus from '@/myplugins/mybus'
+import { getHls } from '@/api/home.js'
+import IntegrationServiceOrder from './integrationServiceOrder.vue'
+export default {
+  name: '',
+  props: {
+    resourceList: {
+      type: Object,
+      default: () => {},
     },
-    computed: {
-      dataList() {
-        const newArr = []
-        for (let i = 0; i < this.resourceList.data.length; i++) {
-          let arr = [
-            {
-              name: '应用名称',
-              value: '',
-            },
-            {
-              name: '应用ID',
-              value: '',
-              dataResourceId: '',
-            },
-            {
-              name: '应用领域',
-              value: '',
-            },
-            {
-              name: '组件类型',
-              value: '',
-            },
-            {
-              name: '技术领域',
-              value: '',
-            },
-            {
-              name: '共享类型',
-              value: '',
-            },
-            {
-              name: '共享条件',
-              value: '',
-            },
-          ]
-          arr.map((item) => {
-            if (item.name === '应用名称') {
-              item.value = this.resourceList.data[i].name
-            }
-            if (item.name === '应用ID') {
-              item.value = this.resourceList.data[i].id
-              item.dataResourceId =
-                this.resourceList.data[i].infoList[0].dataResourceId
-            }
-            if (item.name === '应用领域') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '应用领域' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '组件类型') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '组件类型' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '技术领域') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '技术领域' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '共享类型') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '共享类型' ? (item.value = aa.attrValue) : ''
-              })
-            }
-            if (item.name === '共享条件') {
-              this.resourceList.data[i].infoList.map((aa) => {
-                aa.attrType === '共享条件' ? (item.value = aa.attrValue) : ''
-              })
-            }
-          })
-          newArr.push(arr)
-        }
-        console.log(
-          'dataList======================>',
-          newArr,
-          this.resourceList
-        )
-        return newArr
-      },
-      isShoppingCartOrNot() {
-        return ''
-      },
+    resourceTotal: {
+      type: String,
+      default: '0',
     },
-    components: {},
-    setup(props) {
-      // eslint-disable-next-line no-undef
-      const whoShow1 = whoShow
-      const showKey = ref(0)
-      let shoppingKey = ref(1)
-      // 融合服务排序
-      const orderList = ref([
-        {
-          value: 'collectCount',
-          name: '收藏量',
-          orderType: 'DESC',
-        },
-        {
-          value: 'create_date',
-          name: '发布时间',
-          orderType: 'DESC',
-        },
-        {
-          value: 'update_date',
-          name: '更新时间',
-          orderType: 'DESC',
-        },
-      ])
-      // 购物车id列表
-      const selList = ref([
-        { name: '发布时间', value: 'tdr.create_date', show: true },
-        { name: '浏览量', value: 'visits', show: true },
-        { name: '申请量', value: 'applyCount', show: true },
-        { name: '收藏量', value: 'collectCount', show: true },
-        { name: '评分', value: 'score', show: true },
-      ])
-      if (props.selectCardsname === '基础设施') {
-        selList.value.map((val) => (val.show = false))
-      } else if (props.selectCardsname === '数据资源') {
-        selList.value.map(
-          (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
-        )
-      }
-      const findComponentName = (list, name) => {
-        if (list.infoList) {
-          return list.infoList.find((item) => {
-            if (item.attrType === '组件类型') {
-              return item.attrValue === name
-            }
-          })
-        }
-      }
-      console.log('this.resourceList', props.resourceList.data)
-      props.resourceList.data.map((val) => {
-        if (val.infoList) {
-          let obj = val.infoList.filter(
-            (item) => item.attrType == '组件类型'
-          )[0]
-          if (obj) {
-            switch (obj.attrValue) {
-              case '智能算法':
-                val.applicationType = 'znsf'
-                break
-              case '图层服务':
-                val.applicationType = 'tcfw'
-                break
-              case '开发组件':
-                val.applicationType = 'kfzj'
-                break
-              case '业务组件':
-                val.applicationType = 'ywzj'
-                break
-            }
-            console.log('obj', val.applicationType)
-          }
-        }
-      })
-      showKey.value++
-      const selData = ref('total')
-      const flag = ref(true)
-      // userId
-      const userId = ref('')
-      getUser().then((res) => {
-        console.log('getUser============>', res)
-        userId.value = res.data.data.id
-      })
-      const resultList = [1, 2, 3, 4]
-      const router = useRouter()
-      const cardType = router.currentRoute.value.query.select
-      const onSearch = (searchValue) => {
-        console.log('use value', searchValue)
-        console.log('or use this.value', searchValue.value)
-      }
-      function toView(type, item) {
-        debugger
-        if (props.selectCardsname == '数据资源') {
-          if (whoShow1.itShowQingDao) {
-            window.open(
-              'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
-                item.guid
-            )
-          } else {
-            window.open(
-              'http://10.134.135.24:30090/#/home?id=' + item.serviceId
-            )
-          }
-        } else if (props.selectCardsname === '融合服务') {
-          // 打包模式
-          router.push({
-            path: '/packagingDetails',
-            query: {
-              id: item.id,
-            },
-          })
-        } else if (props.selectCardsname === '赋能场景') {
-          router.push({
-            path: '/integrationServicesDetails',
-            query: {
-              id: item.id,
-            },
-          })
-        } else {
-          if (type === 'apply') {
-            // 外部服务地址跳转到外部
-            const webUrl = item.infoList.filter(
-              (val) => val.attrType == '外部服务地址'
-            )[0]?.attrValue
-            if (webUrl) {
-              window.open(webUrl)
-            } else {
-              if (
-                !(
-                  props.selectCardsname === '应用资源' ||
-                  props.selectCardsname === '组件服务'
-                ) ||
-                whoShow1.itShowBaoTou
-              ) {
-                return
-              }
-              // 内部跳转申请页面
-              console.log('一键申请===================>', item)
-              localStorage.setItem(
-                'applyList',
-                JSON.stringify([
-                  {
-                    arr: [
-                      {
-                        delFlag: item.delFlag,
-                        description: item.description,
-                        resourceId: item.id,
-                        resourceName: item.name,
-                        time: item.createDate,
-                        type: item.type,
-                        componentType:
-                          (item.infoList.filter(
-                            (val) => val.attrType == '组件类型'
-                          )[0] &&
-                            item.infoList.filter(
-                              (val) => val.attrType == '组件类型'
-                            )[0].attrValue) ||
-                          '',
-                      },
-                    ],
-                    deptId: item.deptId,
-                    deptName: item.deptName,
-                  },
-                ])
-              )
-              router.push({
-                path: '/apply',
-              })
-            }
-          } else {
-            console.log(
-              '111111111111111111===========>',
-              router,
-              props.selectCardsname
-            )
-            router.push({
-              path: '/details',
-              query: {
-                id: item.id,
-              },
-            })
-          }
-        }
-      }
-      // 加入申购车
-      const addShoppingCart = (item, index) => {
-        console.log('item===============>', item)
-        if (flag.value && item.id) {
-          flag.value = false
-          sgcInsert({
-            delFlag: '0',
-            resourceId: item.id,
-            // userId: userId.value,
-          }).then((res) => {
-            console.log(res)
-            message.success('添加申购车成功！')
-            mybus.emit('getSgcNum')
-            mybus.emit('changeSelcted', index)
-            flag.value = true
-          })
-        }
-        shoppingKey.value++
-        // 查询申购车中已有id,用于过滤图标
-      }
-      // 添加收藏
-      const addCollect = (item) => {
-        console.log('收藏===============>', item, flag.value)
-        if (flag.value && item.id) {
-          flag.value = false
-          if (item.isCollect == 'true') {
-            scDel([item.id]).then((res) => {
-              if (res.data.msg === 'success') {
-                message.success('取消成功')
-                item.isCollect = 'false'
-                item.collectCount--
-                flag.value = true
-                console.log('收藏2===============>', res.data, flag.value)
-              }
-            })
-          } else {
-            scInsert([
-              {
-                resourceId: item.id,
-              },
-            ]).then((res) => {
-              if (res.data.msg === 'success') {
-                message.success('添加收藏成功！')
-                item.isCollect = 'true'
-                item.collectCount++
-                flag.value = true
-                console.log('收藏2===============>', res.data, flag.value)
-              }
-            })
-          }
-        }
-      }
-      // 更换查询条件
-      const changeCondition = (val) => {
-        selData.value = selData.value == val ? 'total' : val
-        const orderType = selData.value == val ? 'ASC' : 'DESC'
-        mybus.emit('changeCondition', {
-          orderField: val,
-          orderType: orderType,
-        })
-        console.log('选择===========》', val, selData.value)
-      }
-
-      // 融合服务--排序
-      const changeOrder = (i, val, type) => {
-        let newType = type === 'DESC' ? 'ASC' : 'DESC'
-        orderList.value[i].orderType = newType
-        mybus.emit('changeCondition', {
-          orderField: val,
-          orderType: newType,
-        })
-      }
-
-      // 融合服务--一键申请
-      // 一键申请
-      const handleAKeyApplication = (item) => {
-        let _applyList = []
-        let fuseResourceList = item.fuseResourceList || []
-        let jcssArray = fuseResourceList.filter((v) => v.type === '基础设施')
-        let otherArray = fuseResourceList.filter((v) => v.type !== '基础设施')
-        jcssArray = jcssArray.map((v) => {
-          v = Object.assign(v, v.resource)
-          return v
-        })
-        let jcss = [
+    selectCardsname: {
+      type: String,
+      default: '组件服务',
+    },
+  },
+  computed: {
+    dataList() {
+      const newArr = []
+      for (let i = 0; i < this.resourceList.data.length; i++) {
+        let arr = [
           {
-            arr: [
-              {
-                description: '',
-                note1: JSON.stringify(jcssArray),
-                resourceId: '1522550195055828996',
-                resourceName: '摄像头列表',
-                type: '基础设施',
-              },
-            ],
-            deptId: '',
-            deptName: '',
+            name: '应用名称',
+            value: '',
+          },
+          {
+            name: '应用ID',
+            value: '',
+            dataResourceId: '',
+          },
+          {
+            name: '应用领域',
+            value: '',
+          },
+          {
+            name: '组件类型',
+            value: '',
+          },
+          {
+            name: '技术领域',
+            value: '',
+          },
+          {
+            name: '共享类型',
+            value: '',
+          },
+          {
+            name: '共享条件',
+            value: '',
           },
         ]
-        if (infrastructure) {
-          jcss[0].deptId = infrastructure.deptId
-          jcss[0].deptName = infrastructure.deptName
-        }
-        otherArray.map((v) => {
-          let resource = v.resource || {}
-          console.log('resource------------>', resource)
-          let obj = {
-            arr: [
-              {
-                delFlag: resource.delFlag,
-                description: resource.description,
-                resourceId: resource.id,
-                resourceName: resource.name,
-                time: resource.createDate,
-                type: resource.type,
-              },
-            ],
-            deptId: resource.deptId,
-            deptName: resource.deptName,
+        arr.map((item) => {
+          if (item.name === '应用名称') {
+            item.value = this.resourceList.data[i].name
+          }
+          if (item.name === '应用ID') {
+            item.value = this.resourceList.data[i].id
+            item.dataResourceId =
+              this.resourceList.data[i].infoList[0].dataResourceId
+          }
+          if (item.name === '应用领域') {
+            this.resourceList.data[i].infoList.map((aa) => {
+              aa.attrType === '应用领域' ? (item.value = aa.attrValue) : ''
+            })
+          }
+          if (item.name === '组件类型') {
+            this.resourceList.data[i].infoList.map((aa) => {
+              aa.attrType === '组件类型' ? (item.value = aa.attrValue) : ''
+            })
+          }
+          if (item.name === '技术领域') {
+            this.resourceList.data[i].infoList.map((aa) => {
+              aa.attrType === '技术领域' ? (item.value = aa.attrValue) : ''
+            })
+          }
+          if (item.name === '共享类型') {
+            this.resourceList.data[i].infoList.map((aa) => {
+              aa.attrType === '共享类型' ? (item.value = aa.attrValue) : ''
+            })
+          }
+          if (item.name === '共享条件') {
+            this.resourceList.data[i].infoList.map((aa) => {
+              aa.attrType === '共享条件' ? (item.value = aa.attrValue) : ''
+            })
           }
-          _applyList.push(obj)
         })
-        _applyList = jcss.concat(_applyList)
-        localStorage.setItem('applyList', JSON.stringify(_applyList))
-        router.push({
-          path: '/apply',
+        newArr.push(arr)
+      }
+      console.log('dataList======================>', newArr, this.resourceList)
+      return newArr
+    },
+    isShoppingCartOrNot() {
+      return ''
+    },
+  },
+  components: {
+    IntegrationServiceOrder,
+  },
+  setup(props) {
+    const whoShow1 = whoShow
+    const showKey = ref(0)
+    let shoppingKey = ref(1)
+    const integrationServiceOrderDom = ref(null);
+
+    // 购物车id列表
+    const selList = ref([
+      { name: '发布时间', value: 'tdr.create_date', show: true },
+      { name: '浏览量', value: 'visits', show: true },
+      { name: '申请量', value: 'applyCount', show: true },
+      { name: '收藏量', value: 'collectCount', show: true },
+      { name: '评分', value: 'score', show: true },
+    ])
+    if (props.selectCardsname === '基础设施') {
+      selList.value.map((val) => (val.show = false))
+    } else if (props.selectCardsname === '数据资源') {
+      selList.value.map(
+        (val) => (val.show = val.name === '发布时间' || val.name === '申请量')
+      )
+    }
+    
+    const findComponentName = (list, name) => {
+      if (list.infoList) {
+        return list.infoList.find((item) => {
+          if (item.attrType === '组件类型') {
+            return item.attrValue === name
+          }
         })
       }
-
-      // const handleAKeyApplication = (item) => {
-      //   let _applyList = []
-      //     ; (item.fuseResourceList || []).map((v) => {
-      //       let resource = v.resource || {}
-      //       let obj = {
-      //         arr: [
-      //           {
-      //             delFlag: resource.delFlag,
-      //             description: resource.description,
-      //             resourceId: resource.id,
-      //             resourceName: resource.name,
-      //             time: resource.createDate,
-      //             type: resource.type,
-      //           },
-      //         ],
-      //         deptId: resource.deptId,
-      //         deptName: resource.deptName,
-      //       }
-      //       _applyList.push(obj)
-      //     })
-
-      //   localStorage.setItem('applyList', JSON.stringify(_applyList))
-      //   router.push({
-      //     path: '/apply',
-      //   })
-      // }
-
-      mybus.on('chongzhi', (typeObj) => {
-        console.log('typeObj------------>', typeObj)
-        if (!typeObj) {
-          selData.value = 'total'
+    }
+    console.log('this.resourceList', props.resourceList.data)
+    props.resourceList.data.map((val) => {
+      if (val.infoList) {
+        let obj = val.infoList.filter((item) => item.attrType == '组件类型')[0]
+        if (obj) {
+          switch (obj.attrValue) {
+            case '智能算法':
+              val.applicationType = 'znsf'
+              break
+            case '图层服务':
+              val.applicationType = 'tcfw'
+              break
+            case '开发组件':
+              val.applicationType = 'kfzj'
+              break
+            case '业务组件':
+              val.applicationType = 'ywzj'
+              break
+          }
+          console.log('obj', val.applicationType)
         }
-        if (
-          typeObj &&
-          (typeObj.type === '融合服务' || typeObj.type === '赋能场景')
-        ) {
-          orderList.value = [
-            {
-              value: 'collectCount',
-              name: '收藏量',
-              orderType: 'DESC',
-            },
-            {
-              value: 'create_date',
-              name: '发布时间',
-              orderType: 'DESC',
-            },
-            {
-              value: 'update_date',
-              name: '更新时间',
-              orderType: 'DESC',
-            },
-          ]
-        }
-      })
-      let videoUrl = ref('')
-      const options = reactive({
-        width: '700px', //播放器宽度
-        height: '400px', //播放器高度
-        color: '#409eff', //主题色
-        title: '', //视频名称
-        src: '', //视频源
-        type: 'm3u8', // 视频源类型
-        muted: false, //静音
-        webFullScreen: false,
-        speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
-        autoPlay: true, //自动播放
-        loop: false, //循环播放
-        mirror: false, //镜像画面
-        ligthOff: false, //关灯模式
-        volume: 0.3, //默认音量大小
-        control: true, //是否显示控制
-        controlBtns: [
-          'audioTrack',
-          'quality',
-          'speedRate',
-          'volume',
-          'setting',
-          'pip',
-          'pageFullScreen',
-          'fullScreen',
-        ], //显示所有按钮,
-      })
-      let visible = ref(false)
-      // 打开视频预览
-      const openVideo = (item) => {
-        videoUrl.value = ''
-        const param = {
-          key: item.link,
-        }
-        getHls(param).then((res) => {
-          console.log('获取视频地址===============>', res)
-          // videoUrl.value = res.data.data
-          options.src = res.data.data
-          visible.value = true
-        })
       }
-      // 算法对比跳转
-      const goComparePk = (item) => {
+    })
+    showKey.value++
+    const selData = ref('total')
+    const flag = ref(true)
+    // userId
+    const userId = ref('')
+    getUser().then((res) => {
+      console.log('getUser============>', res)
+      userId.value = res.data.data.id
+    })
+    const resultList = [1, 2, 3, 4]
+    const router = useRouter()
+    const cardType = router.currentRoute.value.query.select
+    const onSearch = (searchValue) => {
+      console.log('use value', searchValue)
+      console.log('or use this.value', searchValue.value)
+    }
+    function toView(type, item) {
+      debugger
+      if (props.selectCardsname == '数据资源') {
+        if (whoShow1.itShowQingDao) {
+          window.open(
+            'http://15.72.158.81/web/ZWXXSQ/bm/MuluDetail.aspx?zyguid=' +
+              item.guid
+          )
+        } else {
+          window.open('http://10.134.135.24:30090/#/home?id=' + item.serviceId)
+        }
+      } else if (props.selectCardsname === '融合服务') {
+        // 打包模式
         router.push({
-          path: '/algorithmCompare',
+          path: '/packagingDetails',
           query: {
             id: item.id,
           },
         })
+      } else if (props.selectCardsname === '赋能场景') {
+        router.push({
+          path: '/integrationServicesDetails',
+          query: {
+            id: item.id,
+          },
+        })
+      } else {
+        if (type === 'apply') {
+          // 外部服务地址跳转到外部
+          const webUrl = item.infoList.filter(
+            (val) => val.attrType == '外部服务地址'
+          )[0]?.attrValue
+          if (webUrl) {
+            window.open(webUrl)
+          } else {
+            if (
+              !(
+                props.selectCardsname === '应用资源' ||
+                props.selectCardsname === '组件服务'
+              ) ||
+              whoShow1.itShowBaoTou
+            ) {
+              return
+            }
+            // 内部跳转申请页面
+            console.log('一键申请===================>', item)
+            localStorage.setItem(
+              'applyList',
+              JSON.stringify([
+                {
+                  arr: [
+                    {
+                      delFlag: item.delFlag,
+                      description: item.description,
+                      resourceId: item.id,
+                      resourceName: item.name,
+                      time: item.createDate,
+                      type: item.type,
+                      componentType:
+                        (item.infoList.filter(
+                          (val) => val.attrType == '组件类型'
+                        )[0] &&
+                          item.infoList.filter(
+                            (val) => val.attrType == '组件类型'
+                          )[0].attrValue) ||
+                        '',
+                    },
+                  ],
+                  deptId: item.deptId,
+                  deptName: item.deptName,
+                },
+              ])
+            )
+            router.push({
+              path: '/apply',
+            })
+          }
+        } else {
+          router.push({
+            path: '/details',
+            query: {
+              id: item.id,
+            },
+          })
+        }
       }
-      return {
-        onSearch,
-        resultList,
-        toView,
-        addShoppingCart,
-        changeCondition,
-        selData,
-        selList,
-        addCollect,
-        cardType,
-        findComponentName,
-        shoppingKey,
-        openVideo,
-        videoUrl,
-        options,
-        visible,
-        goComparePk,
-        whoShow1,
-        showKey,
-        orderList,
-        handleAKeyApplication,
-        changeOrder,
+    }
+    // 加入申购车
+    const addShoppingCart = (item, index) => {
+      console.log('item===============>', item)
+      if (flag.value && item.id) {
+        flag.value = false
+        sgcInsert({
+          delFlag: '0',
+          resourceId: item.id,
+        }).then((res) => {
+          console.log(res)
+          message.success('添加申购车成功！')
+          mybus.emit('getSgcNum')
+          mybus.emit('changeSelcted', index)
+          flag.value = true
+        })
       }
-    },
-    beforeUnmount() {
-      mybus.off('chongzhi')
-      // mybus.emit('changeSelcted')
-    },
-  }
+      shoppingKey.value++
+      // 查询申购车中已有id,用于过滤图标
+    }
+    // 添加收藏
+    const addCollect = (item) => {
+      console.log('收藏===============>', item, flag.value)
+      if (flag.value && item.id) {
+        flag.value = false
+        if (item.isCollect == 'true') {
+          scDel([item.id]).then((res) => {
+            if (res.data.msg === 'success') {
+              message.success('取消成功')
+              item.isCollect = 'false'
+              item.collectCount--
+              flag.value = true
+              console.log('收藏2===============>', res.data, flag.value)
+            }
+          })
+        } else {
+          scInsert([
+            {
+              resourceId: item.id,
+            },
+          ]).then((res) => {
+            if (res.data.msg === 'success') {
+              message.success('添加收藏成功！')
+              item.isCollect = 'true'
+              item.collectCount++
+              flag.value = true
+              console.log('收藏2===============>', res.data, flag.value)
+            }
+          })
+        }
+      }
+    }
+    // 更换查询条件
+    const changeCondition = (val) => {
+      selData.value = selData.value == val ? 'total' : val
+      const orderType = selData.value == val ? 'ASC' : 'DESC'
+      mybus.emit('changeCondition', {
+        orderField: val,
+        orderType: orderType,
+      })
+      console.log('选择===========》', val, selData.value)
+    }
+
+    // 融合服务--一键申请
+    // 一键申请
+    const handleAKeyApplication = (item) => {
+      let _applyList = []
+      let fuseResourceList = item.fuseResourceList || []
+      let jcssArray = fuseResourceList.filter((v) => v.type === '基础设施')
+      let otherArray = fuseResourceList.filter((v) => v.type !== '基础设施')
+      jcssArray = jcssArray.map((v) => {
+        v = Object.assign(v, v.resource)
+        return v
+      })
+      let jcss = [
+        {
+          arr: [
+            {
+              description: '',
+              note1: JSON.stringify(jcssArray),
+              resourceId: '1522550195055828996',
+              resourceName: '摄像头列表',
+              type: '基础设施',
+            },
+          ],
+          deptId: '',
+          deptName: '',
+        },
+      ]
+      if (infrastructure) {
+        jcss[0].deptId = infrastructure.deptId
+        jcss[0].deptName = infrastructure.deptName
+      }
+      otherArray.map((v) => {
+        let resource = v.resource || {}
+        console.log('resource------------>', resource)
+        let obj = {
+          arr: [
+            {
+              delFlag: resource.delFlag,
+              description: resource.description,
+              resourceId: resource.id,
+              resourceName: resource.name,
+              time: resource.createDate,
+              type: resource.type,
+            },
+          ],
+          deptId: resource.deptId,
+          deptName: resource.deptName,
+        }
+        _applyList.push(obj)
+      })
+      _applyList = jcss.concat(_applyList)
+      console.log('_applyList------------>', _applyList)
+
+      localStorage.setItem('applyList', JSON.stringify(_applyList))
+      // 融合服务 item
+      localStorage.setItem('integrationServicesItemInfo', JSON.stringify(item))
+      router.push({
+        path: '/apply',
+      })
+    }
+
+    mybus.on('chongzhi', (typeObj) => {
+      console.log('typeObj------------>', typeObj)
+      if (!typeObj) {
+        selData.value = 'total'
+      }
+      if (
+        typeObj &&
+        (typeObj.type === '融合服务' || typeObj.type === '打包模式')
+      ) {
+        console.log('integrationServiceOrderDom------------>', integrationServiceOrderDom);
+        
+        // integrationOrderList.value = JSON.parse(JSON.stringify(orderList))
+        console.log('integrationServiceOrderDom.value------------>', integrationServiceOrderDom.value);
+        integrationServiceOrderDom.value.reset()
+        
+      }
+    })
+    let videoUrl = ref('')
+    const options = reactive({
+      width: '700px', //播放器宽度
+      height: '400px', //播放器高度
+      color: '#409eff', //主题色
+      title: '', //视频名称
+      src: '', //视频源
+      type: 'm3u8', // 视频源类型
+      muted: false, //静音
+      webFullScreen: false,
+      speedRate: ['0.75', '1.0', '1.25', '1.5', '2.0'], //播放倍速
+      autoPlay: true, //自动播放
+      loop: false, //循环播放
+      mirror: false, //镜像画面
+      ligthOff: false, //关灯模式
+      volume: 0.3, //默认音量大小
+      control: true, //是否显示控制
+      controlBtns: [
+        'audioTrack',
+        'quality',
+        'speedRate',
+        'volume',
+        'setting',
+        'pip',
+        'pageFullScreen',
+        'fullScreen',
+      ], //显示所有按钮,
+    })
+    let visible = ref(false)
+    // 打开视频预览
+    const openVideo = (item) => {
+      videoUrl.value = ''
+      const param = {
+        key: item.link,
+      }
+      getHls(param).then((res) => {
+        console.log('获取视频地址===============>', res)
+        // videoUrl.value = res.data.data
+        options.src = res.data.data
+        visible.value = true
+      })
+    }
+    // 算法对比跳转
+    const goComparePk = (item) => {
+      router.push({
+        path: '/algorithmCompare',
+        query: {
+          id: item.id,
+        },
+      })
+    }
+
+    return {
+      onSearch,
+      resultList,
+      toView,
+      addShoppingCart,
+      changeCondition,
+      selData,
+      selList,
+      addCollect,
+      cardType,
+      findComponentName,
+      shoppingKey,
+      openVideo,
+      videoUrl,
+      options,
+      visible,
+      goComparePk,
+      whoShow1,
+      showKey,
+      handleAKeyApplication,
+      integrationServiceOrderDom,
+    }
+  },
+  beforeUnmount() {
+    mybus.off('chongzhi')
+  },
+}
 </script>
 <style scoped lang="less">
-  #search-result-list-container {
-    width: 1088px;
-    padding: 0 20px;
-    background: #f3f5f9;
+.activeBg {
+  background-color: #0087ff;
+}
 
-    .detail-content {
-      // 超出
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      width: 130px;
-      display: inline-block;
+#search-result-list-container {
+  width: 1088px;
+  padding: 0 20px;
+  background: #f3f5f9;
+
+  .detail-content {
+    // 超出
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: 130px;
+    display: inline-block;
+  }
+
+  .shai-xuan {
+    width: 1047px;
+    height: 36px;
+    display: flex;
+    align-items: center;
+    position: relative;
+
+    .circle {
+      width: 16px;
+      height: 16px;
+      border-radius: 50%;
+      background-color: #0087ff;
+      text-align: center;
+      color: #fff;
+      line-height: 16px;
+      margin-right: 21px;
     }
 
-    .shai-xuan {
-      width: 1047px;
-      height: 36px;
-      // margin: 11px 0 20px;
-      // background: #e5f2ff;
-      // padding-left: 20px;
+    .result {
+      font-size: 14px;
+      font-weight: 500;
+      color: #212121;
+
+      span {
+        font-size: 18px;
+        color: #0087ff;
+      }
+    }
+
+    .condition {
+      position: absolute;
+      right: 20px;
+      top: 10px;
+
+      ul li {
+        list-style-type: none;
+      }
+
+      ul {
+        display: flex;
+
+        li {
+          width: 90px;
+          height: 12px;
+          text-align: center;
+          cursor: pointer;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+
+          .arrow {
+            display: inline-block;
+            width: 12px;
+            height: 12px;
+            background: url('~@/assets/newHome/arrow.png');
+            margin-left: 10px;
+          }
+
+          .down {
+            background: url('~@/assets/newHome/down.png');
+            margin-top: 6px;
+          }
+        }
+      }
+    }
+  }
+
+  .result-list {
+    width: 1048px;
+    display: flex;
+    flex-direction: column;
+    flex-wrap: wrap;
+    border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
+    border-top: 1px rgba(150, 144, 144, 0.3) solid;
+    padding: 10px 0;
+
+    .item {
+      width: 100%;
+      margin-top: 10px;
       display: flex;
       align-items: center;
-      position: relative;
 
-      .circle {
-        width: 16px;
-        height: 16px;
-        border-radius: 50%;
-        background-color: #0087ff;
-        text-align: center;
-        color: #fff;
-        line-height: 16px;
-        margin-right: 21px;
+      .left {
+        display: inline-block;
+        width: 120px;
+        height: 110px;
+        margin-right: 16px;
       }
 
-      .result {
-        font-size: 14px;
-        font-weight: 500;
-        color: #212121;
-
-        span {
-          font-size: 18px;
-          color: #0087ff;
-        }
-      }
-
-      .condition {
-        position: absolute;
-        right: 20px;
-        top: 10px;
-
-        ul li {
-          list-style-type: none;
-        }
-
-        ul {
-          display: flex;
-
-          li {
-            width: 90px;
-            height: 12px;
-            text-align: center;
-            cursor: pointer;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-
-            .arrow {
-              display: inline-block;
-              width: 12px;
-              height: 12px;
-              background: url('~@/assets/newHome/arrow.png');
-              margin-left: 10px;
-            }
-
-            .down {
-              background: url('~@/assets/newHome/down.png');
-              margin-top: 6px;
-            }
-          }
-        }
-      }
-    }
-
-    .result-list {
-      width: 1048px;
-      display: flex;
-      flex-direction: column;
-      flex-wrap: wrap;
-      border-bottom: 1px rgba(150, 144, 144, 0.3) solid;
-      border-top: 1px rgba(150, 144, 144, 0.3) solid;
-      padding: 10px 0;
-
-      .item {
+      .right {
         width: 100%;
-        margin-top: 10px;
+      }
+
+      .yyzy {
+        background: url('~@/assets/home/yyzy_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .sjzy {
+        background: url('~@/assets/home/sjzy_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .znsf {
+        background: url('~@/assets/home/znsf_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .tcfw {
+        background: url('~@/assets/home/tcfw_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .kfzj {
+        background: url('~@/assets/home/kfzj_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .ywzj {
+        background: url('~@/assets/home/ywzj_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .rhfw {
+        background: url('~@/assets/home/rhfw_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .jcss {
+        background: url('~@/assets/home/sxt_square.png') no-repeat;
+        background-size: 100%;
+      }
+
+      .header {
         display: flex;
+        justify-content: space-between;
         align-items: center;
+        margin: 0 10px 0 0;
 
-        .left {
-          display: inline-block;
-          width: 120px;
-          height: 110px;
-          margin-right: 16px;
-        }
-
-        .right {
-          width: 100%;
-        }
-
-        .yyzy {
-          background: url('~@/assets/home/yyzy_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .sjzy {
-          background: url('~@/assets/home/sjzy_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .znsf {
-          background: url('~@/assets/home/znsf_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .tcfw {
-          background: url('~@/assets/home/tcfw_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .kfzj {
-          background: url('~@/assets/home/kfzj_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .ywzj {
-          background: url('~@/assets/home/ywzj_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .rhfw {
-          background: url('~@/assets/home/rhfw_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .jcss {
-          background: url('~@/assets/home/sxt_square.png') no-repeat;
-          background-size: 100%;
-        }
-
-        .header {
+        .header-right {
           display: flex;
-          justify-content: space-between;
-          align-items: center;
-          margin: 0 10px 0 0;
-
-          .header-right {
-            display: flex;
-            font-size: 14px;
-            color: #212121;
-
-            span {
-              font-size: 14px;
-              color: #212121;
-            }
-
-            div {
-              margin-right: 24px;
-            }
-
-            .label-content {
-              flex: 1;
-              display: flex;
-              justify-content: flex-end;
-
-              .label {
-                padding: 0.01rem 0.1rem;
-                margin-right: 0.1rem;
-                border-radius: 0.13rem;
-                background: #0087ff;
-                color: #fff;
-              }
-            }
-          }
-
-          .header-right:last-child {
-            div {
-              margin-right: 16px;
-            }
-          }
+          font-size: 14px;
+          color: #212121;
 
           span {
-            font-size: 20px;
-            font-weight: 600;
-            // color: #0087ff;
+            font-size: 14px;
+            color: #212121;
           }
-        }
-
-        .dec {
-          overflow: hidden;
-          text-overflow: ellipsis;
-          // white-space: nowrap;
-          color: #0058e1;
-          display: flex;
-          margin-top: 10px;
 
           div {
-            margin-right: 10px;
-            background: rgba(0, 88, 225, 0.1);
-            padding-left: 10px;
-            padding-right: 10px;
+            margin-right: 24px;
           }
 
-          div:nth-child(2) {
-            max-width: 200px;
-            display: -webkit-box;
-            /*设置为弹性盒子*/
-            -webkit-line-clamp: 1;
-            /*最多显示3行*/
-            overflow: hidden;
-            /*超出隐藏*/
-            text-overflow: ellipsis;
-            /*超出显示为省略号*/
-            -webkit-box-orient: vertical;
-            word-break: break-all;
-          }
-        }
-
-        .btn {
-          display: flex;
-          justify-content: space-between;
-          font-size: 14px;
-          margin: 5px 0;
-
-          // .left {
-          //   width: 600px;
-          //   display: flex;
-          //   justify-content: space-between;
-          //   flex-wrap: wrap;
-          //   & > div {
-          //     width: 300px;
-          //     & > span {
-          //       color: #0087ff;
-          //       font-weight: 600;
-          //     }
-          //   }
-          // }
-          .right {
+          .label-content {
             flex: 1;
             display: flex;
             justify-content: flex-end;
-            margin: 0 10px;
-            align-items: center;
 
-            .shopping {
-              span {
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                margin-right: 10px;
-                margin-top: 5px;
-              }
-
-              .shopping-on {
-                background: url('~@/assets/newHome/shopping-on.png');
-                cursor: pointer;
-              }
-
-              .shopping-down {
-                background: url('~@/assets/newHome/shopping-down.png');
-              }
+            .label {
+              padding: 0.01rem 0.1rem;
+              margin-right: 0.1rem;
+              border-radius: 0.13rem;
+              background: #0087ff;
+              color: #fff;
             }
+          }
+        }
 
-            .pk-on {
+        .header-right:last-child {
+          div {
+            margin-right: 16px;
+          }
+        }
+
+        span {
+          font-size: 20px;
+          font-weight: 600;
+          // color: #0087ff;
+        }
+      }
+
+      .dec {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        // white-space: nowrap;
+        color: #0058e1;
+        display: flex;
+        margin-top: 10px;
+
+        div {
+          margin-right: 10px;
+          background: rgba(0, 88, 225, 0.1);
+          padding-left: 10px;
+          padding-right: 10px;
+        }
+
+        div:nth-child(2) {
+          max-width: 200px;
+          display: -webkit-box;
+          /*设置为弹性盒子*/
+          -webkit-line-clamp: 1;
+          /*最多显示3行*/
+          overflow: hidden;
+          /*超出隐藏*/
+          text-overflow: ellipsis;
+          /*超出显示为省略号*/
+          -webkit-box-orient: vertical;
+          word-break: break-all;
+        }
+      }
+
+      .btn {
+        display: flex;
+        justify-content: space-between;
+        font-size: 14px;
+        margin: 5px 0;
+
+       
+        .right {
+          flex: 1;
+          display: flex;
+          justify-content: flex-end;
+          margin: 0 10px;
+          align-items: center;
+
+          .shopping {
+            span {
               display: inline-block;
               height: 32px;
               width: 32px;
-              margin-left: 10px;
               margin-right: 10px;
               margin-top: 5px;
-              background: url('~@/assets/newHome/pk-on.png');
+            }
+
+            .shopping-on {
+              background: url('~@/assets/newHome/shopping-on.png');
               cursor: pointer;
             }
 
-            .sc {
-              // margin-top: 4px;
-              cursor: pointer;
-              display: flex;
-              align-items: center;
-
-              .sc-down {
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                background: url('~@/assets/newHome/sc-down.png');
-              }
-
-              .sc-on {
-                display: inline-block;
-                height: 32px;
-                width: 32px;
-                background: url('~@/assets/newHome/sc-on.png');
-              }
-            }
-
-            .ant-btn {
-              background: transparent;
-              background: #0058e1;
-              color: white;
-              width: 80px;
-              height: 32px;
-              font-weight: 600;
-              border-radius: 2px;
-              text-align: center;
-              display: flex;
-              align-items: center;
-              justify-content: center;
-              margin-left: 10px;
-            }
-
-            .ant-btn:last-child {
-              background: #0058e1;
-              color: white;
+            .shopping-down {
+              background: url('~@/assets/newHome/shopping-down.png');
             }
           }
-        }
 
-        .bottom {
-          display: flex;
-          justify-content: space-between;
-          margin-top: 10px;
-          align-items: center;
+          .pk-on {
+            display: inline-block;
+            height: 32px;
+            width: 32px;
+            margin-left: 10px;
+            margin-right: 10px;
+            margin-top: 5px;
+            background: url('~@/assets/newHome/pk-on.png');
+            cursor: pointer;
+          }
 
-          & > div {
+          .sc {
+            // margin-top: 4px;
+            cursor: pointer;
             display: flex;
             align-items: center;
 
-            & > div {
-              margin: 0 10px;
+            .sc-down {
+              display: inline-block;
+              height: 32px;
+              width: 32px;
+              background: url('~@/assets/newHome/sc-down.png');
+            }
+
+            .sc-on {
+              display: inline-block;
+              height: 32px;
+              width: 32px;
+              background: url('~@/assets/newHome/sc-on.png');
             }
           }
 
-          .pingfen {
-            :deep(span) {
+          .ant-btn {
+            background: transparent;
+            background: #0058e1;
+            color: white;
+            width: 80px;
+            height: 32px;
+            font-weight: 600;
+            border-radius: 2px;
+            text-align: center;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            margin-left: 10px;
+          }
+
+          .ant-btn:last-child {
+            background: #0058e1;
+            color: white;
+          }
+        }
+      }
+
+      .bottom {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 10px;
+        align-items: center;
+
+        & > div {
+          display: flex;
+          align-items: center;
+
+          & > div {
+            margin: 0 10px;
+          }
+        }
+
+        .pingfen {
+          :deep(span) {
+            display: flex;
+            align-items: center;
+
+            :deep(ul) {
               display: flex;
               align-items: center;
 
-              :deep(ul) {
-                display: flex;
-                align-items: center;
-
-                :deep(.ant-rate-star:not(:last-child)) {
-                  margin-right: 4px;
-                }
+              :deep(.ant-rate-star:not(:last-child)) {
+                margin-right: 4px;
               }
             }
           }
         }
       }
+    }
 
-      .item:nth-of-type(1) {
-        margin-top: 0;
-      }
+    .item:nth-of-type(1) {
+      margin-top: 0;
     }
   }
+}
 
-  .description {
-    max-width: 990px;
-    height: 52px;
-    font-size: 14px;
-    line-height: 18px;
-    display: -webkit-box;
-    -webkit-line-clamp: 3;
-    /*最多显示3行*/
-    overflow: hidden;
-    /*超出隐藏*/
-    text-overflow: ellipsis;
-    /*超出显示为省略号*/
-    -webkit-box-orient: vertical;
-    word-break: break-all;
-  }
+.description {
+  max-width: 990px;
+  height: 52px;
+  font-size: 14px;
+  line-height: 18px;
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  /*最多显示3行*/
+  overflow: hidden;
+  /*超出隐藏*/
+  text-overflow: ellipsis;
+  /*超出显示为省略号*/
+  -webkit-box-orient: vertical;
+  word-break: break-all;
+}
 </style>
diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue
index c13d4d42..fa9dffc0 100644
--- a/front/src/views/home/integrationServices.vue
+++ b/front/src/views/home/integrationServices.vue
@@ -37,7 +37,6 @@
         <searchResultList
           v-if="number === 0"
           v-show="resourceList.data && resourceList.data.length > 0"
-          :key="listKey2"
           :resourceList="resourceList"
           :resourceTotal="resourceTotal"
           :selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
@@ -45,7 +44,6 @@
         <CanAssignCase
           v-else
           v-show="resourceList.data && resourceList.data.length > 0"
-          :key="listKey2"
           :resourceList="resourceList"
           :resourceTotal="resourceTotal"
           :selectCardsname="number == 0 ? '融合服务' : '赋能场景'"
@@ -76,342 +74,332 @@
   <home-footer></home-footer>
 </template>
 <script>
-  import HomeFooter from '@/views/newHome/components/Footer'
-  import mybus from '@/myplugins/mybus'
-  import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
+import HomeFooter from '@/views/newHome/components/Footer'
+import mybus from '@/myplugins/mybus'
+import { defineComponent, reactive, ref, toRefs, onMounted, watch } from 'vue'
 
-  import { getIntegrationServicesList } from '@/api/home.js'
-  import { useRouter } from 'vue-router'
-  import HomeHeader from '@/views/home/components/header'
-  import searchResultList from '@/views/home/components/searchResultList.vue'
-  import CanAssignCase from '@/views/home/components/CanAssignCase.vue'
-  import { message } from 'ant-design-vue'
+import { getIntegrationServicesList } from '@/api/home.js'
+import { useRouter } from 'vue-router'
+import HomeHeader from '@/views/home/components/header'
+import searchResultList from '@/views/home/components/searchResultList.vue'
+import CanAssignCase from '@/views/home/components/CanAssignCase.vue'
+import { message } from 'ant-design-vue'
 
-  export default defineComponent({
-    setup() {
+export default defineComponent({
+  setup() {
+    // 分页
+    const loading = ref(true)
+    const currentPage = ref(1)
+    const currentPageSize = ref(5)
+    const pageSizeOptions = ref(['5', '10', '20', '50'])
+    const router = useRouter()
+    const select = router.currentRoute.value.query.select
+    const searchValue = ref('')
+    const Cardsname = ref(select)
+    const resourceList = reactive({ data: [] })
+    const resourceTotal = ref(0)
+    const current = ref(1)
+    const loadingData = ref(false)
+    // 选项卡
+    const titleName = ref([
+      {
+        name: '打包模式',
+      },
+      {
+        name: '赋能场景',
+      },
+    ])
+
+    const number = ref(0)
+    // 查询参数
+    const paramsGetResources = {
+      pageNum: 1,
+      pageSize: currentPageSize.value,
+      type: titleName.value[number.value].name,
+      name: '',
+      orderField: 'create_date', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
+      orderType: 'DESC', // ASC 升序  DESC 降序
+    }
+
+    const changeCards = (val) => {
+      console.log(val)
+      number.value = val
+      chongzhi()
+    }
+
+    // 查询
+    const onSearch = () => {
+      loading.value = true
+      currentPage.value = 1
+    }
+    // 重置数据
+    const chongzhi = () => {
+      loading.value = true
+      // 重置模糊查字段
+      searchValue.value = ''
       // 分页
-      const loading = ref(true)
-      const currentPage = ref(1)
-      const currentPageSize = ref(5)
-      const pageSizeOptions = ref(['5', '10', '20', '50'])
-      const router = useRouter()
-      const select = router.currentRoute.value.query.select
-      const searchValue = ref('')
-      const Cardsname = ref(select)
-      const resourceList = reactive({ data: [] })
-      const resourceTotal = ref(0)
-      const current = ref(1)
-      const loadingData = ref(false)
-      // 选项卡
-      const titleName = ref([
-        {
-          name: '打包模式',
-        },
-        {
-          name: '赋能场景',
-        },
-      ])
-
-      const number = ref(0)
-      // 刷新筛选条件组件
-      let listKey = ref(0)
-      // 刷新筛选列表信息组件
-      const listKey2 = ref(0)
-
-      // 查询参数
-      const paramsGetResources = {
-        pageNum: 1,
-        pageSize: currentPageSize.value,
+      currentPage.value = 1
+      currentPageSize.value = 5
+      // 重置查询条件
+      paramsGetResources.pageNum = 1
+      paramsGetResources.pageSize = 5
+      paramsGetResources.orderField = 'create_date'
+      paramsGetResources.orderType = 'DESC'
+      mybus.emit('chongzhi', {
+        type: titleName.value[number.value].name,
+      })
+      getAppResources()
+    }
+
+    const getAppResources = () => {
+      getIntegrationList()
+    }
+
+    // 获取融合服务列表
+    const getIntegrationList = () => {
+      loadingData.value = true
+      console.log('获取融合服务列表------------>')
+      let postData = {
+        limit: currentPageSize.value,
+        page: currentPage.value,
+        orderField: paramsGetResources.orderField,
+        orderType: paramsGetResources.orderType,
+        name: searchValue.value,
         type: titleName.value[number.value].name,
-        name: '',
-        orderField: 'create_date', // total 综合 visits 访问量 applyCount 申请量 score 评分  collectCount 收藏量
-        orderType: 'DESC', // ASC 升序  DESC 降序
       }
 
-      const changeCards = (val) => {
-        console.log(val)
-        number.value = val
-        chongzhi()
-      }
-
-      // 查询
-      const onSearch = () => {
-        loading.value = true
-        currentPage.value = 1
-      }
-      // 重置数据
-      const chongzhi = () => {
-        loading.value = true
-        // 重置模糊查字段
-        searchValue.value = ''
-        // 分页
-        currentPage.value = 1
-        currentPageSize.value = 5
-        // 重置查询条件
-        paramsGetResources.pageNum = 1
-        paramsGetResources.pageSize = 5
-        paramsGetResources.orderField = 'create_date'
-        paramsGetResources.orderType = 'DESC'
-        mybus.emit('chongzhi', {
-          type: titleName.value[number.value].name,
-        })
-        getAppResources()
-      }
-
-      const getAppResources = () => {
-        getIntegrationList()
-      }
-
-      // 获取融合服务列表
-      const getIntegrationList = () => {
-        loadingData.value = true
-        console.log('获取融合服务列表------------>')
-        let postData = {
-          limit: currentPageSize.value,
-          page: currentPage.value,
-          orderField: paramsGetResources.orderField,
-          orderType: paramsGetResources.orderType,
-          name: searchValue.value,
-          type: titleName.value[number.value].name,
-        }
-        getIntegrationServicesList(postData).then(
-          (res) => {
-            loadingData.value = false
-            if (res.data.code !== 0) {
-              return message.error(res.data.msg)
-            }
-            console.log('res.data------------>', res.data)
-
-            resourceList.data = res.data.data.list || []
-            resourceTotal.value = res.data.data.total || 0
-            listKey2.value++
-          },
-          (err) => {
-            loadingData.value = false
-            message.error(err)
+      getIntegrationServicesList(postData).then(
+        (res) => {
+          loadingData.value = false
+          if (res.data.code !== 0) {
+            return message.error(res.data.msg)
           }
-        )
-      }
-
-      mybus.on('paramsGetResources', (ids) => {
-        if (ids && ids.length > 0) {
-          paramsGetResources.deptIds = ids
-        } else {
-          delete paramsGetResources.deptIds
+          resourceList.data = res.data.data.list || []
+          resourceTotal.value = res.data.data.total || 0
+        },
+        (err) => {
+          loadingData.value = false
+          message.error(err)
         }
-        getAppResources()
-        console.log('paramsGetResources', paramsGetResources)
-      })
-      mybus.on('changePage', (page) => {
-        paramsGetResources.pageNum = page
-        getAppResources('分页查询')
-      })
-      mybus.on('changeSelcted', () => {
-        getAppResources()
-      })
+      )
+    }
 
-      mybus.on('refresh', () => {
-        paramsGetResources.pageNum = 1
-        currentPage.value = 1
-        getAppResources()
-      })
-      mybus.on('changeCondition', (condition) => {
-        paramsGetResources.orderField = condition.orderField
-        paramsGetResources.orderType = condition.orderType
-        getAppResources()
-      })
-
-      const pageChange = (val) => {
-        console.log(val)
-        loading.value = true
-        currentPage.value = val
-        paramsGetResources.pageNum = val
-        let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
-        getAppResources(params)
+    mybus.on('paramsGetResources', (ids) => {
+      if (ids && ids.length > 0) {
+        paramsGetResources.deptIds = ids
+      } else {
+        delete paramsGetResources.deptIds
       }
+      getAppResources()
+      console.log('paramsGetResources', paramsGetResources)
+    })
+    mybus.on('changePage', (page) => {
+      paramsGetResources.pageNum = page
+      getAppResources('分页查询')
+    })
+    mybus.on('changeSelcted', () => {
+      getAppResources()
+    })
 
-      onMounted(() => {
-        console.log('222----onMounted-------->', 222)
-        listKey2.value++
-        getAppResources()
-      })
+    mybus.on('refresh', () => {
+      paramsGetResources.pageNum = 1
+      currentPage.value = 1
+      getAppResources()
+    })
+    mybus.on('changeCondition', (condition) => {
+      console.log('------>', condition)
+      paramsGetResources.orderField = condition.orderField
+      paramsGetResources.orderType = condition.orderType
+      getAppResources()
+    })
 
-      // 分页
-      const onShowSizeChange = (current, pageSize) => {
-        currentPage.value = current
-        currentPageSize.value = pageSize
-        paramsGetResources.pageNum = current
-        paramsGetResources.pageSize = pageSize
-        getAppResources()
-      }
-      watch(currentPageSize, () => {
-        console.log('pageSize', currentPageSize.value)
-      })
+    const pageChange = (val) => {
+      console.log(val)
+      loading.value = true
+      currentPage.value = val
+      paramsGetResources.pageNum = val
+      let params = '分页查询' //判断是否是点击下面的分页的调用模糊查询方法还是点击搜索调用模糊查询方法
+      getAppResources(params)
+    }
 
-      return {
-        listKey,
-        searchValue,
-        currentPage,
-        resourceList,
-        resourceTotal,
-        pageChange,
-        listKey2,
-        Cardsname,
-        getAppResources,
-        chongzhi,
-        onSearch,
-        currentPageSize,
-        pageSizeOptions,
-        current,
-        loading,
-        titleName,
-        changeCards,
-        number,
-        loadingData,
-      }
-    },
-    components: {
-      HomeHeader,
-      HomeFooter,
-      searchResultList,
-      CanAssignCase,
-    },
-    beforeUnmount() {
-      mybus.off('paramsGetResources')
-      mybus.off('changeCondition')
-      mybus.off('refresh')
-      mybus.off('changePage')
-    },
-  })
+    onMounted(() => {
+      getAppResources()
+    })
+
+    // 分页
+    const onShowSizeChange = (current, pageSize) => {
+      currentPage.value = current
+      currentPageSize.value = pageSize
+      paramsGetResources.pageNum = current
+      paramsGetResources.pageSize = pageSize
+      getAppResources()
+    }
+    watch(currentPageSize, () => {
+      console.log('pageSize', currentPageSize.value)
+    })
+
+    return {
+      searchValue,
+      currentPage,
+      resourceList,
+      resourceTotal,
+      pageChange,
+      Cardsname,
+      getAppResources,
+      chongzhi,
+      onSearch,
+      currentPageSize,
+      pageSizeOptions,
+      current,
+      loading,
+      titleName,
+      changeCards,
+      number,
+      loadingData,
+    }
+  },
+  components: {
+    HomeHeader,
+    HomeFooter,
+    searchResultList,
+    CanAssignCase,
+  },
+  beforeUnmount() {
+    mybus.off('paramsGetResources')
+    mybus.off('changeCondition')
+    mybus.off('refresh')
+    mybus.off('changePage')
+  },
+})
 </script>
 <style lang="less" scoped>
-  .resultListSearchInput-father {
-    background: #f3f5f9;
-    padding: 0.2rem;
+.resultListSearchInput-father {
+  background: #f3f5f9;
+  padding: 0.2rem;
 
-    // padding-left: 0.2rem;
-    // padding-top: 0.2rem;
-    .resultListSearchInput-son {
-      background: #fff;
-      padding: 0.2rem 0.2rem 0rem 0.3rem;
+  // padding-left: 0.2rem;
+  // padding-top: 0.2rem;
+  .resultListSearchInput-son {
+    background: #fff;
+    padding: 0.2rem 0.2rem 0rem 0.3rem;
 
-      .hengxian {
-        width: 100%;
-        height: 0.01rem;
-        background: rgba(150, 144, 144, 0.3);
-        margin-top: 0.2rem;
-      }
+    .hengxian {
+      width: 100%;
+      height: 0.01rem;
+      background: rgba(150, 144, 144, 0.3);
+      margin-top: 0.2rem;
     }
   }
+}
 
-  .resultListSearchInput {
-    margin-left: 0.1rem;
+.resultListSearchInput {
+  margin-left: 0.1rem;
 
-    :deep(.ant-input) {
-      width: 4rem;
-      height: 0.36rem;
-      background: #fff;
-      border-radius: 0.04rem;
-    }
-
-    :deep(.ant-input-search-button) {
-      width: 0.8rem;
-      height: 0.36rem;
-      background: #0087ff;
-      border-radius: 0.04rem !important;
-      font-size: 0.14rem;
-      font-weight: 400;
-      color: #fff;
-      line-height: 0.34rem;
-      margin-left: 0.1rem;
-    }
-
-    :deep(.ant-input-group-addon) {
-      left: 0 !important;
-    }
+  :deep(.ant-input) {
+    width: 4rem;
+    height: 0.36rem;
+    background: #fff;
+    border-radius: 0.04rem;
   }
 
-  .button-reset {
-    border: 0;
-    outline: none;
+  :deep(.ant-input-search-button) {
     width: 0.8rem;
     height: 0.36rem;
-    background: #e1edfa;
-    border-radius: 0.04rem;
+    background: #0087ff;
+    border-radius: 0.04rem !important;
     font-size: 0.14rem;
     font-weight: 400;
-    color: #0087ff;
+    color: #fff;
     line-height: 0.34rem;
-    margin-left: 2.5rem;
-    cursor: pointer;
+    margin-left: 0.1rem;
   }
 
-  .details-pageconetent {
-    height: 100%;
-    width: 100%;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-top: 0.67rem;
+  :deep(.ant-input-group-addon) {
+    left: 0 !important;
+  }
+}
+
+.button-reset {
+  border: 0;
+  outline: none;
+  width: 0.8rem;
+  height: 0.36rem;
+  background: #e1edfa;
+  border-radius: 0.04rem;
+  font-size: 0.14rem;
+  font-weight: 400;
+  color: #0087ff;
+  line-height: 0.34rem;
+  margin-left: 2.5rem;
+  cursor: pointer;
+}
+
+.details-pageconetent {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 0.67rem;
+  position: relative;
+  background: rgba(245, 243, 243, 0.3);
+
+  .details-pageconetent-left {
+    max-height: 6.9rem;
+    position: absolute;
+    width: 2.5rem;
+    top: 0.17rem;
+    left: 2.5rem;
+    margin-right: 0.17rem;
+    overflow: auto;
+  }
+
+  .top {
+    min-height: 7.2rem;
     position: relative;
-    background: rgba(245, 243, 243, 0.3);
+    width: 11.5rem;
+    display: flex;
+    padding-top: 0.2rem;
+    flex-direction: column;
+    font-size: 0.16rem;
+    justify-content: left;
+    background: #f3f5f9;
 
-    .details-pageconetent-left {
-      max-height: 6.9rem;
-      position: absolute;
-      width: 2.5rem;
-      top: 0.17rem;
-      left: 2.5rem;
-      margin-right: 0.17rem;
-      overflow: auto;
-    }
-
-    .top {
-      min-height: 7.2rem;
-      position: relative;
-      width: 11.5rem;
-      display: flex;
-      padding-top: 0.2rem;
-      flex-direction: column;
-      font-size: 0.16rem;
-      justify-content: left;
+    .pagination {
       background: #f3f5f9;
+      padding-bottom: 0.6rem;
+    }
 
-      .pagination {
-        background: #f3f5f9;
-        padding-bottom: 0.6rem;
+    .top-title {
+      padding: 0.2rem;
+      display: flex;
+      font-size: 18px;
+
+      .tabAll {
+        font-size: 18px;
+        color: #000000;
+        margin-right: 35px;
+        cursor: pointer;
       }
 
-      .top-title {
-        padding: 0.2rem;
-        display: flex;
-        font-size: 18px;
+      .tabAll:nth-child(1) {
+        margin-left: 20px;
+      }
 
-        .tabAll {
-          font-size: 18px;
-          color: #000000;
-          margin-right: 35px;
-          cursor: pointer;
-        }
-
-        .tabAll:nth-child(1) {
-          margin-left: 20px;
-        }
-
-        .sel {
-          font-weight: 600;
-          color: #0087ff;
-          border-bottom: 0.02rem solid #0087ff;
-        }
+      .sel {
+        font-weight: 600;
+        color: #0087ff;
+        border-bottom: 0.02rem solid #0087ff;
       }
     }
   }
+}
 
-  :deep(.ant-card-grid) {
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    -webkit-line-clamp: 1;
-    word-break: break-all;
-  }
+:deep(.ant-card-grid) {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  -webkit-line-clamp: 1;
+  word-break: break-all;
+}
 </style>