Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-17 14:11:08
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-18 14:43:47
+ * @LastEditTime: 2022-07-19 14:50:30
  * @Description: 上架
 -->
 <template>
@@ -15,7 +15,7 @@
       </div>
       <template v-if="title.isConfigure">
         <div class="bottom">
-          <div class="items" v-if="data[title.name].length > 0">
+          <!-- <div class="items" v-if="data[title.name].length > 0">
             <div
               class="item"
               v-for="(val, index) in data[title.name]"
@@ -42,8 +42,92 @@
                 <div @click="del(title.name, index)">删除</div>
               </div>
             </div>
+          </div> -->
+          <div
+            v-for="(val, index) in data[title.name]"
+            :key="'key1' + val.name + index"
+          >
+            <div
+              style="
+                font-size: 0.18rem;
+                font-weight: 600;
+                display: flex;
+                justify-content: flex-start;
+              "
+            >
+              <span>{{ title.name }}-{{ index + 1 }}</span>
+              <a-popconfirm
+                :title="'是否删除该条' + title.name + '?'"
+                ok-text="是"
+                cancel-text="否"
+                @confirm="del(title.name, index)"
+              >
+                <div class="del">
+                  <i class="delImg"></i>
+                  <div>删除</div>
+                </div>
+              </a-popconfirm>
+            </div>
+            <div
+              class="form"
+              v-for="attr in props.configure.filter(
+                (item, index2) => item.name === title.name
+              )[0].list"
+              :key="'key2' + attr.name + index2"
+            >
+              <span>{{ attr.name }}</span>
+              <a-input
+                disabled
+                v-model:value="val[attr.field]"
+                :maxlength="24"
+                :placeholder="'请填写' + attr.name + ',不超过24个字符'"
+                v-if="attr.type == 'input'"
+              />
+              <template v-if="attr.type == 'input2'">
+                <a-input
+                  disabled
+                  v-model:value="val[attr.field]"
+                  :placeholder="'请填写' + attr.name"
+                />
+              </template>
+              <a-textarea
+                disabled
+                v-model:value="val[attr.field]"
+                :showCount="true"
+                :maxlength="200"
+                :placeholder="'请填写' + attr.name"
+                v-else-if="attr.type == 'textArea'"
+              />
+              <!-- <a-radio-group
+                v-model:value="val[attr.field]"
+                :options="val.options"
+                @change="radioChange"
+                v-else-if="attr.type == 'radio'"
+              /> -->
+              <div v-else-if="attr.type == 'radio'">
+                {{ val[attr.field] + (attr.company || '') }}
+              </div>
+              <span v-else-if="attr.type === 'image'">
+                <a-image :width="85" :height="60" :src="val.img" />
+              </span>
+              <!-- <upload
+                :key="showKey"
+                type="图片"
+                btnName="上传图片"
+                :maxCount="1"
+                :data="val"
+                :list="[]"
+                tip="支持图片类型，大小不超过100M"
+                v-else-if="val.type == 'image'"
+              ></upload> -->
+            </div>
+          </div>
+          <!-- <div class="add" @click="add(title.name)">
+            添加更多{{ title.name }}
+          </div> -->
+          <div style="font-size: 0.18rem; font-weight: 600">
+            <span>{{ title.name }}-{{ data[title.name].length + 1 }}</span>
           </div>
-          <div class="add">添加更多{{ title.name }}</div>
           <div
             class="form"
             v-for="(val, index) in props.configure.filter(
@@ -112,7 +196,7 @@
           </div>
           <div class="submit">
             <a-button type="primary" @click="add(title.name)">
-              添加更多
+              添加更多{{ title.name }}
             </a-button>
           </div>
         </div>
@@ -248,7 +332,7 @@
             </a-button>
             <a-select
               v-else-if="item.type == 'select' && item.name == '使用方式'"
-              style="width: 240px"
+              style="width: 2.4rem"
               v-model:value="item.note1"
               :placeholder="'请选择' + item.name"
               @change="showTypeClick"
@@ -263,7 +347,7 @@
             </a-select>
             <a-select
               v-else-if="item.type == 'select' && item.name !== '归属部门'"
-              style="width: 240px"
+              style="width: 2.4rem"
               v-model:value="item.note1"
               :placeholder="'请选择' + item.name"
             >
@@ -277,7 +361,7 @@
             </a-select>
             <a-select
               v-else-if="item.name === '归属部门'"
-              style="width: 240px"
+              style="width: 2.4rem"
               v-model:value="item.note1"
               show-search
               placeholder="请输入关键字"
@@ -315,7 +399,7 @@
               :title="titleName"
               @ok="handleOk"
               @cancel="handleCancel"
-              style="width: 960px"
+              style="width: 9.6rem"
             >
               <div>
                 <a-transfer
@@ -333,7 +417,7 @@
           <!-- 关联组件 -->
           <div class="AssociatedApplication">
             <a-modal
-              v-model:visible="visibleAssociatedApplication"
+              v-model:visible="visibleAssociatedApplicationOther"
               :title="titleName"
               @ok="handleOk"
               @cancel="handleCancel"
@@ -341,13 +425,13 @@
             >
               <div>
                 <a-transfer
-                  v-model:target-keys="targetKeys2"
+                  v-model:target-keys="targetKeysOther"
-                  v-model:selected-keys="selectedKeys2"
+                  v-model:selected-keys="selectedKeysOther"
-                  :data-source="mockData2"
+                  :data-source="mockDataOther"
                   :titles="titles"
                   :render="(item) => item.title"
-                  @change="handleChange1"
+                  @change="handleChangeOther"
-                  @selectChange="handleSelectChange1"
+                  @selectChange="handleSelectChangeOther"
                 />
               </div>
             </a-modal>
@@ -369,7 +453,6 @@
     queryResourceRelByKeyId,
     filesUpload,
   } from '@/api/personalCenter'
-  import VueTemplateDemo from '@/views/personalCenter/VueTemplateDemo.vue'
   import { useRouter } from 'vue-router'
   const router = useRouter()
   const abilityToType = router.currentRoute.value.query.abilityToType
@@ -656,12 +739,13 @@
   }
   // 来源应用
   const visibleAssociatedApplication = ref(false)
+  const visibleAssociatedApplicationOther = ref(false)
   const mockData = ref([])
-  const mockData2 = ref([])
+  const mockDataOther = ref([])
   const titles = ref(['未关联的应用名称', '已关联的应用名称'])
   const titleName = ref('来源应用')
   const targetKeys = ref([])
-  const targetKeys2 = ref([])
+  const targetKeysOther = ref([])
   // 上一步关联数据
   // const targetKeysBack = ref([])
 
@@ -708,8 +792,8 @@
   const componentsClick = () => {
     titles.value = ['未关联的组件名称', '已关联的组件名称']
     titleName.value = '关联组件'
-    mockData2.value = []
+    visibleAssociatedApplicationOther.value = true
-    visibleAssociatedApplication.value = true
+    mockDataOther.value = []
     props.dataFrom.infoList.forEach((val) => {
       if (val.attrType === '关联组件信息' && val.attrValue != '') {
         queryResourceRelByKeyId({
@@ -719,18 +803,18 @@
         }).then((res) => {
           // console.log(res.data.data.notLinked)
           res.data.data.notLinked.forEach((val, index) => {
-            mockData2.value.push({
+            mockDataOther.value.push({
               key: val.id,
               title: val.name,
               description: val.id,
             })
           })
         })
-        targetKeys2.value = []
+        targetKeysOther.value = []
         val.attrValue.split(',').forEach((item) => {
-          targetKeys2.value.push(item)
+          targetKeysOther.value.push(item)
         })
-        console.log(targetKeys2.value)
+        console.log(targetKeysOther.value)
         // console.log('wowowo')
       } else if (val.attrType === '关联组件信息' && val.attrValue == '') {
         queryResourceRelByKeyId({
@@ -740,7 +824,7 @@
         }).then((res) => {
           // console.log(res.data.data.notLinked)
           res.data.data.notLinked.forEach((val, index) => {
-            mockData2.value.push({
+            mockDataOther.value.push({
               key: val.id,
               title: val.name,
               description: val.id,
@@ -751,7 +835,7 @@
     })
   }
   const selectedKeys = ref([])
-  const selectedKeys2 = ref([])
+  const selectedKeysOther = ref([])
 
   const handleChange = (nextTargetKeys, direction, moveKeys) => {
     console.log('targetKeys: ', nextTargetKeys)
@@ -761,38 +845,34 @@
       targetKeys.value = moveKeys.filter((item, index) => index === 0)
     }
   }
-  const handleChange1 = (nextTargetKeys1, direction1, moveKeys1) => {
-    console.log('targetKeys: ', nextTargetKeys1)
-    console.log('direction: ', direction1)
-    console.log('moveKeys: ', moveKeys1)
-  }
-
   const handleSelectChange = (sourceSelectedKeys, targetSelectedKeys) => {
     console.log('targetSelectedKeys: ', targetSelectedKeys, sourceSelectedKeys)
-    console.log('after', sourceSelectedKeys)
   }
-  const handleSelectChange1 = (sourceSelectedKeys1, targetSelectedKeys1) => {
+  const handleChangeOther = (nextTargetKeys, direction, moveKeys) => {
-    console.log(
+    console.log('targetKeys: ', nextTargetKeys)
-      'targetSelectedKeys: ',
+    console.log('direction: ', direction)
-      targetSelectedKeys1,
+    console.log('moveKeys: ', moveKeys)
-      sourceSelectedKeys1
+  }
-    )
+  const handleSelectChangeOther = (sourceSelectedKeys, targetSelectedKeys) => {
+    console.log('targetSelectedKeys: ', targetSelectedKeys, sourceSelectedKeys)
   }
 
   const handleOk = (e) => {
     console.log(e)
+    visibleAssociatedApplicationOther.value = false
     visibleAssociatedApplication.value = false
     // console.log('2222222222222', props.refData)
     data.value.list.map((item) => {
       if (item.name === '来源应用') {
         item.note1 = targetKeys.value + ''
       } else if (item.name === '关联组件信息') {
-        item.note1 = targetKeys2.value + ''
+        item.note1 = targetKeysOther.value + ''
       }
     })
   }
   const handleCancel = (e) => {
     console.log(e)
+    visibleAssociatedApplicationOther.value = false
     visibleAssociatedApplication.value = false
   }
 
@@ -860,22 +940,22 @@
 <style></style>
 <style lang="less" scoped>
   .put-on-the-shelf {
-    height: 680px;
+    height: 6.8rem;
     overflow: scroll;
     display: flex;
     flex-direction: column;
     align-items: center;
-    padding: 50px 100px 25px;
+    padding: 0.5rem 1rem 0.25rem;
     .Technical-text {
-      height: 30px;
+      height: 0.3rem;
-      width: 100px;
+      width: 1rem;
-      border: 1px solid #bbd3ef;
+      border: 0.01rem solid #bbd3ef;
-      border-radius: 6px;
+      border-radius: 0.06rem;
       background: #edf4fc;
       color: #0087ff;
-      font-size: 14px;
+      font-size: 0.14rem;
       text-align: center;
-      line-height: 30px;
+      line-height: 0.3rem;
     }
     .Technical-text:hover {
       cursor: pointer;
@@ -883,41 +963,41 @@
 
     & > div {
       width: 100%;
-      margin-top: 60px;
+      margin-top: 0.6rem;
 
       .top {
         color: #333333;
-        font-size: 22px;
+        font-size: 0.22rem;
         display: flex;
         justify-content: center;
         align-items: center;
-        margin-bottom: 25px;
+        margin-bottom: 0.25rem;
 
         div:first-child,
         div:last-child {
-          width: 245px;
+          width: 2.45rem;
-          height: 1px;
+          height: 0.01rem;
           background: #f0f0f0;
         }
 
         div:nth-child(2) {
-          margin: 0 30px;
+          margin: 0 0.3rem;
         }
       }
 
       .bottom {
-        margin-top: 25px;
+        margin-top: 0.25rem;
 
         .items {
           background: #fafafa;
-          padding: 10px;
+          padding: 0.1rem;
 
           p {
             display: flex;
             justify-content: space-between;
 
             span:nth-of-type(1) {
-              width: 200px;
+              width: 2rem;
             }
 
             span:nth-of-type(2) {
@@ -927,87 +1007,69 @@
           }
 
           p:nth-of-type(1) > span:nth-of-type(1) {
-            font-size: 18px;
+            font-size: 0.18rem;
             font-weight: 600;
           }
-
-          .del {
-            display: flex;
-            justify-content: flex-end;
-            align-items: center;
-
-            .delImg {
-              cursor: pointer;
-              display: inline-block;
-              width: 16px;
-              height: 18px;
-              background: url(~@/assets/home/sf_del.png) no-repeat;
-              margin-right: 5px;
-            }
-
-            div {
-              cursor: pointer;
-            }
-          }
         }
 
         .add {
-          margin-top: 10px;
+          cursor: pointer;
-          font-size: 16px;
+          margin-top: 0.1rem;
+          font-size: 0.16rem;
           color: #007efb;
         }
 
         .form {
-          margin-top: 20px;
+          margin-top: 0.2rem;
           display: flex;
           justify-content: flex-start;
           align-items: center;
 
           span:first-child {
-            width: 120px;
+            width: 1.2rem;
           }
 
           :deep(.ant-input-textarea) {
-            width: 520px;
+            width: 5.2rem;
           }
 
           :deep(.ant-radio-group) {
-            width: 520px;
+            width: 5.2rem;
           }
 
           :deep(.ant-input-number) {
-            width: 200px;
+            width: 2rem;
           }
 
           :deep(.ant-input) {
             resize: none;
-            width: 520px;
+            width: 5.2rem;
           }
 
           .ant-btn {
-            width: 160px;
+            width: 1.6rem;
-            height: 32px;
+            height: 0.32rem;
             text-align: center;
             background: #edf4fc;
             color: #0087ff;
-            border: 1px solid #bbd3ef;
+            border: 0.01rem solid #bbd3ef;
-            border-radius: 6px;
+            border-radius: 0.06rem;
           }
         }
 
         .submit {
-          margin-top: 40px;
+          margin-top: 0.4rem;
           display: flex;
           justify-content: flex-end;
 
           .ant-btn {
-            width: 80px;
+            width: 1.8rem;
-            height: 28px;
+            height: 0.3rem;
             text-align: center;
             background: #d9ebff;
             color: #0087ff;
-            border: 1px solid #0087ff;
+            border: 0.01rem solid #0087ff;
-            border-radius: 6px;
+            border-radius: 0.06rem;
           }
         }
       }
@@ -1019,24 +1081,24 @@
   }
 
   .application-Area {
-    width: 520px;
+    width: 5.2rem;
     display: grid;
-    margin-top: -5px;
+    margin-top: -0.05rem;
     grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
 
     .application-Area-son {
       cursor: pointer;
-      font-size: 14px;
+      font-size: 0.14rem;
-      width: 90px;
+      width: 0.9rem;
-      height: 26px;
+      height: 0.26rem;
-      border-radius: 13px;
+      border-radius: 0.13rem;
       color: #333333;
       background: #f5f5f5;
-      border: 1px #cccccc solid;
+      border: 0.01rem #cccccc solid;
       display: flex;
       justify-content: center;
       align-items: center;
-      margin-top: 10px;
+      margin-top: 0.1rem;
       font-weight: 500;
     }
 
@@ -1053,27 +1115,27 @@
   }
 
   :deep(.ant-modal) {
-    width: 960px;
+    width: 9.6rem;
   }
 
   :deep(.ant-transfer-list) {
     width: 39.5%;
-    height: 520px;
+    height: 5.2rem;
   }
 
   :deep(.ant-transfer-operation) {
     flex-direction: row-reverse;
-    margin: 0 30px;
+    margin: 0 0.3rem;
   }
 
   :deep(.ant-btn) {
-    width: 56px;
+    width: 0.56rem;
-    height: 40px;
+    height: 0.4rem;
-    border-radius: 4px;
+    border-radius: 0.04rem;
   }
 
   :deep(.ant-btn:first-child) {
-    margin-left: 4px;
+    margin-left: 0.04rem;
   }
 
   :deep(.ant-modal-footer) {
@@ -1085,8 +1147,8 @@
   }
 
   :deep(.ant-modal-title) {
-    line-height: 24px;
+    line-height: 0.24rem;
-    font-size: 18px;
+    font-size: 0.18rem;
     color: #303133;
   }
 
@@ -1103,7 +1165,7 @@
   }
 
   :deep(.ant-transfer-list-header-title) {
-    font-size: 16px;
+    font-size: 0.16rem;
     color: #303133;
     font-weight: 400;
     text-align: left;
@@ -1112,6 +1174,27 @@
     display: none !important;
   }
   :deep(.ant-upload-list-item-name) {
-    width: 100px;
+    width: 1rem;
+  }
+
+  .del {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    font-size: 0.14rem;
+    margin-left: 0.2rem;
+
+    .delImg {
+      cursor: pointer;
+      display: inline-block;
+      width: 0.16rem;
+      height: 0.18rem;
+      background: url(~@/assets/home/sf_del.png) no-repeat;
+      margin-right: 0.05rem;
+    }
+
+    div {
+      cursor: pointer;
+    }
   }
 </style>

front/src/views/detailsAll/components/Application/ApplicationAssociatedComponents.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 16:06:10
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-15 20:44:47
+ * @LastEditTime: 2022-07-19 14:02:54
  * @Description: 关联组件
 -->
 <template>

front/src/views/detailsAll/components/Application/ApplicationTopDetails.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 11:56:28
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-19 11:09:23
+ * @LastEditTime: 2022-07-19 15:02:23
  * @Description: 算法详情页头部
 -->
 <template>
@@ -154,7 +154,7 @@
           if (res.data.msg === 'success') {
             message.success('取消成功')
             // eslint-disable-next-line vue/no-mutating-props
-            props.dataList.isCollect = false
+            props.dataList.isCollect = 'false'
             scFlag2.value = true
           }
         })
@@ -167,7 +167,7 @@
           if (res.data.msg === 'success') {
             message.success('添加收藏成功！')
             // eslint-disable-next-line vue/no-mutating-props
-            props.dataList.isCollect = true
+            props.dataList.isCollect = 'true'
             scFlag2.value = true
           }
         })

front/src/views/detailsAll/components/Business/BusinessTopDetails.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 11:56:28
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-19 11:09:52
+ * @LastEditTime: 2022-07-19 15:02:47
  * @Description: 算法详情页头部
 -->
 <template>
@@ -137,7 +137,7 @@
           if (res.data.msg === 'success') {
             message.success('取消成功')
             // eslint-disable-next-line vue/no-mutating-props
-            props.dataList.isCollect = false
+            props.dataList.isCollect = 'false'
             scFlag2.value = true
           }
         })
@@ -150,7 +150,7 @@
           if (res.data.msg === 'success') {
             message.success('添加收藏成功！')
             // eslint-disable-next-line vue/no-mutating-props
-            props.dataList.isCollect = true
+            props.dataList.isCollect = 'true'
             scFlag2.value = true
           }
         })

front/src/views/detailsAll/components/Developer/DeveloperTopDetails.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 11:56:28
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-19 11:10:06
+ * @LastEditTime: 2022-07-19 15:03:50
  * @Description: 开发组件详情页头部
 -->
 <template>
@@ -132,7 +132,7 @@
           if (res.data.msg === 'success') {
             message.success('取消成功')
             // eslint-disable-next-line vue/no-mutating-props
-            props.dataList.isCollect = false
+            props.dataList.isCollect = 'false'
             scFlag2.value = true
           }
         })
@@ -145,7 +145,7 @@
           if (res.data.msg === 'success') {
             message.success('添加收藏成功！')
             // eslint-disable-next-line vue/no-mutating-props
-            props.dataList.isCollect = true
+            props.dataList.isCollect = 'true'
             scFlag2.value = true
           }
         })

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

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-08 11:56:28
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-19 11:10:20
+ * @LastEditTime: 2022-07-19 15:04:02
  * @Description: 算法详情页头部
 -->
 <template>
@@ -132,7 +132,7 @@
           if (res.data.msg === 'success') {
             message.success('取消成功')
             // eslint-disable-next-line vue/no-mutating-props
-            props.dataList.isCollect = false
+            props.dataList.isCollect = 'false'
             scFlag2.value = true
           }
         })
@@ -145,7 +145,7 @@
           if (res.data.msg === 'success') {
             message.success('添加收藏成功！')
             // eslint-disable-next-line vue/no-mutating-props
-            props.dataList.isCollect = true
+            props.dataList.isCollect = 'true'
             scFlag2.value = true
           }
         })