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

# Conflicts:
#	front/src/views/assignCase/components/queryPage.vue

front/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "HiIRS",
+  "name": "HiUCS",
   "version": "0.8.0",
   "private": true,
   "scripts": {

front/public/static/config/location.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-07-05 20:07:23
+ * @LastEditTime: 2022-07-05 20:08:53
  * @Description: 数据资源参数配置
  */
 //const newLocation = 'qingdao'
@@ -162,7 +162,7 @@ else if (newLocation === 'xihaian') {
   footerDataList.footerList = {
     company: {
       left: '青岛西海岸新区大数据发展促进局建设',
-      right: 'v0.81',
+      right: 'v0.8.1.5',
     },
     address: [
       {

front/src/views/detailsAll/components/Algorithm/AlgorithmOnTrial.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-09 09:29:29
- * @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-06-13 15:21:26
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-07-05 20:25:49
  * @Description: 算法详情 算法试用
 -->
 <template>
@@ -25,7 +25,7 @@
   const onTrial = ref('')
   if (props.dataList.infoList) {
     let obj = props.dataList.infoList.filter(
-      (item) => item.attrType === '试用地址'
+      (item) => item.attrType === '试用地址' && item.attrValue
     )[0]
     if (!obj) {
       flag.value = false
@@ -37,7 +37,7 @@
     () => props.dataList,
     (val) => {
       if (val) {
-        let obj = val.infoList.filter((item) => item.attrType === '试用地址')[0]
+        let obj = val.infoList.filter((item) => item.attrType === '试用地址' && item.attrValue)[0]
         if (!obj) {
           flag.value = false
         } else {

front/src/views/home/components/header.vue

@@ -326,7 +326,7 @@
       .name-bg {
         height: 0.6rem;
         width: 0.6rem;
-        background: url('~@/assets/newHome/newHome-title-bg.png') no-repeat;
+        // background: url('~@/assets/newHome/newHome-title-bg.png') no-repeat;
         background-size: 100%;
         margin-right: 0.15rem;
       }

node_modules/.package_versions.json

@@ -0,0 +1 @@
+{}