From 360efeb2f452daa7529d618f7fb0893f4c4367b5 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Thu, 23 Jun 2022 19:19:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/assets/home/remove-hover.png        | Bin 0 -> 1509 bytes
 front/src/assets/home/remove.png              | Bin 0 -> 1536 bytes
 .../Algorithm/AlgorithmTopDetails.vue         |   6 +-
 front/src/views/home/AbilityToApplyFor.vue    | 125 ++++++++++++++++++
 front/src/views/home/apply.vue                | 102 +++++++-------
 5 files changed, 186 insertions(+), 47 deletions(-)
 create mode 100644 front/src/assets/home/remove-hover.png
 create mode 100644 front/src/assets/home/remove.png
 create mode 100644 front/src/views/home/AbilityToApplyFor.vue

diff --git a/front/src/assets/home/remove-hover.png b/front/src/assets/home/remove-hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..9152216b270bd79073e5485d82a39d4e52a34b84
GIT binary patch
literal 1509
zcmaJ>drT8|96wryL=jAUY$}7Zs1rwfk5b#76ew+xPRk0ii5MS8d%z9u;q|aBVCtZN
zxMey+rej#dfMao12lJgNFb6taG8Y5$F<=-BzJ{AJSeUpg0`8BoOYVM;d_JG=>yxW6
zC$E}0eZh190A?DK^r^xM`rg0*;cF`>cq%OOc|$tCmdWDnI7a|lE0alpMhed+QVHDZ
z+<KXa0RZtLGA*4?H?6@e3?;*T7@31&1vUW0#5q{pl1uPlCXr3j8p*)93lfmDY9#9v
zCfLO4h#WGhfFsrxB&S&laxH4BBrX<=abSV~MesQ2pz>%N=FmvSbTMJ?yM`p-7=+K&
zNM0nBZZd;9h9f|QOd++vNHnNa%Mb+;twN$e6h`C_EQb)e6hSdqjUftf{E-OJIBOP`
zs!tq`C7d*p9G+(}2(sJlGP_*HaM=)|R;wWxg-}!~Afz@Y&EpO!ZHt&t&=WQbN3uN0
z(4bEd&t&p>jYP=wMF|u;DNEbN+axp$a^Nh4$Y5Vd6F`&c|DhB$iMH{n#LImDQ`nZ~
zWC<vhurc|ZMHpOGgfA3}={N%C87_@s@+P`y&S7}Qmcy{1P6sYqN77ctZi^g)n@pII
zw(&S^A&h#BL=cdXq!lx0wK|ntg(jkE7(om=Ev$#tdOflNRYogeL^;9LGnRacp!o@|
z^(9w6CD-Q!iWMU3369)GSQ9yh0>>)G$f<LIr_>wgTBpthnUV_$$w0oj{%g(?SAuzb
z+ez07he_WPv|x5laCPBp<?8`Jlws6s(;PP+?%SNSHYKz@&YlrcLDzZ93XOGf=1Q~H
z5EXtXs-+xU(qB7IZ_WzQ_#0eBtKE%n+zU6f6a{|&>VxmVz?SmL4<!{*hYkmG3%za2
zAB7I&sgK=y<arcu?S1*SlOrR~Vu$SKFLZyi>a*5UGfpo(Jgsn*`Kqo87{2(!ov;pR
zld|af2G!4D{F?4FzqIr<cq?ndrn#Jdi-E6H)n{hpOJ_aHlsEUR%*iWlFM(tIs3A(U
zzuJ9dcTfDvC|OyvQI!(1ar@(^?|A%*Yg$~dVE#K?D{tqBn8=4W{2v@SSU-DduT$h0
z4*GMG+dRh`UJ`M_yoawP*^?=qEq&flaZ>Gp^Wx9x5=O!AsywFXf4vJ;on83bU_$qv
z$j-*u$=6($hr4e+fl=?fOIC0EaXanFy1oWayyFm^{Ia-8(NR1UQ@$@8-L!Xpv$X%p
zYIpOB4PwXdn>s%rW}ZF(&pY86y%rd?H4?aVE~IoW(0VrH3b40pnYgio8LaF0W2AHk
z68}k%wKINkKm~K0)!rZaHD$Oe>F8!x^#*Ap-^ZVuqkx<Cxv+$fZ^TvtZLJ;t4MAp4
zbnyBH_ovbn5j*!@VU5SnlrfrhA7&${x}!}=TK9zlZB;<<fV<c5#o#D4>!W(VOJO}%
z?{_U|ZtH96d~<maI_q+V-(62xBA|XR;Vydorz3G`qPGuzeX$NOJXZGJPC2z`8Zc4>
zFJ54}B_1CAHZ&ghd)QD`c68T(*cn$H{p9(U-u<!l!9lme*YBQxeQ*1d;J@A?<*hsS
bkJgBSfb0aX5e#$o`F^}cL$cnRu%-AP-hwj8

literal 0
HcmV?d00001

diff --git a/front/src/assets/home/remove.png b/front/src/assets/home/remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..87b146bacc025c2754ac1861ffc2a4d783ab7cfa
GIT binary patch
literal 1536
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%!-*I5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Ts+(+JXrf?lsb^?v
zXkuZgqhMrUXsmBwtZ!(nYiML;U}<G&ssIH_K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*8BrK_fgfFD1Xc
zSQD(=*VoE3uec;JFFDoI#a0PufL>;1ij}K@k+X}Tfu);~rGcTLtFt9gz|zs#)Wz7;
zz}3LT0H)U^Ke;qFHLnDwHwB^B5vN{IO2{n$+U$~Alv$RV;#QQOs{r<~RVHq?nBz1L
zsy79<TP$$u)dxC89~7@h@eC6JCLRzIo@#*{c)Cx`119z&V5(ksbkiIL2BuO^7srr_
zTW_ZOW(Yfq9Iv0erDEfj-i%pF5&m4an!U6{mUy@Z9^s$R&>k0}^25<Fn_n(xiMgxm
z5|5?gqK+;fxnCabQjm+fprjSTv?yaXi*MAdTS8v4>6>~pOFSRvZEE_FFm3ML+V_9I
z@BLqGtgPaDyFt#h#zI@rl#hco!Nu;)mx~(?MSlP5+#$PMY2BCk)^B4@|C;*iRq@B^
zPvsdV%yE)=>-3}lzzy?u#yuR$vu-aeXL$6uqi;1I<BXqt&);W=9e(7Ma$hoK1#6yN
z>%N0R%s>9HZd}b=_|9z0JGXoGyr=hE*u*Inu6S$RfgdTI40me#Zd5QWT705fF{PT}
z)SYA2iW9_}y4Zy~&PltnE$A%!A*56xXtv(j&XT)s^1Z<4uJi72Uzb0;`8w;&YjXom
z-O&9!J)8gFhw$pqpxqpn6*uqfGk1uLd%9A@WW8hF*XU2Wa$gUx{$9ENB>#cujQLX?
z4YWTQ@oY4dmbt(n@=)irhttvn$;=Jmn(jho3`cmS!x&FQedg$ReD}gvh2IW$yOZy#
zY1iG^kl4+<*we%JaMPzZpFbER8MU5asQUcydsg7m*>ZN)nkzo0IR9KO<oo2-2A@ME
z8oD1876(t^IHD8cq^7!!p+c+Y&VMP!tKSRH2bS(Wqr9MWwRX;gf^YmSMrzN)+;7XR
zh?y~$eY>;L%<e$ufZPf@O^yTpPN^x*weM<5=T@>j<E&3yo!EOcP2{5Qid%IoDSwN$
zu2`WP?ys-2Qfm)0U#%0{tgZ=7&95GO`KGK?!n-V;i#cGOnWnXL;(f8|-;F`t_xS(V
z&)9Kk`IW}<bJb=wZb#mHj9I_bTeeLgH2FV2BO8OH(IG#jQ@@x&WwNKMpUXO@geCy%
Cw>uvI

literal 0
HcmV?d00001

diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
index 44ebfcd0..6edef0b1 100644
--- a/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
+++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmTopDetails.vue
@@ -128,6 +128,7 @@
       width: 7.2rem;
       color: #fff;
       margin-right: 0.8rem;
+      margin-top: -0.3rem;
       .top {
         display: flex;
         align-items: center;
@@ -135,10 +136,11 @@
           font-size: 14px;
         }
         .name {
-          // max-width: 330px;
+          display: inline-block;
+          width: 10.2rem;
           // overflow: hidden;
           // text-overflow: ellipsis;
-          white-space: nowrap;
+          // white-space: nowrap;
           font-size: 40px;
           margin-right: 20px;
         }
diff --git a/front/src/views/home/AbilityToApplyFor.vue b/front/src/views/home/AbilityToApplyFor.vue
new file mode 100644
index 00000000..8f2e607b
--- /dev/null
+++ b/front/src/views/home/AbilityToApplyFor.vue
@@ -0,0 +1,125 @@
+<template>
+  <div class="ability-to-apply-for">
+    <div class="title">申请能力</div>
+    <div
+      v-for="(item, index) in dataForm"
+      :key="index"
+      class="ability-to-apply-for-content"
+    >
+      <div class="dep-name">
+        <span></span>
+        {{ item.deptName }}
+      </div>
+      <div class="name">
+        <span>{{ item.name }}</span>
+        <span>{{ item.type }}</span>
+      </div>
+      <div class="description">{{ item.description }}</div>
+      <div class="remove" @click="removeFunction(item)"></div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+  import { useRouter } from 'vue-router'
+  import { ref, defineProps } from 'vue'
+  import mybus from '@/myplugins/mybus'
+  const props = defineProps({
+    dataList: { type: Array, default: null },
+  })
+  let dataForm = ref([])
+  dataForm.value = props.dataList
+  const router = useRouter()
+  const arr =
+    router.currentRoute.value.query.name instanceof Array
+      ? router.currentRoute.value.query.name
+      : [router.currentRoute.value.query.name]
+  const dataResourceId = router.currentRoute.value.query.resourceId
+
+  const depList = ref({
+    Name: [],
+    depID: [],
+  })
+  //移除方法
+  const removeFunction = (data) => {
+    props.dataList.map((item, index) => {
+      if (item.name == data.name) {
+        arr.splice(arr.indexOf(data.name), 1)
+        dataResourceId.splice(dataResourceId.indexOf(data.id), 1)
+        depList.value.depID = dataResourceId
+        depList.value.Name = arr
+        dataForm.value.splice(index, 1)
+        mybus.emit('reomveOldData', depList.value)
+        console.log('depList.value', depList.value)
+      }
+    })
+  }
+</script>
+
+<style scoped lang="less">
+  .ability-to-apply-for {
+    .title {
+      font-size: 0.16rem;
+      color: #212121;
+      border-bottom: 0.01rem #dddee1 solid;
+      padding-bottom: 0.1rem;
+      margin-bottom: 0.2rem;
+    }
+    .ability-to-apply-for-content {
+      margin-bottom: 0.3rem;
+      border-bottom: 0.01rem #dddee1 solid;
+      padding-bottom: 0.3rem;
+      padding-right: 0.5rem;
+      position: relative;
+      .dep-name {
+        color: #0558e1;
+        font-size: 0.18rem;
+        display: flex;
+        align-items: center;
+        line-height: 0.18rem;
+        margin-bottom: 0.2rem;
+        span {
+          display: inline-block;
+          width: 0.05rem;
+          height: 0.05rem;
+          background: #0558e1;
+          border-radius: 0.05rem;
+          margin-right: 0.05rem;
+        }
+      }
+      .name {
+        margin-bottom: 0.2rem;
+        span:first-child {
+          display: inline-block;
+          margin-right: 0.08rem;
+          font-size: 0.2rem;
+          color: #000000;
+        }
+        span:last-child {
+          display: inline-block;
+          padding: 0 0.05rem;
+          background: #00b8e6;
+          color: #fff;
+        }
+      }
+      .description {
+        color: rgba(0, 0, 0, 0.45);
+      }
+      .remove {
+        width: 0.32rem;
+        height: 0.32rem;
+        position: absolute;
+        right: 0;
+        top: 50%;
+        margin-top: -0.16rem;
+        background: url('~@/assets/home/remove.png') no-repeat;
+        background-size: cover;
+        cursor: pointer;
+      }
+      .remove:hover {
+        background: url('~@/assets/home/remove-hover.png') no-repeat;
+        background-size: cover;
+      }
+    }
+  }
+</style>
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index b4280a91..bc20876b 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -6,9 +6,11 @@
         <aside-menu></aside-menu>
       </aside> -->
       <article>
+        <div class="from-card" v-if="applySuccess">
+          <AbilityToApplyFor :dataList="dataList"></AbilityToApplyFor>
+        </div>
         <div class="form-container">
           <div v-if="applySuccess">
-            <div class="title">基础信息</div>
             <a-form
               ref="formRef"
               :model="formName"
@@ -20,7 +22,7 @@
             >
               <div class="base-info">
                 <a-form-item
-                  label="申请人"
+                  label="申请人信息"
                   name="user"
                   :rules="[{ required: true, message: '请输入申请人' }]"
                 >
@@ -33,7 +35,7 @@
 
                 <a-form-item
                   style="margin: 0 22px"
-                  label="申请人电话"
+                  label="电话"
                   name="phone"
                   :rules="[
                     {
@@ -50,31 +52,16 @@
                 </a-form-item>
 
                 <a-form-item
-                  label="申请单位"
+                  label="单位"
                   name="unit"
-                  :rules="[{ required: true, message: '请输入申请单位' }]"
+                  :rules="[{ required: true, message: '请输入单位' }]"
                 >
                   <a-input
-                    placeholder="请输入申请单位"
+                    placeholder="请输入单位"
                     v-model:value="formName.unit"
                   />
                 </a-form-item>
               </div>
-
-              <!-- <a-form-item
-                label="所在地区"
-                name="area"
-                :rules="[{ required: true, message: '请输入所在地区' }]"
-              >
-                <a-input
-                  style="width: 230px"
-                  placeholder="请输入所在地区"
-                  v-model:value="formName.area"
-                />
-              </a-form-item> -->
-
-              <div class="title">更多申请信息</div>
-
               <a-form-item
                 style="margin-bottom: 10px"
                 label="申请应用"
@@ -146,7 +133,7 @@
                 <a-upload
                   v-model:file-list="fileList"
                   name="file"
-                  :action="`${window.SITE_CONFIG.apiURL}/upload`"
+                  :action="`${baseURL}/upload`"
                   :headers="headers"
                   @change="handleChange"
                   :before-upload="beforeUpload"
@@ -232,8 +219,9 @@
 </template>
 
 <script>
+  import AbilityToApplyFor from './AbilityToApplyFor.vue'
   import HomeHeader from '@/views/home/components/header'
-  import { reactive, ref } from 'vue'
+  import { reactive, ref, watch, onBeforeUnmount } from 'vue'
   import { useRouter } from 'vue-router'
   import { message } from 'ant-design-vue'
   import qs from 'qs'
@@ -248,6 +236,7 @@
     getUser,
     getUserInfo,
     relaunch,
+    selectOne,
   } from '@/api/home'
   import mybus from '@/myplugins/mybus'
   import { sgcDel, getApplyForm } from '@/api/personalCenter'
@@ -259,12 +248,15 @@
     props: {},
     components: {
       HomeHeader,
+      AbilityToApplyFor,
       // AsideMenu,
       // UploadOutlined,
     },
     setup() {
       const router = useRouter()
       const disabled = ref(false)
+      const baseURL = window.SITE_CONFIG.apiURL
+      let record = ref('1')
       const formName = reactive({
         user: '',
         userId: '',
@@ -277,6 +269,7 @@
         formNameSystem: '',
         enclosure: '', //附件
       })
+      const dataList = ref([])
       getUser().then((res) => {
         formName.user = res.data.data.realName
         formName.userId = res.data.data.id
@@ -291,13 +284,19 @@
         'router传参==================>',
         router.currentRoute.value.query.name
       )
-      const arr =
+      let arr =
         router.currentRoute.value.query.name instanceof Array
           ? router.currentRoute.value.query.name
           : [router.currentRoute.value.query.name]
       console.log(router.currentRoute.value.query.ids)
       const ids = router.currentRoute.value.query.ids
-      const dataResourceId = router.currentRoute.value.query.resourceId
+      let dataResourceId = router.currentRoute.value.query.resourceId
+      dataResourceId.map((item) => {
+        selectOne(item).then((res) => {
+          dataList.value.push(res.data.data)
+          console.log('dataResourceId', dataList.value)
+        })
+      })
       const businessKey = ref(router.currentRoute.value.query.id)
       const taskId = ref(router.currentRoute.value.query.taskId)
       if (businessKey.value) {
@@ -310,25 +309,8 @@
           console.log('回填数据================>', res, formName.phone)
         })
       }
-      if (arr && arr.length !== 0) {
-        disabled.value = true
-        let str = ''
-        arr.forEach((val, index) => {
-          str += val
-          if (index < arr.length - 1) {
-            str += '、'
-          }
-        })
-        formName.formNameSystem = str
-      }
-      arr.forEach((val, index) => {
-        formName.system.push({
-          resourceName: val,
-          resourceId: dataResourceId[index],
-        })
-      })
-      console.log(formName.system)
 
+      console.log(formName.system)
       const formRef = ref()
       const applySuccess = ref(true)
       // const rootObj = null
@@ -545,6 +527,35 @@
         return isPNG || Upload.LIST_IGNORE
       }
       const fileList = ref([])
+      //删除改变arr
+      mybus.on('reomveOldData', (item) => {
+        debugger
+        arr = []
+        formName.system = []
+        record.value = record.value + '1'
+        arr = item.Name
+        dataResourceId = item.depID
+        if (arr && arr.length !== 0) {
+          disabled.value = true
+          let str = ''
+          arr.forEach((val, index) => {
+            str += val
+            if (index < arr.length - 1) {
+              str += '、'
+            }
+          })
+          formName.formNameSystem = str
+        }
+        arr.forEach((val, index) => {
+          formName.system.push({
+            resourceName: val,
+            resourceId: dataResourceId[index],
+          })
+        })
+      })
+      onBeforeUnmount(() => {
+        mybus.off('reomveOldData')
+      })
       return {
         formRef,
         formName,
@@ -561,8 +572,9 @@
         handleChange,
         applySuccess,
         disabled,
-        // baseURL,
+        baseURL,
         beforeUpload,
+        dataList,
       }
     },
   }
@@ -570,7 +582,7 @@
 
 <style scoped lang="less">
   #apply-container {
-    background-color: #f5f8fc;
+    // background-color: #f5f8fc;
     height: 100%;
     width: 100%;
     margin: 130px auto 0;