BUG修改

back/src/views/modules/abilityStatistics/index.vue

@@ -81,8 +81,6 @@
         </el-form-item>
         </el-form>
 
-      
-  
         <el-form :inline="true" >
         <!--资源类型-->
         <el-form-item >
@@ -124,11 +122,9 @@
         </el-form>
   </div>
 
-
       <el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
         <div class="mod-demand__bsdemand">
 
-
           <div class="second-title">
             <span style="margin-right: 30px" :class="[
               departmentId === 1 || departmentId === 3
@@ -157,7 +153,7 @@
                 明细
               </span>
             </template>
-            <span v-else class="detail-button" @click="goToBack()"> 返回 </span>
+            <span v-else class="detail-button" @click="goToBack()">统计</span>
           </div>
           <div class="line-style"></div>
           <!--统计表-->
@@ -267,7 +263,7 @@ export default {
   data () {
     return {
       checked: false,
-      provideSelects:[],
+      provideSelects: [],
       departmentSelects: [],
       exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
       exportExcelCondition: '',
@@ -374,7 +370,7 @@ export default {
       status: '',
       value1: [], // 起始时间
       abilityDepartment: '', // 上架部门或申请部门
-      provideDepartment:'',//提供部门
+      provideDepartment: '', // 提供部门
       abilityType: '', // 能力
       beginTime: '', // 开始时间
       endTime: '', // 结束时间
@@ -744,7 +740,7 @@ export default {
             startDate: this.startDate,
             endDate: this.endDate,
             resourceName: this.resourceName,
-            provideDept:this.provideDepartment
+            provideDept: this.provideDepartment
 
           }
         })
@@ -758,7 +754,7 @@ export default {
             startDate: this.startDate,
             endDate: this.endDate,
             resourceName: this.resourceName,
-            provideDept:this.provideDepartment
+            provideDept: this.provideDepartment
           })
         })
     },
@@ -986,10 +982,10 @@ export default {
       this.endDate = ''
       this.examineStatus = ''
       this.abilityDepartment = ''
-      this.provideDepartment=''
+      this.provideDepartment = ''
       this.abilityType = ''
       this.approveStatus = ''
-      this.resourceName=''
+      this.resourceName = ''
       this.exportExcelCondition = qs.stringify({
         approveStatus: this.status,
         deptId: this.abilityDepartment,
@@ -997,14 +993,13 @@ export default {
         endDate: this.endDate,
         resourceName: this.resourceName
       })
-      if (this.departmentId === 1) {//能力上架统计
+      if (this.departmentId === 1) { // 能力上架统计
         this.handleChose(1)
-      } else if (this.departmentId === 2) {//能力使用统计
+      } else if (this.departmentId === 2) { // 能力使用统计
         this.handleChose(2)
-    
+      } else if (this.departmentId === 3) { // 能力上架明细
-      } else if (this.departmentId === 3) {//能力上架明细
         this.handleChose(3)
-      } else {//能力使用明细
+      } else { // 能力使用明细
         this.handleChose(4)
       }
     },

back/src/views/modules/activiti/my-work-dynamics.vue

@@ -508,12 +508,13 @@ export default {
     },
     // 删除数据
     deleteData (row) {
+      this.deleteDataArr.push(row.id)
       if (this.deleteDataArr.length < 1) {
         this.$message({
           type: 'info',
           message: '请选择要删除的数据'
         })
-      }else{
+      } else {
         this.$confirm('此操作将删除当前数据, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -521,9 +522,9 @@ export default {
         })
           .then(async () => {
             let ids = []
-          if(row.id && this.deleteDataArr.length==0){
+            if (row.id && this.deleteDataArr.length == 0) {
               ids = [row.id]
-          }else{
+            } else {
               ids = this.deleteDataArr
             }
             this.$http
@@ -546,7 +547,8 @@ export default {
               type: 'info',
               message: '已取消删除'
             })
-        })}
+          })
+      }
     },
     // 预览工作动态信息
     async openPreviewData (row) {

back/src/views/modules/canassigncase/index.vue

@@ -65,6 +65,7 @@
           header-align="center"
           align="center"
         ></el-table-column>
+        <template v-if="dataList[0]">
           <el-table-column
           v-for="(item, index) in dataList[0].infoList"
           :key="index"
@@ -77,6 +78,7 @@
             {{ findValue(scope.row.infoList, item.attrType) }}
           </template>
         </el-table-column>
+        </template>
         <el-table-column
           :label="$t('handle')"
           fixed="right"
@@ -171,11 +173,11 @@ export default {
   },
   mounted () {
     window.addEventListener('resize', this.a)
-    this.fullScreen();
+    this.fullScreen()
     this.$nextTick(() => {
-    this.$refs.singleTable.doLayout(); // 解决表格错位
+      this.$refs.singleTable.doLayout() // 解决表格错位
-    //:height="qp ? '810px' : '650px'"
+    // :height="qp ? '810px' : '650px'"
-    });
+    })
   },
   methods: {
     reset () {

back/src/views/modules/sys/user.vue

@@ -2,25 +2,25 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__user">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <el-form-item label="用户名">
           <el-input v-model="dataForm.username" placeholder="用户名" clearable></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item label="真实姓名">
           <el-input v-model="dataForm.real_name" placeholder="真实姓名" clearable></el-input>
         </el-form-item>
-        <el-form-item>
-          <ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
-        </el-form-item>
         <!-- <el-form-item>
-          <el-select v-model="dataForm.postId" :placeholder="$t('user.postIdList')" clearable>
+          <ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
-            <el-option :label="data.postName" v-for="data in postList" :key="data.id" :value="data.id">{{ data.postName
+        </el-form-item> -->
+        <el-form-item label="所属部门">
+          <el-select v-model="dataForm.deptId" :placeholder="$t('infrastructure.department')" clearable>
+            <el-option :label="data.name" v-for="data in deptList" :key="data.id" :value="data.id">{{ data.name
             }}</el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :query="true" ref="renDeptTree">
           </ren-dept-tree>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <el-button type="primary" @click="getDataList()">{{
           $t('query')
@@ -97,7 +97,7 @@ import AddOrUpdate from './user-add-or-update'
 import qs from 'qs'
 export default {
   mixins: [mixinViewModule],
-  data() {
+  data () {
     return {
       mixinViewModuleOptions: {
         getDataListURL: '/sys/user/page',
@@ -106,7 +106,7 @@ export default {
         deleteIsBatch: true,
         exportURL: '/sys/user/export'
       },
-      postList: [],
+      deptList: [],
       dataForm: {
         username: '',
         deptId: '',
@@ -118,18 +118,18 @@ export default {
   components: {
     AddOrUpdate
   },
-  created() {
+  created () {
-    this.getPostList()
+    this.getDeptList()
   },
   methods: {
-    reset() {
+    reset () {
       this.dataForm.username = ''
       this.dataForm.real_name = ''
       this.dataForm.deptId = ''
       this.dataForm.postId = ''
       this.dataForm.gender = ''
       if (this.$refs.renDeptTree) {
-        this.$refs.renDeptTree.showDeptName = '';
+        this.$refs.renDeptTree.showDeptName = ''
       }
       this.$http
         .get(
@@ -165,16 +165,13 @@ export default {
           this.dataListLoading = false
         })
     },
-    getPostList() {
+    getDeptList () {
-      this.$http
+      this.$http.get('/sys/dept/list').then(({ data: res }) => {
-        .get('/sys/post/list')
-        .then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
-          this.postList = res.data
+        this.deptList = res.data
-        })
+      }).catch(() => { })
-        .catch(() => { })
     }
   }
 }

front/src/views/home/DetailsPageconetent.vue

@@ -88,7 +88,7 @@
               </span>
               <div
                 class="leixingsumfather"
-                :class="!item.shrinkFlag ? 'shrink' : ''"
+                :class="!item.shrinkFlag ? 'shrink' : 'shrink'"
               >
                 <div
                   v-for="(item2, index2) in item.typeList"
@@ -108,7 +108,7 @@
                   </a-checkable-tag>
                 </div>
               </div>
-              <div
+              <!-- <div
                 class="shrinkTag"
                 v-if="item.showShrink"
                 :key="item.shrinkFlag"
@@ -121,7 +121,7 @@
                   v-show="item.shrinkFlag"
                   @click="changeShrink(item.name)"
                 />
-              </div>
+              </div> -->
             </div>
           </div>
         </template>

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

@@ -62,6 +62,42 @@
               item.infoList.filter((val) => val.attrType == '应用图片')[0]
                 .attrValue
             "
+            :fallback="imgSrcYyzy"
+          />
+        </div>
+        <div
+          class="left"
+          style="display: flex; align-items: center"
+          v-else-if="
+            (item.type === '组件服务' &&
+              item.infoList &&
+              item.infoList.filter((val) => val.attrType == '图层缩略图')[0]) ||
+            item.infoList.filter((val) => val.attrType == '组件图片')[0]
+          "
+        >
+          <a-image
+            v-if="
+              item.infoList.filter((val) => val.attrType == '图层缩略图')[0]
+            "
+            :width="106"
+            :preview="false"
+            :src="
+              item.infoList.filter((val) => val.attrType == '图层缩略图')[0]
+                .attrValue
+            "
+            :fallback="imgSrcTcfw"
+          />
+          <a-image
+            v-else-if="
+              item.infoList.filter((val) => val.attrType == '组件图片')[0]
+            "
+            :width="106"
+            :preview="false"
+            :src="
+              item.infoList.filter((val) => val.attrType == '组件图片')[0]
+                .attrValue
+            "
+            :fallback="item.type == '开发组件' ? imgSrcKfzj : imgSrcYwzj"
           />
         </div>
         <div
@@ -253,6 +289,18 @@
             </div>
           </div>
           <div class="dec">
+            <div
+              v-if="
+                item.infoList.filter((val) => val.attrType == '组件类型')[0]
+              "
+            >
+              <span>
+                {{
+                  item.infoList.filter((val) => val.attrType == '组件类型')[0]
+                    .attrValue
+                }}
+              </span>
+            </div>
             <div
               v-if="
                 selectCardsname !== '融合服务' &&
@@ -619,8 +667,8 @@
             let pathData = {
               path: '/details',
               id: item.id,
-        };
+            }
-         mybus.emit('changeMenuStyle',pathData);
+            mybus.emit('changeMenuStyle', pathData)
           }
         }
       }
@@ -766,7 +814,10 @@
             integrationServiceOrderDom.value.reset()
         }
       })
-
+      const imgSrcYyzy = ref(require('@/assets/home/yyzy_square.png'))
+      const imgSrcTcfw = ref(require('@/assets/home/tcfw_square.png'))
+      const imgSrcKfzj = ref(require('@/assets/home/kfzj_square.png'))
+      const imgSrcYwzj = ref(require('@/assets/home/ywzj_square.png'))
       let videoUrl = ref('')
       const options = reactive({
         width: '700px', //播放器宽度
@@ -821,8 +872,8 @@
         let pathData = {
           path: '/algorithmCompare',
           id: item.id,
-        };
+        }
-         mybus.emit('changeMenuStyle',pathData);
+        mybus.emit('changeMenuStyle', pathData)
       }
       return {
         onSearch,
@@ -847,6 +898,10 @@
         integrationServiceOrderDom,
         orderObj,
         getTagList,
+        imgSrcYyzy,
+        imgSrcTcfw,
+        imgSrcKfzj,
+        imgSrcYwzj,
       }
     },
     beforeUnmount() {

front/src/views/home/detailBack.vue

@@ -1,68 +1,73 @@
+<!--
+ * @Author: Light
+ * @Date: 2022-11-24 09:07:50
+ * @LastEditors: Light
+ * @LastEditTime: 2022-11-25 09:56:50
+ * @Description: 告诉大家这是什么
+-->
 <template>
-  <div>
+  <div class="detail-back" @click="goToDetailsPageconetent">
-   <div class="nav-box">
+    <!-- <div class="nav-box"> -->
-        <a-breadcrumb>
+    <!-- <a-breadcrumb>
           <a-breadcrumb-item @click="goToDetailsPageconetent" class="bread-crumb-span">能力集市</a-breadcrumb-item>
           <a-breadcrumb-item>{{detailName}}</a-breadcrumb-item>
-        </a-breadcrumb>
+        </a-breadcrumb> -->
-      </div>
+    <!-- </div> -->
   </div>
 </template>
 
 <script setup>
-import { reactive, ref, watch, defineProps } from 'vue'
+  import { reactive, ref, watch, defineProps } from 'vue'
-import { useRouter } from 'vue-router'
+  import { useRouter } from 'vue-router'
-import { useStore } from 'vuex'
+  import { useStore } from 'vuex'
-import mybus from '@/myplugins/mybus'
+  import mybus from '@/myplugins/mybus'
-const router = useRouter()
+  const router = useRouter()
-const oldValue1= ref('')
+  const oldValue1 = ref('')
-const props = defineProps({
+  const props = defineProps({
     textColor: { type: String, default: '' },
-})
+  })
 
-const previousPage = () => {
+  const previousPage = () => {
-  if (window.history.state.back){
+    if (window.history.state.back) {
       window.history.go(-1)
-  } else{
+    } else {
       router.push({
         path: '/integrationServices',
       })
     }
+  }
 
-}
+  const detailName = ref('应用资源')
 
-const detailName = ref("应用资源")
+  const goToDetailsPageconetent = () => {
-
-const goToDetailsPageconetent = () =>{
     let pathData = {
       path: '/DetailsPageconetent',
-        };
+    }
-     mybus.emit('changeMenuStyle',pathData);
+    mybus.emit('changeMenuStyle', pathData)
-}
+  }
-
 </script>
 
 <style scoped lang="less">
-.detail-back {
+  .detail-back {
     position: absolute;
-  top: 0.6rem;
+    top: 1rem;
     left: 100px;
     font-size: 0.18rem;
     color: #fff;
     cursor: pointer;
     width: 50px;
     height: 50px;
-  //background-image: url('~@/assets/detailsAll/back.png');
+    background-image: url('~@/assets/detailsAll/back.png');
     background-size: 100% 100%;
-}
+  }
   .nav-box {
     position: absolute;
     top: 0.6rem;
-  //left: 100px;
+    left: 100px;
     font-size: 0.18rem;
     color: #fff;
     height: 30px;
-      line-height:30px;
+    line-height: 30px;
     width: 100%;
     font-size: 14px;
     display: flex;
@@ -70,7 +75,7 @@ const goToDetailsPageconetent = () =>{
     background: rgba(244, 245, 248, 0.8);
     padding-left: 145px;
     padding-top: 5px;
-      .bread-crumb-span{
+    .bread-crumb-span {
       cursor: pointer;
     }
   }

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

@@ -257,7 +257,7 @@
         path: '/DetailsPageconetent',
         query: {
           // select: '组件服务',
-          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
+          select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
         },
       })
       window.location.href = newpage.href

front/src/views/newHome/components/WorkDynamics.vue

@@ -125,7 +125,7 @@
     if (abilityToTypeFunctionData.value == '组件服务') {
       if (!componentTypeValue.value || componentTypeValue.value == '') {
         message.error('请选择组件类型！')
-        componentTypeValueOld.value=''
+        componentTypeValueOld.value = ''
         return
       } else if (
         componentTypeValue.value === '智能算法' ||

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

@@ -2,32 +2,58 @@
   <div class="on-the-right-side-of-the-list">
     <div class="title">我的发布</div>
     <div class="sousuokuang">
-      <a-input-search v-model:value="name" placeholder="请输入关键词" enter-button="搜索" size="large" @change="onSearch"
+      <a-input-search
-        @search="getApplyList(tabname)" />
+        v-model:value="name"
-      <a-button type="primary" style="width: 0.9rem; height: 0.36rem; margin-left: 0.1rem" @click="showModal2">
+        placeholder="请输入关键词"
+        enter-button="搜索"
+        size="large"
+        @change="onSearch"
+        @search="getApplyList(tabname)"
+      />
+      <a-button
+        type="primary"
+        style="width: 0.9rem; height: 0.36rem; margin-left: 0.1rem"
+        @click="showModal2"
+      >
         能力上架
       </a-button>
-      <a-button type="primary" style="width: 0.9rem; height: 0.36rem; margin-left: 0.1rem" @click="replacement">
+      <a-button
+        type="primary"
+        style="width: 0.9rem; height: 0.36rem; margin-left: 0.1rem"
+        @click="replacement"
+      >
         重置
       </a-button>
     </div>
     <div class="tab">
       <span>能力类型</span>
-      <div :class="tabIndex == index ? 'tabclass' : ' '" @click="tabqiehuan(item, index)"
+      <div
-        v-for="(item, index) in tabList" :key="index">
+        :class="tabIndex == index ? 'tabclass' : ' '"
+        @click="tabqiehuan(item, index)"
+        v-for="(item, index) in tabList"
+        :key="index"
+      >
         {{ item }}
       </div>
     </div>
     <div class="tab" style="margin-top: 0.1rem">
       <span>能力状态</span>
-      <div :class="tabIndex2 == index ? 'tabclass' : ' '" @click="tabqiehuan2(item, index)"
+      <div
-        v-for="(item, index) in tabList2" :key="index">
+        :class="tabIndex2 == index ? 'tabclass' : ' '"
+        @click="tabqiehuan2(item, index)"
+        v-for="(item, index) in tabList2"
+        :key="index"
+      >
         {{ item }}
       </div>
     </div>
     <div v-if="dataList.data.length > 0">
       <div class="content">
-        <div class="content-body" v-for="item in dataList.data" :key="item.index">
+        <div
+          class="content-body"
+          v-for="item in dataList.data"
+          :key="item.index"
+        >
           <div class="content-body-title" v-if="item.currentTaskList">
             <!-- {{ item.currentTaskList[0].taskName }} -->
           </div>
@@ -45,27 +71,57 @@
             <!-- <div></div> -->
           </div>
           <div class="button">
-            <div @click="showModal(item)" v-if="item.delFlag != 2" :class="item.delFlag != 0 ? 'del' : ''">
+            <div
+              @click="showModal(item)"
+              v-if="item.delFlag != 2"
+              :class="item.delFlag != 0 ? 'del' : ''"
+            >
               能力下架
             </div>
-            <div @click="showDetail(item)" v-if="item.delFlag != 2" :class="item.delFlag != 0 ? 'del' : ''">
+            <div
+              @click="showDetail(item)"
+              v-if="item.delFlag != 2"
+              :class="item.delFlag != 0 ? 'del' : ''"
+            >
               查看详情
             </div>
-            <svg t="1652233950228" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"
+            <svg
-              p-id="5970" data-spm-anchor-id="a313x.7781069.0.i8" width="80" height="80"
+              t="1652233950228"
-              v-if="item.delFlag == 4 || item.delFlag == 5" style="position: absolute; top: 0.2rem; left: 0.1rem">
+              class="icon"
+              viewBox="0 0 1024 1024"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              p-id="5970"
+              data-spm-anchor-id="a313x.7781069.0.i8"
+              width="80"
+              height="80"
+              v-if="item.delFlag == 4 || item.delFlag == 5"
+              style="position: absolute; top: 0.2rem; left: 0.1rem"
+            >
               <path
                 d="M955.22053 256C813.82053 11.2 500.72053-72.6 255.92053 68.8S-72.67947 523.2 68.72053 768 523.22053 1096.6 768.02053 955.2c244.7-141.2 328.6-454.1 187.4-698.8 0-0.1-0.1-0.3-0.2-0.4zM762.02053 944.7c-239 138.1-544.8 56.2-682.9-182.8S22.92053 217.1 261.92053 79.1s544.8-56.2 682.9 182.8c137.9 239 56.1 544.6-182.8 682.8z"
-                fill="#515151" opacity=".5" p-id="5971"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5971"
+              ></path>
               <path
                 d="M898.12053 289.2C775.02053 76 502.42053 2.9 289.22053 126 76.02053 249.1 3.02053 521.6 126.02053 734.8 249.12053 948 521.62053 1021.1 734.82053 898 947.92053 774.9 1021.02053 502.4 898.12053 289.2zM731.62053 892.8C521.32053 1014.3 252.42053 942.2 131.02053 731.9 9.52053 521.6 81.62053 252.7 291.92053 131.3 502.12053 9.9 771.02053 81.8 892.42053 292c121.5 210.3 49.5 479.3-160.8 600.8z"
-                fill="#515151" opacity=".5" p-id="5972"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5972"
+              ></path>
               <path
                 d="M323.62053 176.8c3.6-2 6 0.8 8.8 2.8 6 4.4 12.4 8.8 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.4 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.6 0.6-2zM200.72053 289.2c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 13.6-5.6 20.8 4.8 6 10 11.6 14.8 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.4-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.4-1.2 0-1.6 0.8-2.4l0.2 0.4z m276.6-159.6c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.8-1.2-0.4-1.6 0.4-2.4l0.2 0.4z m141.9 29.6c3.6-2 6 0.8 8.8 2.8l18.8 12.8c7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-3.6 14-5.6 20.8 4.8 6 10 12 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4-7.7 0.4-15.2 0.8-22.4 0.8-4.4 6.8-8.4 13.2-12.8 20-1.6 2.4-4 5.1-7.2 4-2.4-1.9-3.9-4.7-4.4-7.7l-7.2-20.5c-8.4-2-16.8-4.4-25.2-6.4-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 4-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.5-1.2 0.2-1.6 0.6-2zM150.02053 430c3.6-2 6 0.8 8.8 2.8 6.4 4.4 12.4 8.4 18.8 12.8 7.2-2.4 14.4-5.1 21.6-7.7 3.6-1.2 6-2.8 8.8 0.4 2.4 2.8 0.4 6.4-0.4 8.8-2 6.8-4 14-5.6 20.8 4.8 6 10 11.6 15.2 17.6 2.4 2.8 4.4 5.6 2.8 8.4-1.2 2.8-5.6 2.4-7.7 2.4l-22.4 0.8c-4.4 6.8-8.8 13.6-12.8 20-1.6 2.4-4 5.1-7.2 4-2.2-2-3.8-4.7-4.4-7.7l-7.2-20.5-25.2-6.4c-2.3-1.2-3.6-3.8-3.2-6.4 1.3-1.8 2.9-3.3 4.8-4.4 3.6-3.2 7.7-6.8 11.6-10 1.9-1.3 3.6-2.7 5.1-4.4-0.4-6.8-1.2-13.6-1.6-20.5-0.7-2.9-0.9-5.9-0.4-8.8-0.7-0.8-0.3-1.5 0.6-2z m558.9 414.4c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.1 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-1.1 0.8-1.1 1.6-1.1h0.1z m-158.8 50c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.1-3.7-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2-1 4.2-1.7 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.4-0.8 0.8-0.8 1.7-0.7z m276.5-159.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8s-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.2 4.4-0.7 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0-0.8 0.8-1.2 1.6-1.2l0.1 0.1z m45.6-137.6c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-1.6-14-3.6-20.8-5.6l-7.7-22c-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.2-0.7 0.6-0.7 1.4-0.7h0.3zM402.72053 868c3.6-2.4 2.4-5.6 2-8.8l-1.6-22.4 17.2-14.8c2.8-2.4 5.1-4 4-7.7-1.2-3.2-5.6-3.6-7.7-4-6.8-2-14-3.6-20.8-5.6-2.8-7.2-5.1-14.4-7.7-21.6-1.2-3.6-2.8-6.4-5.6-6.8-2.8-0.4-4.8 3.6-5.6 5.1l-12 19.2-24 1.2c-2.8 0-6.8 0.8-6.8 4.4 0.5 3 2 5.7 4.4 7.7 4.8 5.6 9.2 11.2 14 16.4l-7.2 25.2c-0.3 2.7 1.4 5.2 4 6 2.2-0.3 4.3-0.9 6.4-1.6l14.4-4.8c2.1-0.8 4.2-1.5 6.4-2 5.6 4 11.2 7.7 16.8 11.6 2.2 2.1 4.8 3.6 7.7 4.4 0.5-0.8 1-1.1 1.7-1.1z"
-                fill="#515151" opacity=".5" p-id="5973"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5973"
+              ></path>
               <path
                 d="M386.42053 590.4l-43.8-75.9L207.02053 592.7l10.2 17.7L334.02053 543l23.4 40.4-90.5 52.2-13.5-23.4-18.7 10.8 53.1 92c9.1 15.8 21.2 19.5 36.4 10.7l98.8-57c6.2-3.6 11-9.3 13.4-16.1-1.4-15.9-6.2-31.2-14.2-45l-21.4 4.8c6.7 10.3 11 21.9 12.8 34-1 3.3-3.2 6-6.1 7.8l-88.3 51c-6.2 3.6-11.1 2.1-14.8-4.3l-27.3-47.4 109.3-63.1z m2.9-103.2l10.4 18.1 65.6-37.9 79.9 138.4 18.6-10.8-55.9-96.9c18.8-0.9 43.2-0.6 73 0.7l1.5-23.1c-29.8-0.3-58.4 0.4-86 2.6l-12.5-21.6 74.9-43.2-10.4-18.1-159.1 91.8zM669.52053 329l38.2 66.2 61.4-35.4-38.1-66.1-61.5 35.3z m72.4 24.2l-26.3 15.2-19-33 26.3-15.2 19 33zM599.02053 356.7l7.9 13.7-23.3 13.5 9.8 17 21.8-12.6c7.5 18.7 6.6 39.6-2.5 57.6l20.7 4.4c10.3-23.1 10.3-49.4 0-72.5l18.8-10.9c6 9.2 10.7 19.2 14.2 29.7 0.3 5-2.6 9.7-7.2 11.7-2.9 1.2-6.4 2.8-10.9 4.9l14.1 14.1c3.7-1.3 7.3-2.9 10.7-4.8 8.6-3.9 14.4-12.2 15.2-21.6-5.4-22.1-14.6-43-27.4-61.8l-36.1 20.8-7.9-13.7-17.9 10.5z m29.9 108.1l10 17.4 53.2-30.7c-7.8 23.7-20.6 45.4-37.5 63.6l20.6 11.1c18.6-24.2 30-53.1 33-83.4l29.8 51.5 18.4-10.7-29.8-51.5c27.4 11.5 57.2 16.3 86.9 14.1l3.5-23.5c-24.7 5.1-50.1 5-74.8-0.1l53.5-30.9-10-17.3-69.3 40-7.3-12.6-18.4 10.7L698.02053 425l-69.1 39.8z"
-                fill="#515151" opacity=".5" p-id="5974"></path>
+                fill="#515151"
+                opacity=".5"
+                p-id="5974"
+              ></path>
             </svg>
             <!-- <div v-if="item.delFlag == 0" class="button-son">审核通过</div>
             <div v-if="item.delFlag != 0">未审核</div> -->
@@ -76,112 +132,161 @@
         </div>
       </div>
       <div class="bottom">
-        <a-pagination size="small" :total="total" show-size-changer show-quick-jumper @change="handleCurrentChange"
+        <a-pagination
-          @showSizeChange="handlePageSizeChange" />
+          size="small"
+          :total="total"
+          show-size-changer
+          show-quick-jumper
+          @change="handleCurrentChange"
+          @showSizeChange="handlePageSizeChange"
+        />
       </div>
     </div>
     <a-empty v-else />
-    <a-modal v-model:visible="detailsVisible" :title="tabname" style="width: 9rem" :footer="null" destroyOnClose="true"
+    <a-modal
-      :maskClosable="false">
+      v-model:visible="detailsVisible"
-      <publish-details :businessKey="businessKey" :processInstanceId="processInstanceId"></publish-details>
+      :title="tabname"
+      style="width: 9rem"
+      :footer="null"
+      destroyOnClose="true"
+      :maskClosable="false"
+    >
+      <publish-details
+        :businessKey="businessKey"
+        :processInstanceId="processInstanceId"
+      ></publish-details>
     </a-modal>
-    <a-modal v-model:visible="increasedVisible" :title="tabname" style="width: 9rem" :footer="null"
+    <a-modal
-      destroyOnClose="true" :maskClosable="false">
+      v-model:visible="increasedVisible"
+      :title="tabname"
+      style="width: 9rem"
+      :footer="null"
+      destroyOnClose="true"
+      :maskClosable="false"
+    >
       <the-new-release></the-new-release>
     </a-modal>
-    <a-modal v-model:visible="visible" width="12.1rem" @ok="del()" @cancel="reason = ''" footer="">
+    <a-modal
+      v-model:visible="visible"
+      width="12.1rem"
+      @ok="del()"
+      @cancel="reason = ''"
+      footer=""
+    >
       <TheShelvesAbility v-if="visible" :delObj="delObj"></TheShelvesAbility>
       <!-- <a-input v-model:value="reason" placeholder="请输入下架原因" /> -->
     </a-modal>
-    <a-modal v-model:visible="visible2" @ok="handleOk" class="shangjia-class" @cancel="handlecancel">
+
+    <a-modal v-model:visible="visible2" class="shangjia-class">
       <div class="ant-modal-title" id="vcDialogTitle1">
-        <div class="showBg"></div>
+        <!-- <div class="showBg"></div> -->
         能力上架申请
       </div>
       <div class="ability-to-type">
         <div class="title">能力类型选择</div>
-        <div class="content">
+        <div class="ability-to-type-content">
-          <div v-for="item in abilityToType" :key="item" @click="abilityToTypeFunction(item)" :class="
+          <div
+            v-for="item in abilityToType"
+            :key="item"
+            @click="abilityToTypeFunction(item)"
+            :class="
               abilityToTypeFunctionData == item ? 'ability-to-type-down' : ''
-          ">
+            "
+          >
             {{ item }}
           </div>
         </div>
       </div>
-      <div class="component-type" v-if="abilityToTypeFunctionData == '组件服务'">
+
+      <div
+        class="ability-to-type"
+        v-if="abilityToTypeFunctionData == '组件服务'"
+      >
         <div class="title">组件类型选择</div>
-        <div class="content">
+        <div class="ability-to-type-content">
-          <!-- <a-checkbox-group
+          <div
-                v-model:value="value1"
+            v-for="item in componentType"
-                name="checkboxgroup"
+            :key="item"
-                :options="componentType"
+            @click="componentTypeValueFunction(item)"
-              /> -->
+            :class="componentTypeValue == item ? 'ability-to-type-down' : ''"
-          <a-radio-group v-model:value="componentTypeValue">
+          >
-            <a-radio @click="componentTypeValueFunction(item)" v-for="item in componentType" :key="item" :value="item">
             {{ item }}
-            </a-radio>
-          </a-radio-group>
           </div>
         </div>
+      </div>
+      <template v-slot:footer>
+        <a-button class="shenqing" @click="handleOk">申请</a-button>
+        <a-button class="quxiao" @click="handlecancel">取消</a-button>
+      </template>
     </a-modal>
   </div>
 </template>
 
 <script setup>
-import { onMounted, reactive, ref, onBeforeUnmount } from 'vue'
+  import { onMounted, reactive, ref, onBeforeUnmount } from 'vue'
-import { useRouter } from 'vue-router'
+  import { useRouter } from 'vue-router'
-import { message } from 'ant-design-vue'
+  import { message } from 'ant-design-vue'
-import mybus from '@/myplugins/mybus'
+  import mybus from '@/myplugins/mybus'
-// , reactive
+  // , reactive
-import { wodepage, undercarriage } from '@/api/personalCenter'
+  import { wodepage, undercarriage } from '@/api/personalCenter'
-import { getUserInfo } from '@/api/user'
+  import { getUserInfo } from '@/api/user'
-// TheNewRelease
+  // TheNewRelease
-import TheNewRelease from '@/views/personalCenter/components/TheNewRelease'
+  import TheNewRelease from '@/views/personalCenter/components/TheNewRelease'
-import PublishDetails from '@/views/personalCenter/components/PublishDetails'
+  import PublishDetails from '@/views/personalCenter/components/PublishDetails'
-import TheShelvesAbility from '@/views/personalCenter/components/TheShelvesAbility' //能力下架申请
+  import TheShelvesAbility from '@/views/personalCenter/components/TheShelvesAbility' //能力下架申请
-const router = useRouter()
+  const router = useRouter()
-let tabList = ref([
+  let tabList = ref([
     // '全部',
     // ' 基础建设',
     // ' 数据资源',
     '组件服务',
     '应用资源',
     // '知识库',
-])
+  ])
-let tabList2 = ref(['已上架', '已下架'])
+  let tabList2 = ref(['已上架', '已下架'])
-// const contentList = reactive({
+  // const contentList = reactive({
-//   data: [
+  //   data: [
-//     {
+  //     {
-//       currentTaskList: [
+  //       currentTaskList: [
-//         {
+  //         {
-//           taskName: '111',
+  //           taskName: '111',
-//           createTime: '222222222222',
+  //           createTime: '222222222222',
-//           assigneeName: '333333333',
+  //           assigneeName: '333333333',
-//         },
+  //         },
-//       ],
+  //       ],
-//       name: '111111',
+  //       name: '111111',
-//     },
+  //     },
-//   ],
+  //   ],
-// })
+  // })
-// const contentListClone = reactive({ data: [] })
+  // const contentListClone = reactive({ data: [] })
-// let contentListLength = contentList.length
+  // let contentListLength = contentList.length
-let name = ref('')
+  let name = ref('')
-let tabIndex = ref(0)
+  let tabIndex = ref(0)
-let tabIndex2 = ref(-1)
+  let tabIndex2 = ref(-1)
-const visible2 = ref(false)
+  const visible2 = ref(false)
-const showModal2 = () => {
+  const showModal2 = () => {
     visible2.value = true
-}
+  }
-let componentTypeValue = ref('')
+  let componentTypeValue = ref('')
-let abilityToTypeFunctionData = ref('组件服务')
+  let abilityToTypeFunctionData = ref('组件服务')
-function handlecancel() {
+  function handlecancel() {
     abilityToTypeFunctionData.value = '组件服务'
     componentTypeValue.value = ''
-}
+  }
-function abilityToTypeFunction(item) {
+  function abilityToTypeFunction(item) {
     abilityToTypeFunctionData.value = item
-}
+  }
-const handleOk = (e) => {
+  let componentTypeValueOld = ref('')
+  function componentTypeValueFunction(item) {
+    componentTypeValue.value = item
+    if (componentTypeValueOld.value != item) {
+      componentTypeValue.value = item
+      componentTypeValueOld.value = item
+    } else {
+      componentTypeValue.value = ''
+    }
+  }
+  const handleOk = (e) => {
     let snum = ref({})
     if (abilityToTypeFunctionData.value == '组件服务') {
       if (!componentTypeValue.value || componentTypeValue.value == '') {
@@ -215,18 +320,18 @@ const handleOk = (e) => {
     abilityToTypeFunctionData.value = '组件服务'
     componentTypeValue.value = ''
     console.log(e)
-}
+  }
-let abilityToType = ref(['组件服务', '应用资源'])
+  let abilityToType = ref(['组件服务', '应用资源'])
-let componentType = ref([
+  let componentType = ref([
     '智能算法',
     '图层服务',
     '开发组件',
     // '办公组件',
     '业务组件',
     // '其他',
-])
+  ])
-let tabname = ref('组件服务')
+  let tabname = ref('组件服务')
-function tabqiehuan(item, index) {
+  function tabqiehuan(item, index) {
     tabIndex.value = index
     switch (item) {
       case '组件服务':
@@ -247,8 +352,8 @@ function tabqiehuan(item, index) {
       //   getApplyList()
       //   break
     }
-}
+  }
-function tabqiehuan2(item, index) {
+  function tabqiehuan2(item, index) {
     if (index == tabIndex2.value) {
       tabIndex2.value = -1
       delFlag = ''
@@ -265,27 +370,27 @@ function tabqiehuan2(item, index) {
     }
     page.value = 1
     getApplyList(tabname.value)
-}
+  }
-//搜索
+  //搜索
-function onSearch(value) {
+  function onSearch(value) {
     console.log('搜索框', value)
     // getApplyList(tabname.value, value)
-}
+  }
-//重置
+  //重置
-function replacement() {
+  function replacement() {
     name.value = ''
     tabIndex.value = 0
     tabname.value = '组件服务'
     getApplyList(tabname.value)
-}
+  }
-const detailsVisible = ref(false)
+  const detailsVisible = ref(false)
-const increasedVisible = ref(false)
+  const increasedVisible = ref(false)
-const businessKey = ref('')
+  const businessKey = ref('')
-const processInstanceId = ref('')
+  const processInstanceId = ref('')
-// const showIncreased = () => {
+  // const showIncreased = () => {
-//   increasedVisible.value = true
+  //   increasedVisible.value = true
-// }
+  // }
-const showDetail = (item) => {
+  const showDetail = (item) => {
     console.log('showDetail', item, item.id)
     if (item.delFlag == 0) {
       router.push({
@@ -300,16 +405,16 @@ const showDetail = (item) => {
     // detailsVisible.value = true
     // businessKey.value = item.businessKey
     // processInstanceId.value = item.processInstanceId
-}
+  }
 
-const total = ref('')
+  const total = ref('')
-const page = ref('1')
+  const page = ref('1')
-const ended = ref('')
+  const ended = ref('')
-let delFlag = ''
+  let delFlag = ''
-let dataList = reactive({ data: [] })
+  let dataList = reactive({ data: [] })
-const limt = ref('10')
+  const limt = ref('10')
-//初始化查询
+  //初始化查询
-const getApplyList = (item) => {
+  const getApplyList = (item) => {
     console.log(delFlag)
     getUserInfo().then((res) => {
       let ids = ref('')
@@ -332,30 +437,30 @@ const getApplyList = (item) => {
       })
       console.log('用户信息', ids.value)
     })
-}
+  }
-const handleCurrentChange = (val, size) => {
+  const handleCurrentChange = (val, size) => {
     page.value = val
     limt.value = size
     getApplyList(tabname.value)
-}
+  }
-const newpage = router.resolve({
+  const newpage = router.resolve({
     path: '/nenglishangjia', // 跳转的页面路由
-})
+  })
-// const nenglishangjia = () => {
+  // const nenglishangjia = () => {
-//   window.open(newpage.href, '_blank')
+  //   window.open(newpage.href, '_blank')
-//   // router.resolve('/nenglishangjia')
+  //   // router.resolve('/nenglishangjia')
-// }
+  // }
-const handlePageSizeChange = (current, size) => {
+  const handlePageSizeChange = (current, size) => {
     page.value = current
     limt.value = size
     console.log('val', current, size)
     getApplyList(tabname.value)
-}
+  }
 
-// 下架能力
+  // 下架能力
-const del = () => {
+  const del = () => {
     console.log('下架================》', delObj.value)
-  let fileObj = delObj2.value.fileList && delObj2.value.fileList[0] || {}
+    let fileObj = (delObj2.value.fileList && delObj2.value.fileList[0]) || {}
     undercarriage({
       reason: delObj2.value.reason,
       title: delObj2.value.title,
@@ -376,38 +481,38 @@ const del = () => {
       visible.value = false
       getApplyList(tabname.value)
     })
-}
+  }
-//退出申请按钮
+  //退出申请按钮
-mybus.on('Cancellation', (val) => {
+  mybus.on('Cancellation', (val) => {
     visible.value = val
-})
+  })
-//提交申请按钮
+  //提交申请按钮
-mybus.on('Determine', (val) => {
+  mybus.on('Determine', (val) => {
     console.log('下架==============》', val)
     delObj2.value = val
     del()
-})
+  })
-onBeforeUnmount(() => {
+  onBeforeUnmount(() => {
     mybus.off('Cancellation')
     mybus.off('Determine')
-})
+  })
-const reason = ref('')
+  const reason = ref('')
-const visible = ref(false)
+  const visible = ref(false)
-const delObj = ref({})
+  const delObj = ref({})
-const delObj2 = ref({})
+  const delObj2 = ref({})
-const showModal = (item) => {
+  const showModal = (item) => {
     if (item.delFlag == 0) {
       delObj.value = item
       visible.value = true
     }
-}
+  }
-onMounted(() => {
+  onMounted(() => {
     getApplyList(tabname.value)
-})
+  })
 </script>
 
 <style scoped lang="less">
-.on-the-right-side-of-the-list {
+  .on-the-right-side-of-the-list {
     background: #ffffff;
     padding: 0.2rem 0rem 0.3rem 0.2rem;
     position: absolute;
@@ -570,11 +675,11 @@ onMounted(() => {
     .buttonAgree {
       background-color: #49c988;
     }
-}
+  }
 </style>
 
 <style lang="less">
-.shangjia-class {
+  .shangjia-class {
     position: fixed;
     left: 50%;
     top: 50%;
@@ -675,5 +780,5 @@ onMounted(() => {
       background-position: center;
       margin-right: 0.1rem;
     }
-}
+  }
 </style>