Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev

back/src/router/index.js

@@ -5,10 +5,9 @@ import { isURL } from '@/utils/validate'
 import store from '@/store'
 import Cookies from 'js-cookie'
 
-
 // 解决ElementUI导航栏中的vue-router在3.0版本以上重复点菜单报错问题
 const originalPush = Router.prototype.push
-Router.prototype.push = function push(location) {
+Router.prototype.push = function push (location) {
   return originalPush.call(this, location).catch(err => err)
 }
 
@@ -42,7 +41,8 @@ export const moduleRoutes = {
   meta: { title: '主入口布局' },
   children: [
     // todos 临时调整，后期去掉
-    { path: '/home', redirect: '/bscatalogue-bscatalogue', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } },
+    // { path: '/home', redirect: '/bscatalogue-bscatalogue', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } },
+    { path: '/home', redirect: '/workBench-workBench', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } },
     { path: '/iframe', component: null, name: 'iframe', meta: { title: 'iframe', isTab: true } }
   ]
 }

back/src/views/modules/activiti/demo/putaway-process3.vue

@@ -117,6 +117,7 @@
     <ren-process-detail></ren-process-detail>
     <el-dialog
       title="审批意见"
+      :close-on-click-modal="false"
       :visible.sync="dialogVisible"
       width="30%"
       :before-close="handleClose"

back/src/views/modules/myAgent/demo/ability-resource-shelf.vue

@@ -65,6 +65,7 @@
     <ren-process-detail></ren-process-detail>
     <el-dialog
       title="审批意见"
+      :close-on-click-modal="false"
       :visible.sync="dialogVisible"
       width="30%"
       :before-close="handleClose"

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

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-25 09:42:46
+ * @LastEditTime: 2022-07-28 17:23:05
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -109,6 +109,7 @@
     <ren-process-detail></ren-process-detail>
     <el-dialog
       title="审批意见"
+      :close-on-click-modal="false"
       :visible.sync="dialogVisible"
       width="30%"
       :before-close="handleClose"

back/src/views/modules/sys/user-add-or-update.vue

@@ -56,6 +56,7 @@ import { isEmail, isMobile } from '@/utils/validate'
 export default {
   data () {
     return {
+      submitFlag: true,
       visible: false,
       roleList: [],
       roleIdListDefault: [],
@@ -170,6 +171,22 @@ export default {
         ]).then(() => {
           if (this.dataForm.id) {
             this.getInfo()
+          } else {
+            this.dataForm = {
+              id: '',
+              username: '',
+              deptId: '',
+              deptName: '',
+              password: '',
+              confirmPassword: '',
+              realName: '',
+              gender: 0,
+              email: '',
+              mobile: '',
+              roleIdList: [],
+              postIdList: [],
+              status: 1
+            }
           }
         })
       })
@@ -219,30 +236,34 @@ export default {
         if (!valid) {
           return false
         }
-        this.dataForm.password = Encrypt(this.dataForm.password)
+        if (this.submitFlag) {
-        if (this.dataForm.id) {
+          this.submitFlag = false
-          delete this.dataForm.password
+          this.dataForm.password = Encrypt(this.dataForm.password)
-        }
+          if (this.dataForm.id) {
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/user', {
+            delete this.dataForm.password
-          ...this.dataForm,
-          roleIdList: [
-            ...this.dataForm.roleIdList,
-            ...this.roleIdListDefault
-          ]
-        }).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
           }
-          this.$message({
+          this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/user', {
-            message: this.$t('prompt.success'),
+            ...this.dataForm,
-            type: 'success',
+            roleIdList: [
-            duration: 500,
+              ...this.dataForm.roleIdList,
-            onClose: () => {
+              ...this.roleIdListDefault
-              this.visible = false
+            ]
-              this.$emit('refreshDataList')
+          }).then(({ data: res }) => {
+            if (res.code !== 0) {
+              return this.$message.error(res.msg)
             }
-          })
+            this.$message({
-        }).catch(() => {})
+              message: this.$t('prompt.success'),
+              type: 'success',
+              duration: 500,
+              onClose: () => {
+                this.visible = false
+                this.$emit('refreshDataList')
+              }
+            })
+            this.submitFlag = true
+          }).catch(() => {})
+        }
       })
     }, 1000, { leading: true, trailing: false })
   }

front/public/index.html

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 16:45:25
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-26 16:23:53
+ * @LastEditTime: 2022-07-28 14:42:55
  * @Description: 告诉大家这是什么
 -->
 <!DOCTYPE html>
@@ -48,16 +48,16 @@
     // window.SITE_CONFIG['websocketURL'] = '15.2.21.243:8888/renren-admin';
     // window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // 西海岸版本
-    // window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
+    window.SITE_CONFIG['backUrl'] = 'http://10.134.135.9:9797';
-    // window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
+    window.SITE_CONFIG['previewUrl'] = 'http://10.134.135.9:9796/';
-    // window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
+    window.SITE_CONFIG['frontUrl'] = 'http://10.134.135.9:9796/document/#/devModelFile/';
-    // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
+    window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin';
     // 开发
-    window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
+    // window.SITE_CONFIG['backUrl'] = 'http://localhost:8001';
-    window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
+    // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.236:9796/';
-    window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/';
+    // window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.236:9796/document/#/devModelFile/';
-    window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
+    // window.SITE_CONFIG['apiURL'] = 'http://15.2.21.236:8888/renren-admin';
-    window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
+    // window.SITE_CONFIG['websocketURL'] = '15.2.21.236:8888/renren-admin';
     window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address';
     // window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797';
     // window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/';

front/public/static/config/location.js

@@ -1,13 +1,13 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
- * @LastEditors: hisense.liangjunhua
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-28 09:36:58
+ * @LastEditTime: 2022-07-28 14:32:04
  * @Description: 数据资源参数配置
  */
-const newLocation = 'qingdao'
+//const newLocation = 'qingdao'
 // const newLocation = 'baotou'
-// const newLocation = 'xihaian'
+const newLocation = 'xihaian'
 
 // 数据资源数据
 const whoShow = {}

front/src/views/home/infrastructurePage.vue

@@ -239,7 +239,7 @@
     getStreamByChannelCode(param).then((res) => {
       console.log(res)
       visible.value = true
-      options.value.src = res.data.data
+      options.src = res.data.data
     })
   }
   // const dataTypeList = () => {

front/src/views/home/integrationServicesDetails.vue

@@ -23,13 +23,44 @@
       </div>
     </div>
 
-    <!-- 组合能力 -->
+    <!-- 场景痛点 -->
+    <div
+      id="integration-pain-point"
+      class="pain-point scrollBox"
+    >
+      <div class="title-1">
+        <DetalsTitle title="场景痛点" type="PAIN POINT"></DetalsTitle>
+      </div>
+      <div class="flex-row-center">
+        <div class="bg"></div>
+        <div class="content">
+          <div class="content-item" v-for="(item, i) in painPoint" :key="i">{{i+1}}.{{item.description}}</div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 解决方案 -->
+    <div
+      id="integration-solution"
+      class="solution scrollBox"
+    >
+      <div class="title-1">
+        <DetalsTitle title="解决方案" type="SOLUTION"></DetalsTitle>
+      </div>
+      <div class="flex-row-center">
+        <div class="content">
+          <div class="content-item" v-for="(item, i) in solution" :key="i">{{i+1}}.{{item.description}}</div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 使用能力 -->
     <div
       id="integration-combination-ability"
       class="combination-ability scrollBox"
     >
       <div class="title-1">
-        <DetalsTitle title="组合能力" type="COMBINATION ABILITY"></DetalsTitle>
+        <DetalsTitle title="使用能力" type="COMBINATION ABILITY"></DetalsTitle>
       </div>
       <div class="flex-row-center combine-content">
         <div class="combine-item" v-for="(item, i) in combineList" :key="i">
@@ -43,48 +74,23 @@
       </div>
     </div>
 
-    <!-- 使用方式 -->
+    <!-- 构建步骤 -->
-    <div id="integration-use-way" class="use-way scrollBox">
+    <div
+      id="integration-step"
+      class="step scrollBox"
+    >
       <div class="title-1">
-        <DetalsTitle title="使用方式" type="USE WAY"></DetalsTitle>
+        <DetalsTitle title="构建步骤" type="STEP"></DetalsTitle>
       </div>
-      <div class="content">
+      <div class="flex-row-center">
-        <div class="content-card flex-row-between left word-bg">
+        <div style="height: 300px;">
-          <div class="content-card-item left-item">
+          <el-steps direction="vertical" :active="step.length">
-            <div class="card-title">文档</div>
+            <el-step v-for="(item, i) in step" :key="i" :title="item.question" :description="item.answer"></el-step>
-            <!-- <div class="card-text">文档描述文档描述文档描述文档描述</div> -->
+          </el-steps>
-          </div>
-          <div class="content-card-item btn-box">
-            <div class="btn" @click="handleOpenUrl('技术文档')">技术文档</div>
-            <div class="btn" @click="handleOpenUrl('使用手册')">使用手册</div>
-          </div>
-        </div>
-        <div class="content-card flex-row-start">
-          <div
-            class="right-item content-card-item"
-            v-for="(use, i) in useWayShowList"
-            :key="i"
-          >
-            <div class="card-title title">{{ use.title }}</div>
-            <div
-              class="card-text"
-              v-for="(d, k) in Object.keys(use.info)"
-              :key="k"
-            >
-              {{ use.info[d] }}:{{ detailInfoObj[d] || '--' }}
-            </div>
-          </div>
         </div>
       </div>
     </div>
 
-    <!-- 常见问题-->
-    <application-common-problem
-      :dataList="detailInfoObj"
-      id="common-problem"
-      class="scrollBox"
-    ></application-common-problem>
-
     <home-footer></home-footer>
   </div>
 </template>
@@ -102,6 +108,9 @@
   const router = useRouter()
   const scrollTop = ref(0)
   const domArr = ref([])
+  const painPoint = ref([])
+  const solution = ref([])
+  const step=ref([])
   const id = router.currentRoute.value.query.id
   document.documentElement.style.transition = 'all 0.3s ease'
   document.documentElement.scrollTop = 0
@@ -117,20 +126,24 @@
 
   const navList = ref([
     {
-      name: '组合能力',
+      name: '场景痛点',
+      key: 'integration-pain-point',
+    },
+    {
+      name: '解决方案',
+      key: 'integration-solution',
+    },
+    {
+      name: '使用能力',
       key: 'integration-combination-ability',
     },
     {
-      name: '使用方式',
+      name: '构建步骤',
-      key: 'integration-use-way',
+      key: 'integration-step',
-    },
-    {
-      name: '常见问题',
-      key: 'common-problem',
     },
   ])
 
-  const selectNow = ref('integration-combination-ability')
+  const selectNow = ref('integration-pain-point')
 
   const useWayShowList = ref([
     {
@@ -214,9 +227,12 @@
           attrType: '常见问题',
           attrValue: questionValue.attrValue || '[]',
         }
+        painPoint.value = JSON.parse(fuseAttrList.find((v) => v.attrType === '场景痛点').attrValue) || []
+        solution.value = JSON.parse(fuseAttrList.find((v) => v.attrType === '解决方案').attrValue) || []
+        step.value = JSON.parse(fuseAttrList.find((v) => v.attrType === '使用步骤').attrValue) || []
         let areaObj = {
           attrType: '应用领域',
-          attrValue: detailInfoObj.value.applicationArea,
+          attrValue: fuseAttrList.find((v) => v.attrType === '应用领域').attrValue,
         }
         combineList.value.map((item) => {
           let arr = (
@@ -409,6 +425,43 @@
     }
   }
 
+  .pain-point {
+    padding: 0.8rem 0;
+    background: rgb(247, 248, 250);
+    .bg {
+        height: 2rem;
+        width: 2rem;
+        background: url('~@/assets/home/rhfw_square.png') no-repeat;
+        background-size: 100%;
+        margin-top: 0.3rem;
+    }
+    .content {
+        height: 2rem;
+        width: 6rem;
+        .content-item {
+          margin: 0.1rem;
+        }
+    }
+  }
+
+  .solution {
+    padding: 0.8rem 0;
+    background: rgb(247, 248, 250);
+    .content {
+        height: 2rem;
+        width: 8rem;
+        .content-item {
+          margin: 0.3rem;
+        }
+    }
+  }
+
+  .step {
+    padding: 0.8rem 0;
+    background: rgb(247, 248, 250);
+
+  }
+
   .combination-ability {
     padding: 0.8rem 0;
     background: rgb(247, 248, 250);

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

@@ -19,10 +19,10 @@
           size="large"
           @search="onSearch"
         />
-        <div class="search" @click="gaojisousuo">
+        <!-- <div class="search" @click="gaojisousuo">
           <span></span>
           <span>高级搜索</span>
-        </div>
+        </div> -->
       </div>
     </div>
     <div class="gaoji-main" v-if="!qeihuan">

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

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-07-12 09:42:44
  * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-25 15:07:05
+ * @LastEditTime: 2022-07-28 14:13:22
  * @Description:我的申请 能力申请 查看详情
 -->
 <template>
@@ -142,7 +142,7 @@
                     ';' +
                     '视频流地址：' +
                     backUrl +
-                    '/resource/hls/getHls/?channelId=' +
+                    'resource/hls/getHls/?channelId=' +
                     val.channelId
                   }}
                 </div>