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

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

@@ -164,7 +164,7 @@
       :destroy-on-close='true'
       :before-close='clear'
       width="50%">
-      <putOnTheShelf :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList' :type='radio'></putOnTheShelf>
+      <putOnTheShelf :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList' :type='radio' :typeInput='typeInput'></putOnTheShelf>
       <span slot="footer" class="dialog-footer">
         <el-button @click="clear">取 消</el-button>
         <el-button type="primary" @click="submitData">确 定</el-button>
@@ -226,7 +226,8 @@ export default {
         id: '',
         responseData: {},
         linkType: ''
-      }
+      },
+      typeInput: '组件服务'
     }
   },
   watch: {},

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

@@ -27,6 +27,13 @@
             >挂接</el-button
           >
         </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            @click="showPutOnTheShelf()"
+            >上架</el-button
+          >
+        </el-form-item>
         <el-form-item>
           <el-button
             v-if="$hasPermission('ability:bsabilityai:delete')"
@@ -85,7 +92,7 @@
               v-if="$hasPermission('ability:bsabilityai:update')"
               type="text"
               size="small"
-              @click="UpdateHandle(scope.row)"
+              @click="UpdateData(scope.row)"
               >{{ $t("update") }}</el-button
             >
             <el-button
@@ -153,63 +160,97 @@
         @isShowRelatePopup="handleIsShowRelatePopupApply"
       ></relate-application>
     </div>
+     <el-dialog
+      :title="submitFrom.id?'修改'+radio:'上架'+radio"
+      :visible.sync="showPutOnTheShelfFlag2"
+      :close-on-click-modal='false'
+      :close-on-press-escape='false'
+      :destroy-on-close='true'
+      :before-close='clear'
+      width="50%">
+      <putOnTheShelf :putOnTheShelfList='putOnTheShelfList' @changeInfoList='changeInfoList' :type='radio' :typeInput='typeInput'></putOnTheShelf>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="clear">取 消</el-button>
+        <el-button type="primary" @click="submitData">确 定</el-button>
+      </span>
+    </el-dialog>
   </el-card>
 </template>
 
 <script>
-import mixinViewModule from "@/mixins/view-module";
+import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from "./bsabilityservice-add-or-update";
+import AddOrUpdate from './bsabilityservice-add-or-update'
-import dictionaries from "@/utils/dictionaries";
+import dictionaries from '@/utils/dictionaries'
-import RelateApplication from "./bsabilityai-relate-application.vue";
+import RelateApplication from './bsabilityai-relate-application.vue'
-import qs from "qs";
+import qs from 'qs'
-import { type } from "os";
+import { type } from 'os'
+import putOnTheShelf from '@/views/modules/putOnTheShelf'
+
 export default {
   mixins: [mixinViewModule],
-  data() {
+  data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: "/resource/page",
+        getDataListURL: '/resource/page',
         getDataListIsPage: true,
-        exportURL: "/ability/bsabilityai/export",
+        exportURL: '/ability/bsabilityai/export',
-        deleteURL: "/resource/delete",
+        deleteURL: '/resource/delete',
-        deleteIsBatch: true,
+        deleteIsBatch: true
       },
       disabled: false,
       sceneArr: dictionaries.sceneArr,
       fieldArr: dictionaries.fieldArr,
       shareFormArr: dictionaries.shareFormArr,
       dataForm: {
-        name: "",
+        name: '',
-        creator: "",
+        creator: '',
         selectType: 0,
         delFlag: 0,
-        type: "应用资源",
+        type: '应用资源'
       },
       qp: false,
       relateApplicationResourceVisible: false,
-      relationData: {}, //打开穿梭框时传递的参数
+      relationData: {}, // 打开穿梭框时传递的参数
       topNameArray: [], //
-    };
+      radio: '应用资源',
+      insertList: [],
+      putOnTheShelfList: [],
+      showPutOnTheShelfFlag2: false,
+      submitFrom: {
+        type: '应用资源',
+        deptId: '',
+        delFlag: 0,
+        infoList: [
+          // {
+          //   attrType: '组件类型',
+          //   attrValue: '',
+          //   delFlag: 0
+          // }
+        ]
+      },
+      typeInput: '应用资源'
+    }
   },
   watch: {},
   components: {
     AddOrUpdate,
     RelateApplication,
+    putOnTheShelf
   },
-  created() {
+  created () {
-    this.dataForm.name = "";
+    this.dataForm.name = ''
-    this.dataForm.type = "应用资源";
+    this.dataForm.type = '应用资源'
   },
-  mounted() {
+  mounted () {
-    window.addEventListener("resize", this.a);
+    window.addEventListener('resize', this.a)
-    this.fullScreen();
+    this.fullScreen()
   },
   methods: {
-    reset() {
+    reset () {
       this.$http
         .get(
           this.mixinViewModuleOptions.getDataListURL +
-            "?" +
+            '?' +
             qs.stringify({
               // order: this.order,
               // orderField: this.orderField,
@@ -218,230 +259,453 @@ export default {
               selectType: 0,
               limit: 10,
               delFlag: 0,
-              creator: "",
+              creator: '',
-              type: "应用资源",
+              type: '应用资源',
-              name: "",
+              name: ''
             })
         )
         .then(({ data: res }) => {
-          this.dataForm.name = "";
+          this.dataForm.name = ''
           if (res.code !== 0) {
-            this.dataList = [];
+            this.dataList = []
-            this.total = 0;
+            this.total = 0
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
           this.dataList = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.list
-            : res.data;
+            : res.data
           this.total = this.mixinViewModuleOptions.getDataListIsPage
             ? res.data.total
-            : 0;
+            : 0
           if (this.mixinViewModuleOptions.requestCallback) {
-            this.mixinViewModuleOptions.requestCallback(res.data);
+            this.mixinViewModuleOptions.requestCallback(res.data)
           }
-          this.dataListLoading = false;
+          this.dataListLoading = false
         })
         .catch(() => {
-          this.dataListLoading = false;
+          this.dataListLoading = false
-        });
+        })
     },
-    showDetail(val) {
+    showDetail (val) {
-      this.addOrUpdateVisible = true;
+      this.addOrUpdateVisible = true
-      this.disabled = false;
+      this.disabled = false
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.UpdateState = false;
+        this.$refs.addOrUpdate.UpdateState = false
-        this.$refs.addOrUpdate.dataFormShowDetails = val;
+        this.$refs.addOrUpdate.dataFormShowDetails = val
-        this.$refs.addOrUpdate.init();
+        this.$refs.addOrUpdate.init()
-      });
+      })
-      this.disabled = true;
+      this.disabled = true
     },
-    showDocument(val) {
+    showDocument (val) {
-      console.log(val);
+      console.log(val)
       window.open(
-        window.SITE_CONFIG.frontUrl + "?id=" + val.id + "&&type=" + val.type,
+        window.SITE_CONFIG.frontUrl + '?id=' + val.id + '&&type=' + val.type,
-        "_blank"
+        '_blank'
-      );
+      )
     },
-    findValue(list, type) {
+    findValue (list, type) {
-      const found = list.find((item) => item.attrType === type);
+      const found = list.find((item) => item.attrType === type)
       if (found) {
-        return found.attrValue;
+        return found.attrValue
       } else {
-        return "暂无数据";
+        return '暂无数据'
       }
     },
-    getDataList2(names) {
+    getDataList2 (names) {
       if (names != null) {
         this.$http
           .get(
             this.mixinViewModuleOptions.getDataListURL +
-              "?" +
+              '?' +
               qs.stringify({
                 // order: this.order,
                 // orderField: this.orderField,
                 // type: '组件服务',
                 pageNum: 1,
                 pageSize: this.limit,
-                type: "应用资源",
+                type: '应用资源',
-                creator: "",
+                creator: '',
                 selectType: 0,
                 delFlag: 0,
-                name: names,
+                name: names
               })
           )
           .then(({ data: res }) => {
             if (res.code !== 0) {
-              this.dataList = [];
+              this.dataList = []
-              this.total = 0;
+              this.total = 0
-              return this.$message.error(res.msg);
+              return this.$message.error(res.msg)
             }
             if (res.data.list.length !== 0) {
-              this.dataList = res.data.list;
+              this.dataList = res.data.list
               this.total = this.mixinViewModuleOptions.getDataListIsPage
                 ? res.data.total
-                : 0;
+                : 0
               if (this.mixinViewModuleOptions.requestCallback) {
-                this.mixinViewModuleOptions.requestCallback(res.data);
+                this.mixinViewModuleOptions.requestCallback(res.data)
               }
-              this.dataListLoading = false;
+              this.dataListLoading = false
             } else {
-              this.$message.error("未查询到相关信息");
+              this.$message.error('未查询到相关信息')
-              this.reset();
+              this.reset()
             }
           })
           .catch(() => {
-            this.dataListLoading = false;
+            this.dataListLoading = false
-          });
+          })
       } else {
-        this.$message.error("查询不能输入为空");
+        this.$message.error('查询不能输入为空')
       }
     },
-    fullScreen() {
+    fullScreen () {
       if (window.outerHeight === screen.availHeight) {
         if (window.outerWidth === screen.availWidth) {
           console.log(
-            "全屏1",
+            '全屏1',
             window.outerHeight,
             screen.availHeight,
             window.outerWidth,
             screen.availWidth
-          );
+          )
-          this.qp = false;
+          this.qp = false
         } else {
           console.log(
-            "不是全屏2",
+            '不是全屏2',
             window.outerHeight,
             screen.availHeight,
             window.outerWidth,
             screen.availWidth
-          );
+          )
-          this.qp = true;
+          this.qp = true
         }
       } else {
         console.log(
-          "不是全屏3",
+          '不是全屏3',
           window.outerHeight,
           screen.availHeight,
           window.outerWidth,
           screen.availWidth
-        );
+        )
-        this.qp = true;
+        this.qp = true
       }
     },
-    //应用与组件
+    // 应用与组件
-    applyAndAssembly(val) {
+    applyAndAssembly (val) {
-      console.log("vvvv", val);
+      console.log('vvvv', val)
-      //根据id和类型查询已关联的组件，将id,type和查出来的数据传递给组件
+      // 根据id和类型查询已关联的组件，将id,type和查出来的数据传递给组件
-      let type = "组件服务";
+      const type = '组件服务'
-      let id = val.id;
+      const id = val.id
       this.$http
-        .get(`/dataResourceRel/queryResourceRelByKeyId`, {
+        .get('/dataResourceRel/queryResourceRelByKeyId', {
           params: {
             keyId: id,
             type: type,
-            referenceName: "",
+            referenceName: ''
-          },
+          }
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          console.log("rrrrressssz", res.data);
+          console.log('rrrrressssz', res.data)
-          this.relateApplicationResourceVisible = true;
+          this.relateApplicationResourceVisible = true
           this.relationData = {
             id: id,
-            linkType: "1",
+            linkType: '1',
-            responseData: res.data,
+            responseData: res.data
-          };
+          }
-          this.topNameArray = ["未关联组件名称", "已关联组件名称"];
+          this.topNameArray = ['未关联组件名称', '已关联组件名称']
-          console.log(" this.relationData", this.relationData);
+          console.log(' this.relationData', this.relationData)
-          //将数据传递给引入的组件
+          // 将数据传递给引入的组件
-        });
+        })
     },
-    //应用与数据资源
+    // 应用与数据资源
-    applyAndDataResource(val) {
+    applyAndDataResource (val) {
-      console.log("数据资源");
+      console.log('数据资源')
     },
-    //应用与项目
+    // 应用与项目
-    applyAndProject(val) {
+    applyAndProject (val) {
-      let type = "项目";
+      const type = '项目'
-      let id = val.id;
+      const id = val.id
       this.$http
-        .get(`/dataResourceRel/queryResourceRelByKeyId`, {
+        .get('/dataResourceRel/queryResourceRelByKeyId', {
           params: {
             keyId: id,
             type: type,
-            referenceName: "",
+            referenceName: ''
-          },
+          }
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          console.log("rrrrressssx", res.data);
+          console.log('rrrrressssx', res.data)
-          this.relateApplicationResourceVisible = true;
+          this.relateApplicationResourceVisible = true
           this.relationData = {
             id: id,
-            linkType: "1",
+            linkType: '1',
-            responseData: res.data,
+            responseData: res.data
-          };
+          }
-          this.topNameArray = ["未关联项目名称", "已关联项目名称"];
+          this.topNameArray = ['未关联项目名称', '已关联项目名称']
-          //将数据传递给引入的组件
+          // 将数据传递给引入的组件
-        });
+        })
     },
-    //应用与基础设施
+    // 应用与基础设施
-    applyAndInfrastructure(val) {
+    applyAndInfrastructure (val) {
-      let type = "基础设施";
+      const type = '基础设施'
-      let id = val.id;
+      const id = val.id
       this.$http
-        .get(`/dataResourceRel/queryResourceRelByKeyId`, {
+        .get('/dataResourceRel/queryResourceRelByKeyId', {
           params: {
             keyId: id,
             type: type,
-            referenceName: "",
+            referenceName: ''
-          },
+          }
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg);
+            return this.$message.error(res.msg)
           }
-          console.log("rrrrressssj", res.data);
+          console.log('rrrrressssj', res.data)
-          this.relateApplicationResourceVisible = true;
+          this.relateApplicationResourceVisible = true
           this.relationData = {
             id: id,
-            linkType: "1",
+            linkType: '1',
-            responseData: res.data,
+            responseData: res.data
-          };
+          }
-          this.topNameArray = ["未关联基础设施名称", "已关联基础设施名称"];
+          this.topNameArray = ['未关联基础设施名称', '已关联基础设施名称']
-          //将数据传递给引入的组件
+          // 将数据传递给引入的组件
-        });
+        })
     },
     // 是否展示关联应用弹窗
-    handleIsShowRelatePopupApply(type) {
+    handleIsShowRelatePopupApply (type) {
-      this.relateApplicationResourceVisible = type;
+      this.relateApplicationResourceVisible = type
     },
+    // 新上架
+    clear () {
+      this.showPutOnTheShelfFlag2 = false
+      this.radio = '应用资源'
+      this.submitFrom = {
+        type: '应用资源',
+        deptId: '',
+        delFlag: 0,
+        infoList: [
+          // {
+          //   attrType: '组件类型',
+          //   attrValue: '',
+          //   delFlag: 0
+          // }
+        ]
+      }
+      this.reset()
     },
-};
+    // 上架
+    showPutOnTheShelf () {
+      this.showPutOnTheShelfFlag2 = true
+      this.$http.get('/category/getCategoryTree').then(res => {
+        this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0]
+        console.log(this.insertList, this, this.radio, 'hhhhhhhhhhh')
+        this.putOnTheShelfList = this.insertList.children
+      })
+    },
+    changeInfoList (obj) {
+      this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== obj.attrType)
+      this.submitFrom.infoList.push(obj)
+    },
+    submitData () {
+      this.showPutOnTheShelfFlag2 = false
+      const arr = []
+      this.putOnTheShelfList.map(item => {
+        item.children.map(child => {
+          if (child.children) {
+            if (child.name === '算法优势' || child.name === '应用场景' || child.name === '功能介绍') {
+              arr.push(child.name)
+            }
+            child.children.map(val => {
+              arr.push(val.name)
+              if (val.type === 'input' || val.type === 'textArea' || val.type === 'select' || val.type === 'checkBox' || val.type === 'radio') {
+                this.submitFrom.infoList = this.submitFrom.infoList.filter((item) => item.attrType !== val.name)
+              }
+              if (val.note1) {
+                switch (val.name) {
+                  case '算法名称':
+                  case '应用名称':
+                  case '组件名称':
+                  case '图层名称':
+                    this.submitFrom.name = val.note1
+                    break
+                  case '算法描述':
+                  case '应用描述':
+                  case '组件描述':
+                  case '图层描述':
+                    this.submitFrom.description = val.note1
+                    break
+                  case '共享条件':
+                    this.submitFrom.shareCondition = val.note1
+                    break
+                  case '共享类型':
+                    this.submitFrom.shareType = val.note1
+                    break
+                  case '服务接口':
+                    this.submitFrom.apiUrl = val.note1
+                    break
+                  case '接口请求方式':
+                    this.submitFrom.apiMethodType = val.note1
+                    break
+                  case '访问地址':
+                    this.submitFrom.link = val.note1
+                    break
+                  case '部门联系人':
+                    this.submitFrom.deptContacts = val.note1
+                    break
+                  case '部门联系人电话':
+                    this.submitFrom.deptPhone = val.note1
+                    break
+                  case '归属部门':
+                    this.submitFrom.deptId = val.note1
+                    break
+                  case '能力类型':
+                    this.submitFrom.type = val.note1
+                    break
+                  default:
+                    if (val.type !== 'image' && val.type !== 'file' && val.type !== 'video') {
+                      this.submitFrom.infoList.push({
+                        attrType: val.name,
+                        attrValue: val.note1,
+                        delFlag: 0
+                      })
+                    }
+                    break
+                }
+              }
+            })
+          }
+        })
+      })
+      this.submitFrom.infoList = this.submitFrom.infoList.sort((a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType))
+      if (this.submitFrom.id) {
+        // 解决编辑无组件类型
+        this.submitFrom.infoList.map(val => {
+          if (val.attrType === '组件类型') {
+            val.attrValue = this.radio
+          }
+        })
+        console.log('编辑===============>', this.submitFrom)
+        this.$http
+          .put('/resource/update', this.submitFrom)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              this.$message.error('修改失败!')
+            } else {
+              this.$message.success('修改成功！')
+              this.clear()
+            }
+          })
+          .catch(() => {})
+      } else {
+        this.$http
+          .post('/resource/insert?source= b', this.submitFrom)
+          .then(({ data: res }) => {
+            if (res.code !== 0) {
+              this.$message.error('上架失败!')
+            } else {
+              this.$message.success('上架成功！')
+              this.clear()
+            }
+          })
+          .catch(() => {})
+      }
+    },
+    // 新修改
+    UpdateData (item) {
+      this.$http.get('/category/getCategoryTree').then(res => {
+        this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0]
+        this.radio = '应用资源'
+        // this.radio = item.infoList.filter(val => val.attrType === '应用资源')[0].attrValue
+        this.putOnTheShelfList = this.insertList.children
+        // this.putOnTheShelfList = this.insertList.children.filter(item => item.name === this.radio)[0].children
+        this.putOnTheShelfList.map(parent => {
+          parent.children.map(child => {
+            if (child.name === '算法优势' || child.name === '应用场景' || child.name === '功能介绍') {
+              const obj = item.infoList.filter(val => val.attrType === child.name)[0]
+              if (obj) {
+                child.note1 = obj.attrValue
+              }
+            } else {
+              if (child.children) {
+                child.children.map(data => {
+                  if (data.name === '计费标准信息' || data.name === '常见问题') {
+                    const obj = item.infoList.filter(val => val.attrType === child.name)[0]
+                    if (obj) {
+                      data.note1 = obj.attrValue
+                    }
+                  } else {
+                    switch (data.name) {
+                      case '算法名称':
+                      case '应用名称':
+                      case '组件名称':
+                      case '图层名称':
+                        data.note1 = item.name
+                        break
+                      case '算法描述':
+                      case '应用描述':
+                      case '组件描述':
+                      case '图层描述':
+                        data.note1 = item.description
+                        break
+                      case '共享条件':
+                        data.note1 = item.shareCondition
+                        break
+                      case '共享类型':
+                        data.note1 = item.shareType
+                        break
+                      case '服务接口':
+                        data.note1 = item.apiUrl
+                        break
+                      case '接口请求方式':
+                        data.note1 = item.apiMethodType
+                        break
+                      case '访问地址':
+                        data.note1 = item.link
+                        break
+                      case '部门联系人':
+                        data.note1 = item.deptContacts
+                        break
+                      case '部门联系人电话':
+                        data.note1 = item.deptPhone
+                        break
+                      case '归属部门':
+                        data.note1 = item.deptId
+                        break
+                      case '能力类型':
+                        data.note1 = item.type
+                        break
+                      default:
+                        // eslint-disable-next-line no-case-declarations
+                        const obj1 = item.infoList.filter(val => val.attrType === data.name)[0]
+                        if (obj1) {
+                          data.note1 = obj1.attrValue
+                        }
+                        break
+                    }
+                    if (data.type === 'image' || data.type === 'file' || data.type === 'video') {
+                      const obj1 = item.infoList.filter(val => val.attrType === data.name)[0]
+                      if (obj1) {
+                        data.note2 = obj1.note2
+                      }
+                    }
+                  }
+                })
+              }
+            }
+          })
+        })
+        this.submitFrom.id = item.id
+        this.showPutOnTheShelfFlag2 = true
+      })
+    }
+  }
+}
 </script>
 <style lang="scss" scoped>
 .el-tooltip__popper {

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

@@ -23,7 +23,7 @@
                 tip="支持文件类型，大小不超过100M"></upload>
               <upload  @changeInfoList='changeInfoList' :title='item.name' accept='.mp4' :list="item" v-else-if="item.type == 'video'" type="视频" btnName="上传视频" :maxCount="1" :dataList="item"
                 tip="支持视频类型，大小不超过100M"></upload>
-              <input-select-checkbox :list="[]" v-else-if="item.type == 'text'" type="disabled" :data="item" :name="item.name" value="组件服务"></input-select-checkbox>
+              <input-select-checkbox :list="[]" v-else-if="item.type == 'text'" type="disabled" :data="item" :name="item.name" :value="typeInput"></input-select-checkbox>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'text2'" type="disabled" :data="item" :name="item.name" :value="type"></input-select-checkbox>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'input'" type="input" :data="item" :name="item.name"></input-select-checkbox>
               <input-select-checkbox :list="[]" v-else-if="item.type == 'select'" type="select" :data="item" :name="item.name" :options="item.options"></input-select-checkbox>
@@ -52,7 +52,8 @@ export default {
   },
   props: {
     type: String,
-    putOnTheShelfList: Array
+    putOnTheShelfList: Array,
+    typeInput: String
   },
   data () {
     return {