Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

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

@@ -514,7 +514,7 @@ export default {
               this.total = 0
               return this.$message.error(res.msg)
             }
-            if (res.data.list.length !== 0) {
+            if (res.data.list.length >= 0) {
               this.dataList = res.data.list
               this.total = this.mixinViewModuleOptions.getDataListIsPage
                 ? res.data.total

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

@@ -393,7 +393,7 @@ export default {
               this.total = 0
               return this.$message.error(res.msg)
             }
-            if (res.data.list.length !== 0) {
+            if (res.data.list.length >= 0) {
               this.dataList = res.data.list
               this.total = this.mixinViewModuleOptions.getDataListIsPage
                 ? res.data.total

back/src/views/modules/algorithm/algorithm-management.vue

@@ -249,7 +249,7 @@ export default {
               this.total = 0
               return this.$message.error(res.msg)
             }
-            if (res.data.list.length !== 0) {
+            if (res.data.list.length >= 0) {
               this.dataList = res.data.list
               this.total = this.mixinViewModuleOptions.getDataListIsPage
                 ? res.data.total

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

@@ -131,54 +131,54 @@
 </template>
 
 <script>
-import mixinViewModule from "@/mixins/view-module";
+import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from "./canassigncase-add-or-update";
+import AddOrUpdate from './canassigncase-add-or-update'
-import dictionaries from "@/utils/dictionaries";
+import dictionaries from '@/utils/dictionaries'
-import qs from "qs";
+import qs from 'qs'
-import { type } from "os";
+import { type } from 'os'
 export default {
   mixins: [mixinViewModule],
   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,
+      qp: false
-    };
+    }
   },
   watch: {},
   components: {
-    AddOrUpdate,
+    AddOrUpdate
   },
   created () {
-    this.dataForm.name = "";
+    this.dataForm.name = ''
-    this.dataForm.type = "赋能案例";
+    this.dataForm.type = '赋能案例'
   },
   mounted () {
-    window.addEventListener("resize", this.a);
+    window.addEventListener('resize', this.a)
-    this.fullScreen();
+    this.fullScreen()
   },
   methods: {
     reset () {
       this.$http
         .get(
           this.mixinViewModuleOptions.getDataListURL +
-            "?" +
+            '?' +
             qs.stringify({
               // order: this.order,
               // orderField: this.orderField,
@@ -187,56 +187,56 @@ 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) {
-      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) {
-      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) {
-      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) {
@@ -244,81 +244,81 @@ export default {
         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) {
+            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 () {
       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
+      }
+    }
+  }
 }
-    },
-  },
-};
 </script>
 <style lang="scss" scoped>
 .el-tooltip__popper {

back/src/views/modules/myAgent/demo/ResourcesAndServices.vue

@@ -7,55 +7,33 @@
           <div class="dataTitleSon">
             {{ itemson.name }}
           </div>
-          <div
+          <div class="dataContent" v-if="
-            class="dataContent"
-            v-if="
             itemson.name !== '算法优势' &&
             itemson.name !== '应用场景' &&
             itemson.name !== '功能介绍'
-            "
+          ">
-          >
+            <el-form-item v-for="itemsonson in itemson.children" :key="itemsonson.name" :label="
-            <el-form-item
-              v-for="itemsonson in itemson.children"
-              :key="itemsonson.name"
-              :label="
               itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
-              "
+            " v-show="
-              v-show="
   !(
     itemsonson.name === '平台地址' ||
     itemsonson.name === 'SDK安装包' ||
     itemsonson.name === '接口请求方式' ||
     itemsonson.name === '服务接口'
   )
-              "
+">
-            >
+              <div class="videoAndImgCss" v-if="
-              <div
-                class="videoAndImgCss"
-                v-if="
                 itemsonson.type === 'video' || itemsonson.type === 'image'
-                "
+              " @click="videoAndImg(itemsonson.note1)">
-                @click="videoAndImg(itemsonson.note1)"
-              >
                 浏览
               </div>
-               <div
+              <div class="videoAndImgCss" v-if="
-                class="videoAndImgCss"
-                v-if="
                 itemsonson.name === '上传附件'
-                "
+              " @click="videoAndImg(itemsonson.note1)">
-                @click="videoAndImg(itemsonson.note1)"
-              >
                 下载
               </div>
-              <div
+              <div v-else-if="itemsonson.type === ' multipleAdditions'" class="multipleAdditionsClass">
-                v-else-if="itemsonson.type === ' multipleAdditions'"
+                <div v-for="multipleAdditionsItem in itemsonson.note1" :key="multipleAdditionsItem">
-                class="multipleAdditionsClass"
-              >
-                <div
-                  v-for="multipleAdditionsItem in itemsonson.note1"
-                  :key="multipleAdditionsItem"
-                >
                   <el-tooltip placement="top">
                     <div slot="content">
                       {{
@@ -95,54 +73,31 @@
                   <!-- <div>{{ multipleAdditionsItem }}</div> -->
                 </div>
               </div>
-              <el-tooltip v-else placement="top" :disabled="itemsonson.note1 !== null?false:true" :content="itemsonson.note1">
+              <el-tooltip v-else placement="top" :disabled="itemsonson.note1 !== null ? false : true"
+                :content="itemsonson.note1">
                 <!-- <div slot="content" v-show="itemsonson.note1">{{ itemsonson.note1 }}</div> -->
-                <el-input
+                <el-input v-model="itemsonson.note1" disabled="disabled"></el-input>
-                  v-model="itemsonson.note1"
-                  disabled="disabled"
-                ></el-input>
               </el-tooltip>
             </el-form-item>
-            <el-form-item
+            <el-form-item v-for="itemsonson in itemson.children" :key="itemsonson.name" :label="
-              v-for="itemsonson in itemson.children"
-              :key="itemsonson.name"
-              :label="
               itemsonson.type != ' multipleAdditions' ? itemsonson.name : ''
-              "
+            " v-show="
-              v-show="
   (itemsonson.name === '平台地址' && showDocking) ||
   (itemsonson.name === 'SDK安装包' && showSDK) ||
   (itemsonson.name === '接口请求方式' && showInterface) ||
   (itemsonson.name === '服务接口' && showInterface)
-              "
+">
-            >
               <el-tooltip placement="top" :disabled="itemsonson.note1 !== null ? false : true" :content="itemsonson.note1">
-              <el-input
+                <el-input v-model="itemsonson.note1" disabled="disabled"></el-input>
-                v-model="itemsonson.note1"
-                disabled="disabled"
-              ></el-input>
               </el-tooltip>
 
             </el-form-item>
           </div>
-          <div
+          <div v-else-if="itemson.name === '算法优势'" style="margin-bottom: 20px">
-            v-else-if="itemson.name === '算法优势'"
+            <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
-            style="margin-bottom: 20px"
+              <div v-if="itemDataForm.attrType === '算法优势'" class="textAndImg">
-          >
+                <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
-            <div
+                  class="textAndImgSon" style="border: 1px solid #3c9bcd;margin">
-              v-for="itemDataForm in dataForm.infoList"
-              :key="itemDataForm.attrType"
-            >
-              <div
-                v-if="itemDataForm.attrType === '算法优势'"
-                class="textAndImg"
-              >
-                <div
-                  v-for="itemDataFormValue in itemDataForm.attrValue"
-                  :key="itemDataFormValue.name + 'value'"
-                  class="textAndImgSon"
-                  style="border: 1px solid #3c9bcd;margin"
-                >
                   <div>{{ itemDataFormValue.name }}</div>
                   <el-tooltip placement="top">
                     <div slot="content">{{ itemDataFormValue.desc }}</div>
@@ -152,24 +107,11 @@
               </div>
             </div>
           </div>
-          <div
+          <div v-else-if="itemson.name === '应用场景'" style="margin-bottom: 20px">
-            v-else-if="itemson.name === '应用场景'"
+            <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
-            style="margin-bottom: 20px"
+              <div v-if="itemDataForm.attrType === '应用场景'" class="textAndImg">
-          >
+                <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
-            <div
+                  class="textAndImgSon" style="border: 1px solid #3c9bcd;margin">
-              v-for="itemDataForm in dataForm.infoList"
-              :key="itemDataForm.attrType"
-            >
-              <div
-                v-if="itemDataForm.attrType === '应用场景'"
-                class="textAndImg"
-              >
-                <div
-                  v-for="itemDataFormValue in itemDataForm.attrValue"
-                  :key="itemDataFormValue.name + 'value'"
-                  class="textAndImgSon"
-                  style="border: 1px solid #3c9bcd;margin"
-                >
                   <div>{{ itemDataFormValue.name }}</div>
                   <el-tooltip placement="top">
                     <div slot="content">{{ itemDataFormValue.desc }}</div>
@@ -180,24 +122,11 @@
               </div>
             </div>
           </div>
-          <div
+          <div v-else-if="itemson.name === '功能介绍'" style="margin-bottom: 20px">
-            v-else-if="itemson.name === '功能介绍'"
+            <div v-for="itemDataForm in dataForm.infoList" :key="itemDataForm.attrType">
-            style="margin-bottom: 20px"
+              <div v-if="itemDataForm.attrType === '功能介绍'" class="textAndImg">
-          >
+                <div v-for="itemDataFormValue in itemDataForm.attrValue" :key="itemDataFormValue.name + 'value'"
-            <div
+                  class="textAndImgSon" style="border: 1px solid #3c9bcd;margin">
-              v-for="itemDataForm in dataForm.infoList"
-              :key="itemDataForm.attrType"
-            >
-              <div
-                v-if="itemDataForm.attrType === '功能介绍'"
-                class="textAndImg"
-              >
-                <div
-                  v-for="itemDataFormValue in itemDataForm.attrValue"
-                  :key="itemDataFormValue.name + 'value'"
-                  class="textAndImgSon"
-                  style="border: 1px solid #3c9bcd;margin"
-                >
                   <div>{{ itemDataFormValue.name }}</div>
                   <el-tooltip placement="top">
                     <div slot="content">{{ itemDataFormValue.desc }}</div>
@@ -514,6 +443,7 @@ export default {
     font-size: 22px;
     margin-bottom: 25px;
   }
+
   .dataTitleSon {
     padding-left: 30px;
     color: #333333;
@@ -522,8 +452,10 @@ export default {
     background: url("~@/assets/img/sj-jx.png") no-repeat;
     background-position-x: 15px;
   }
+
   .multipleAdditionsClass {
     display: flex;
+
     &>div {
       margin-right: 30px;
       border: 1px solid #3c9bcd;
@@ -534,6 +466,7 @@ export default {
       align-items: center;
       padding: 10px;
       overflow: hidden;
+
       &>div:first-child {
         margin-bottom: 10px;
         font-weight: bold;
@@ -544,6 +477,7 @@ export default {
         -webkit-box-orient: vertical;
         -webkit-line-clamp: 2;
       }
+
       &>div:nth-child(2) {
         overflow: hidden;
         text-overflow: ellipsis;
@@ -552,6 +486,7 @@ export default {
         -webkit-line-clamp: 6;
         line-height: initial;
       }
+
       &>div:nth-child(3) {
         width: 90%;
         overflow: hidden;
@@ -563,6 +498,7 @@ export default {
       }
     }
   }
+
   .videoAndImgCss {
     cursor: pointer;
     font-size: 12px;
@@ -571,10 +507,13 @@ export default {
     padding: 5px;
     margin-top: 10px;
     background: rgba(60, 155, 205, 0.1);
+    display: inline-block;
   }
+
   .textAndImg {
     display: flex;
     padding-left: 30px;
+
     .textAndImgSon {
       width: 212px;
       height: 182px;
@@ -584,6 +523,7 @@ export default {
       align-items: center;
       padding: 10px;
       position: relative;
+
       &>div {
         -webkit-line-clamp: 5;
         overflow: hidden;
@@ -592,10 +532,12 @@ export default {
         -webkit-box-orient: vertical;
         word-break: break-all;
       }
+
       &>div:first-child {
         margin-bottom: 10px;
         font-weight: bold;
       }
+
       &>div:nth-child(3) {
         margin-top: 10px;
         position: absolute;
@@ -610,13 +552,27 @@ export default {
       }
     }
   }
+
   .dataContent {
-    display: grid;
+    display: flex;
-    grid-template-columns: repeat(3, 33%);
+    align-items: center;
-    padding-left: 30px;
+    flex-wrap: wrap;
+
   }
+
+  ::v-deep .el-form-item {
+    flex: 1;
+    display: flex;
+    justify-content: flex-start;
+  }
+
+  ::v-deep .el-form-item__label {
+    width: 112px;
+  }
+
   ::v-deep .el-form-item__content {
     display: inline-block;
+
     input {
       width: 400px;
     }

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: Light
- * @LastEditTime: 2022-10-27 16:04:01
+ * @LastEditTime: 2022-11-01 15:00:19
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -63,6 +63,7 @@
     <!-- 申请能力 -->
     <div class="AbilityApply">
       <h3>申请能力</h3>
+      <div style="font-size:18px;font-weight:600;margin-top:20px;">{{deptName}}</div>
       <ul v-for="item in dataList" :key="item.id">
         <!-- <li class="title">{{item.address}}</li> -->
         <li class="clearfix">
@@ -157,6 +158,7 @@ export default {
         content: {}
       },
       dataList: [],
+      deptName: '',
       inputAgree: '',
       inputNo: '',
       agreeOrList: '同意'
@@ -228,6 +230,7 @@ export default {
       })
     },
     showDialog (title) {
+      this.input = title
       this.dialogVisible = true
       this.dialogType = title
     },
@@ -270,6 +273,7 @@ export default {
               this.dataForm,
               'elas============================'
             )
+            this.deptName = res.data.tAbilityApplicationDTOList[0].resourceOwnerDept.name
             this.$http
               .get(
             `/act/task/getTaskVariables?${params}&variableName=allowEntrust`

front/src/views/home/DetailsPageconetent.vue

@@ -1165,8 +1165,12 @@
             res.data.data.map((val) => {
               if (mapFlag && val.count != 0) {
                 mapFlag = false
+                if (Cardsname.value === val.type) {
+                  getAppResources2()
+                } else {
                   changeCards(val.type)
                 }
+              }
             })
             if (!mapFlag) {
               return

front/src/views/home/infrastructurePage.vue

@@ -1052,7 +1052,7 @@
           roomResult.value = true
           onSearch()
         } else {
-          tabClick(0, '政务云资源')
+          tabClick(0, '城市云脑会客厅')
         }
       }
     }
@@ -1106,14 +1106,14 @@
       content: isXiHaiAn
         ? ['视频资源']
         : username == 'admin'
-        ? ['政务云资源', '视频资源', '城市云脑会客厅', '视频会议']
+        ? ['城市云脑会客厅', '视频资源', '政务云资源', '视频会议']
-        : ['政务云资源', '视频资源', '城市云脑会客厅'],
+        : ['城市云脑会客厅', '视频资源', '政务云资源'],
     },
   ])
   let clickList = ref([]) //存储点击的tab
   if (!isXiHaiAn) {
     tabList.value.push({
-      title: '政务云资源',
+      title: '城市云脑会客厅',
       content: [],
     })
   }

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

@@ -161,13 +161,13 @@
   const store = useStore()
   const router = useRouter()
   const topList = ref([
-    '组件服务',
     '应用资源',
+    '组件服务',
     '基础设施',
     '数据资源',
     '知识库',
   ])
-  const select = ref(whoShow.itShowQingDao ? '' : '组件服务')
+  const select = ref(whoShow.itShowQingDao ? '' : '应用资源')
   let applicationDataList = ref([])
   let technosphereDataList = ref([])
   const fabubumen = ref([

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

@@ -120,36 +120,43 @@
       title: '任务名称',
       dataIndex: 'activityName',
       key: 'activityName',
+      width: '180px',
     },
     {
       title: '处理部门',
       dataIndex: 'assigneeDeptName',
       key: 'assigneeDeptName',
+      width: '180px',
     },
     {
       title: '处理人',
       dataIndex: 'assigneeName',
       key: 'assigneeName',
+      width: '180px',
     },
     {
       title: '任务开始时间',
       dataIndex: 'startTime',
       key: 'startTime',
+      width: '180px',
     },
     {
       title: '任务结束时间',
       dataIndex: 'endTime',
       key: 'endTime',
+      width: '180px',
     },
     {
       title: '审核意见',
       dataIndex: 'comment',
       key: 'comment',
+      width: '180px',
     },
     {
       title: '任务时长',
       dataIndex: 'duration',
       key: 'duration',
+      width: '180px',
     },
   ]
   const getInfo = () => {