demandSubject

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

@@ -84,7 +84,11 @@ export default {
   methods: {
     // 重置
     resetDataList () {
-      this.dataForm = this.noDataForm
+      this.dataForm = {
+        orderId: '',
+        status: '',
+        userId: ''
+      },
       this.page = 1 // 当前页码
       this.query()
     },

front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue

@@ -2,10 +2,7 @@
   <!-- 使用方式 -->
   <div class="usage-mode" v-if="flag">
     <div class="tltle">
-      <DetalsTitle
+      <DetalsTitle :title="dataFrom.title" :type="dataFrom.englishTitle"></DetalsTitle>
-        :title="dataFrom.title"
-        :type="dataFrom.englishTitle"
-      ></DetalsTitle>
     </div>
     <div class="content" v-for="item in dataFrom.content" :key="item.title">
       <div class="content-left">
@@ -31,7 +28,7 @@
           <div class="content-right-title">{{ item.contact }}</div>
           <div class="content-right-content">
             <p>
-              <span>{{ item.contact }}</span>
+              <span>{{ item.facilitator.name }}</span>
               <a-tooltip>
                 <template #title>{{ item.facilitator.value }}</template>
                 <span>{{ item.facilitator.value }}</span>
@@ -57,7 +54,7 @@
           <div class="content-right-title">{{ item.contact2 }}</div>
           <div class="content-right-content">
             <p>
-              <span>{{ item.contact2 }}</span>
+              <span>{{ item.facilitator2.name }}</span>
               <a-tooltip>
                 <template #title>{{ item.facilitator2.value }}</template>
                 <span>{{ item.facilitator2.value }}</span>
@@ -237,38 +234,42 @@
   flex-direction: column;
   align-items: center;
   padding: 0.8rem 0;
+
   .content {
     margin-top: 0.3rem;
     display: flex;
+
     .content-left {
       height: 1.8rem;
       width: 6.2rem;
-        background: linear-gradient(
+      background: linear-gradient(to right,
-          to right,
           rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4)
+          rgba(148, 163, 252, 0.4));
-        );
       border-radius: 0.1rem;
       margin-right: 0.6rem;
       box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
       display: flex;
       align-items: center;
       padding: 0 0.35rem;
+
       .left {
         .content-left-title {
           font-size: 0.26rem;
           line-height: 0.26rem;
           color: #212956;
           margin-bottom: 0.2rem;
+
           span:first-child {
             margin-right: 0.1rem;
           }
         }
+
         .content-left-content {
           width: 4.2rem;
           font-size: 0.2rem;
           color: rgba(33, 41, 86, 0.8);
           line-height: 0.2rem;
+
           p {
             display: -webkit-box;
             overflow: hidden;
@@ -279,11 +280,13 @@
             color: #212956;
             line-height: 26px;
           }
+
           p:last-of-type {
             margin-top: 20px;
           }
         }
       }
+
       .right {
         div {
           height: 0.4rem;
@@ -297,36 +300,39 @@
           align-items: center;
           cursor: pointer;
         }
+
         div:first-child {
           margin-bottom: 0.2rem;
         }
       }
     }
+
     .content-right {
       height: 1.8rem;
       width: 6.2rem;
-        background: linear-gradient(
+      background: linear-gradient(to right,
-          to right,
           rgba(113, 132, 252, 0.4),
-          rgba(148, 163, 252, 0.4)
+          rgba(148, 163, 252, 0.4));
-        );
       border-radius: 0.1rem;
       box-shadow: 0rem 0.05rem 0.15rem rgba(82, 106, 255, 0.4);
       display: flex;
       justify-content: space-around;
       align-items: center;
       padding: 0 0.3rem;
+
       .content-right-left {
-          border-right: 0.01rem solid #b0b9f1;
+        // border-right: 0.01rem solid #b0b9f1;
         padding-right: 0.1rem;
         margin-right: 0.1rem;
       }
+
       .content-right-title {
         font-size: 0.26rem;
         line-height: 0.26rem;
         color: #212956;
         margin-bottom: 0.15rem;
       }
+
       .content-right-content {
         display: flex;
         font-size: 0.16rem;
@@ -336,6 +342,7 @@
         -webkit-line-clamp: 1;
         -webkit-box-orient: vertical;
         flex-direction: column;
+
         p {
           // width: 1.60rem;
           height: 0.2rem;
@@ -345,6 +352,7 @@
           -webkit-line-clamp: 1;
           -webkit-box-orient: vertical;
           margin-right: 0.15rem;
+
           span {
             cursor: pointer;
             font-size: 20px;

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

@@ -9,83 +9,38 @@
         <div class="form-container">
           <div v-if="applySuccess">
             <div class="title">申请人信息</div>
-            <a-form
+            <a-form ref="formRef" :model="formName" name="basic" :label-col="{ style: { width: '106px' } }"
-              ref="formRef"
+              :wrapper-col="{ style: { width: '230px' } }" labelAlign="left" autocomplete="off">
-              :model="formName"
-              name="basic"
-              :label-col="{ style: { width: '106px' } }"
-              :wrapper-col="{ style: { width: '230px' } }"
-              labelAlign="left"
-              autocomplete="off"
-            >
               <div class="base-info">
-                <a-form-item
+                <a-form-item label="申请人" name="applyUserName" :rules="[{ required: true, message: '请输入申请人' }]">
-                  label="申请人"
+                  <a-input placeholder="请输入申请人" v-model:value="formName.applyUserName" />
-                  name="applyUserName"
-                  :rules="[{ required: true, message: '请输入申请人' }]"
-                >
-                  <a-input
-                    placeholder="请输入申请人"
-                    v-model:value="formName.applyUserName"
-                  />
                 </a-form-item>
 
-                <a-form-item
+                <a-form-item style="margin: 0 22px" label="申请人电话" name="applyUserPhone" :rules="[
-                  style="margin: 0 22px"
-                  label="申请人电话"
-                  name="applyUserPhone"
-                  :rules="[
                   {
                     required: true,
                     pattern: /^1[3456789]\d{9}$/,
                     message: '请输入正确的电话号码',
                   },
-                  ]"
+                ]">
-                >
+                  <a-input placeholder="请输入申请人电话" v-model:value="formName.applyUserPhone" />
-                  <a-input
-                    placeholder="请输入申请人电话"
-                    v-model:value="formName.applyUserPhone"
-                  />
                 </a-form-item>
 
-                <a-form-item
+                <a-form-item label="申请单位" name="applyUserDeptName" :rules="[{ required: true, message: '请输入申请单位' }]">
-                  label="申请单位"
+                  <a-input placeholder="请输入申请单位" v-model:value="formName.applyUserDeptName" />
-                  name="applyUserDeptName"
-                  :rules="[{ required: true, message: '请输入申请单位' }]"
-                >
-                  <a-input
-                    placeholder="请输入申请单位"
-                    v-model:value="formName.applyUserDeptName"
-                  />
                 </a-form-item>
               </div>
 
               <div class="title">需求信息</div>
 
-              <a-form-item
+              <a-form-item style="margin-bottom: 10px" label="需求标题" name="demandSubject"
-                style="margin-bottom: 10px"
+                :rules="[{ required: true, message: '请输入需求标题' }]">
-                label="需求标题"
+                <a-input style="width: 350px" v-model:value="formName.demandSubject" />
-                name="demandSubject"
-                :rules="[{ required: true, message: '请输入需求标题' }]"
-              >
-                <a-input
-                  style="width: 350px"
-                  v-model:value="formName.demandSubject"
-                />
               </a-form-item>
 
-              <a-form-item
+              <a-form-item style="margin-bottom: 10px" label="需求类型" name="detailsType"
-                style="margin-bottom: 10px"
+                :rules="[{ required: true, message: '请选择需求类型' }]">
-                label="需求类型"
+                <a-select ref="select" v-model:value="formName.detailsType" @focus="focus" style="width: 200px">
-                name="detailsType"
-                :rules="[{ required: true, message: '请选择需求类型' }]"
-              >
-                <a-select
-                  ref="select"
-                  v-model:value="formName.detailsType"
-                  @focus="focus"
-                  style="width: 200px"
-                >
                   <a-select-option value="基础设施">基础设施</a-select-option>
                   <a-select-option value="数据资源">数据资源</a-select-option>
                   <a-select-option value="组件服务">组件服务</a-select-option>
@@ -94,26 +49,14 @@
                 </a-select>
               </a-form-item>
 
-              <a-form-item
+              <a-form-item label="应用领域" name="detailsField" style="width: 350px"
-                label="应用领域"
+                :rules="[{ required: true, message: '请输入应用领域' }]">
-                name="detailsField"
+                <a-input placeholder="请输入应用领域" v-model:value="formName.detailsField" />
-                style="width: 350px"
-                :rules="[{ required: true, message: '请输入应用领域' }]"
-              >
-                <a-input
-                  placeholder="请输入应用领域"
-                  v-model:value="formName.detailsField"
-                />
               </a-form-item>
 
-              <a-form-item
+              <a-form-item style="margin-bottom: 10px" label="需求描述" name="demandDetails"
-                style="margin-bottom: 10px"
+                :rules="[{ required: true, message: '请输入需求描述' }]">
-                label="需求描述"
+                <a-textarea style="
-                name="demandDetails"
-                :rules="[{ required: true, message: '请输入需求描述' }]"
-              >
-                <a-textarea
-                  style="
                     width: 500px;
                     height: 150px;
                     font-size: 16px;
@@ -123,24 +66,12 @@
                     border-radius: 6px;
                     padding: 10px;
                     resize: none;
-                  "
+                  " v-model:value="formName.demandDetails" />
-                  v-model:value="formName.demandDetails"
-                />
               </a-form-item>
-              <a-form-item
+              <a-form-item style="color: #666; font-size: 16px" label="附件上传" name="applyDoc">
-                style="color: #666; font-size: 16px"
+                <a-upload v-model:file-list="fileList" name="file" :action="upLoadUrl" :headers="headers"
-                label="附件上传"
+                  @change="handleChange">
-                name="applyDoc"
+                  <a-button style="
-              >
-                <a-upload
-                  v-model:file-list="fileList"
-                  name="file"
-                  :action="upLoadUrl"
-                  :headers="headers"
-                  @change="handleChange"
-                >
-                  <a-button
-                    style="
                       width: 100px;
                       height: 30px;
                       margin-right: 10px;
@@ -151,8 +82,7 @@
                       border: 1px solid #bbd3ef;
                       padding: 0;
                       text-align: center;
-                    "
+                    ">
-                  >
                     <upload-outlined></upload-outlined>
                     文件上传
                   </a-button>
@@ -163,8 +93,7 @@
               </a-form-item>
 
               <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
-                <a-button
+                <a-button style="
-                  style="
                     width: 80px;
                     height: 38px;
                     margin-right: 20px;
@@ -175,15 +104,10 @@
                     border: none;
                     padding: 0;
                     text-align: center;
-                  "
+                  " type="primary" html-type="cancle" @click="signOut">
-                  type="primary"
-                  html-type="cancle"
-                  @click="signOut"
-                >
                   退出申请
                 </a-button>
-                <a-button
+                <a-button style="
-                  style="
                     width: 80px;
                     height: 38px;
                     background: #0087ff;
@@ -193,11 +117,7 @@
                     border: none;
                     padding: 0;
                     text-align: center;
-                  "
+                  " type="primary" html-type="submit" @click="processStartHandle()">
-                  type="primary"
-                  html-type="submit"
-                  @click="processStartHandle()"
-                >
                   提交申请
                 </a-button>
               </a-form-item>
@@ -296,10 +216,10 @@
       }
 
       if (info.file.status === 'done') {
-          message.success(`${info.file.name} file uploaded successfully`)
+        message.success(`${info.file.name} 文件上传成功`)
         formName.enclosure = info.file.response.data
       } else if (info.file.status === 'error') {
-          message.error(`${info.file.name} file upload failed.`)
+        message.error(`${info.file.name} 文件上传失败`)
       }
     }
 
@@ -362,6 +282,7 @@
   margin: 90px auto 0;
   display: flex;
   justify-content: space-between;
+
   aside {
     width: 282px;
     height: 96%;
@@ -369,6 +290,7 @@
     background-color: #fff;
     margin: 1% 0 3%;
   }
+
   article {
     width: 1090px;
     height: 99%;
@@ -376,8 +298,10 @@
     background-color: #fff;
     margin: 5% auto;
   }
+
   .form-container {
     padding: 20px 20px 30px 20px;
+
     .title {
       font-size: 20px;
       color: #000;
@@ -385,18 +309,22 @@
       margin-bottom: 20px;
     }
   }
+
   .base-info {
     display: flex;
   }
+
   :deep(.ant-form-item-label) {
     label {
       color: #666;
       font-size: 16px;
+
       &::after {
         content: '';
       }
     }
   }
+
   :deep(.ant-form-item-required) {
     &::before {
       font-size: 8px;
@@ -408,11 +336,13 @@
     border: 1px solid #e0e0e0;
     border-radius: 6px;
   }
+
   .success {
     div {
       width: 100px;
       margin: 80px auto 40px;
     }
+
     text-align: center;
     font-size: 20px;
     font-weight: bold;