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

front/public/static/config/basicConfig.js

@@ -2,14 +2,14 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-12-02 16:52:28
+ * @LastEditTime: 2022-12-05 15:20:39
  * @Description: 系统静态参数配置
  */
 var _global = {}
 var CONFIGITEM = {
-  version: 'qingdao', //青岛
+  // version: 'qingdao', //青岛
   // version: 'xihaian', // 西海岸
-  // version: 'dev', // 开发
+  version: 'dev', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   // version: 'qingdao', // 测试
   //version: 'frp', // 内网穿透

front/public/static/css/modal.css

@@ -81,7 +81,7 @@ z-index: 10010!important;
   z-index: 10010!important;
 }
 .ant-notification {
-z-index: 10010!important;
+z-index: 10012!important;
 }
 .ant-popconfirm {
 z-index: 10010!important;

front/src/utils/accessToken.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-03-29 17:48:03
- * @LastEditors: Light
+ * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-10 16:56:17
+ * @LastEditTime: 2022-12-05 15:27:26
  * @Description: 告诉大家这是什么
  */
 import { storage, tokenTableName } from '@/config'
@@ -42,8 +42,9 @@ export function setAccessToken(accessToken) {
     } else if ('sessionStorage' === storage) {
       return sessionStorage.setItem(tokenTableName, accessToken)
     } else if ('cookie' === storage) {
-      let expires = new Date(new Date() * 1 + 12 * 60 * 60 * 1000)
+      // let expires = new Date(new Date() * 1 + 12 * 60 * 60 * 1000)
-      return cookie.set(tokenTableName, accessToken, { expires: expires })
+      // return cookie.set(tokenTableName, accessToken, { expires: expires })
+      return cookie.set(tokenTableName, accessToken)
       // return cookie.set(tokenTableName, '213124123412341234')
     } else {
       return localStorage.setItem(tokenTableName, accessToken)

front/src/views/home/DetailsPageconetent.vue

@@ -2097,7 +2097,7 @@
       height: 100%;
       height: -moz-available; /* WebKit-based browsers will ignore this. */
       height: -webkit-fill-available; /* Mozilla-based browsers will ignore this. */
-      height: fill-available;
+      height: stretch;
       position: absolute;
       width: 2.5rem;
       top: 0.17rem;

front/src/views/home/algorithmCompare.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="bg">
-    <home-header :target-flag = "targetFlag"></home-header>
+    <home-header :target-flag="targetFlag"></home-header>
     <div class="box-container">
       <a-spin
         size="large"
@@ -10,7 +10,12 @@
       />
       <div class="nav-box">
         <a-breadcrumb>
-          <a-breadcrumb-item @click="goToDetailsPageconetent" class="bread-crumb-span">能力集市</a-breadcrumb-item>
+          <a-breadcrumb-item
+            @click="goToDetailsPageconetent"
+            class="bread-crumb-span"
+          >
+            能力集市
+          </a-breadcrumb-item>
           <a-breadcrumb-item>算法对比</a-breadcrumb-item>
         </a-breadcrumb>
       </div>
@@ -160,7 +165,6 @@
       cancel-text="取消"
       @ok="handleOk"
       @cancel="handleCancel"
-      
     >
       <a-table
         :columns="columns"
@@ -189,7 +193,6 @@
     unref,
     reactive,
     nextTick,
-    onCreated,
   } from 'vue'
   import { selectOne } from '@/api/home'
   import { message, Tooltip, Table, Spin } from 'ant-design-vue'
@@ -198,7 +201,7 @@
   const router = useRouter()
   let queryId = router.currentRoute.value.query.id
   const ctx = getCurrentInstance()
-  const targetFlag= ref(true)
+  const targetFlag = ref(true)
   // 最大4列
   const pagination = ref([])
   // 表格列名
@@ -656,21 +659,20 @@
 
   //点击头部面包屑进入对应的页面goToDetailsPageconetent
   const goToDetailsPageconetent = () => {
-    let pathData =  {
+    let pathData = {
-          path: '/DetailsPageconetent',
+      path: '/DetailsPageconetent',
-        };
+    }
-     mybus.emit('changeMenuStyle',pathData);
+    mybus.emit('changeMenuStyle', pathData)
   }
 </script>
 
 <style>
- .ant-modal-footer {
+  .ant-modal-footer {
     display: block;
   }
 </style>
 
 <style lang="less" scoped>
- 
   .bg {
     background: #fff;
     height: 100vh;
@@ -727,8 +729,8 @@
       align-items: center;
       background: rgba(244, 245, 248, 0.8);
       padding-left: 10px;
-      .bread-crumb-span{
+      .bread-crumb-span {
-         cursor: pointer;
+        cursor: pointer;
       }
     }
 

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

@@ -1,203 +0,0 @@
-<!-- <template>
-  <div class="form-container">
-    <div>
-      <a-form :model="dataForm" ref="formName">
-        <a-form-item label="应用名称">
-          <a-input
-            v-model="formName.name"
-            :disabled="fieldDisabled"
-            placeholder="应用名称"
-          ></a-input>
-        </a-form-item>
-        <a-form-item label="应用描述">
-          <a-input
-            v-model="formName.description"
-            :disabled="fieldDisabled"
-            placeholder="应用描述"
-          ></a-input>
-        </a-form-item>
-        <a-form-item label="访问地址">
-          <a-input
-            v-model="formName.link"
-            :disabled="fieldDisabled"
-            placeholder="访问地址"
-          ></a-input>
-        </a-form-item>
-        <a-form-item
-          v-for="item in formName.infoList"
-          :key="item.index"
-          :label="item.attrType"
-          :disabled="fieldDisabled"
-        >
-          <a-input
-            v-model="item.attrValue"
-            :placeholder="item.attrType"
-            :disabled="fieldDisabled"
-          ></a-input>
-        </a-form-item>
-      </a-form>
-    </div>
-    <a-form>
-      <a-form-item
-        style="color: #666; font-size: 16px"
-        label="发布单附件"
-        name="applyDoc"
-      >
-        <a-upload
-          v-model:file-list="fileList"
-          name="file"
-          action="https://www.mocky.io/v2/5cc8019d300000980a055e76"
-          :headers="headers"
-          @change="handleChange"
-        >
-          <a-button
-            style="
-              width: 100px;
-              height: 30px;
-              margin-right: 10px;
-              background: #edf4fc;
-              color: #0087ff;
-              font-size: 14px;
-              border-radius: 6px;
-              border: 1px solid #bbd3ef;
-              padding: 0;
-              text-align: center;
-            "
-          >
-            <upload-outlined></upload-outlined>
-            附件下载
-          </a-button>
-        </a-upload>
-      </a-form-item>
-    </a-form>
-    <div class="title">流程图</div>
-    <div>
-      <img :src="getResourceURL()" alt="" />
-    </div>
-    <div class="title">流转详情</div>
-    <a-table :dataSource="dataSource.data" :columns="columns" />
-  </div>
-</template>
-
-<script setup>
-  import { onMounted, reactive, defineProps } from 'vue'
-  import Cookies from 'js-cookie'
-  import { baseURL } from '@/config'
-  import qs from 'qs'
-  import {
-    resourceMountApply,
-    // getTaskHandleDetailInfo,
-  } from '@/api/personalCenter'
-
-  //表单信息
-  let formName = reactive({})
-  //流转详情
-  const dataSource = reactive({ data: [] })
-  const columns = [
-    {
-      title: '任务名称',
-      dataIndex: 'activityName',
-      key: 'activityName',
-    },
-    {
-      title: '处理人',
-      dataIndex: 'assigneeName',
-      key: 'assigneeName',
-    },
-    {
-      title: '任务开始时间',
-      dataIndex: 'startTime',
-      key: 'startTime',
-    },
-    {
-      title: '任务结束时间',
-      dataIndex: 'endTime',
-      key: 'endTime',
-    },
-    {
-      title: '审核意见',
-      dataIndex: 'comment',
-      key: 'comment',
-    },
-    {
-      title: '任务时长/秒',
-      dataIndex: 'durationInSeconds',
-      key: 'durationInSeconds',
-    },
-  ]
-
-  const props = defineProps({
-    businessKey: { type: String, default: null },
-    processInstanceId: { type: String, default: null },
-  })
-  const getInfo = () => {
-    console.log('props.businessKey', props.businessKey)
-    resourceMountApply(props.businessKey).then((res) => {
-      const { data } = res.data
-      console.log(data)
-      formName = data
-    })
-  }
-
-  const getLiuZhuanInfo = () => {
-    const params = qs.stringify({
-      page: 1,
-      limit: 4,
-      processInstanceId: props.processInstanceId,
-    })
-    resourceMountApply(params).then((res) => {
-      res.data.data.forEach((item) => {
-        dataSource.data.push(item)
-      })
-    })
-  }
-
-  onMounted(() => {
-    getInfo()
-    getLiuZhuanInfo()
-  })
-
-  const getResourceURL = () => {
-    const params = qs.stringify({
-      token: Cookies.get('accessToken'),
-      // processInstanceId: this.dataForm.processInstanceId
-      processInstanceId: props.processInstanceId,
-    })
-    return `${baseURL}/act/his/getInstImage?${params}`
-  }
-</script>
-
-<style scoped lang="less">
-  .form-container {
-    padding: 20px 20px 30px 20px;
-    .title {
-      font-size: 20px;
-      color: #000;
-      font-weight: bold;
-      margin-bottom: 20px;
-    }
-  }
-  .base-info {
-    display: flex;
-  }
-  :deep(.ant-form-item-label) {
-    label {
-      color: #666;
-      font-size: 16px;
-      &::after {
-        content: '';
-      }
-    }
-  }
-  :deep(.ant-form-item-required) {
-    &::before {
-      font-size: 8px;
-      margin-right: 10px;
-    }
-  }
-
-  :deep(.ant-input) {
-    border: 1px solid #e0e0e0;
-    border-radius: 6px;
-  }
-</style> -->