+
@@ -12,109 +16,128 @@
+
diff --git a/back/src/views/modules/activiti/model-add-or-update.vue b/back/src/views/modules/activiti/model-add-or-update.vue
index 789a5ad8..1fca9a5d 100644
--- a/back/src/views/modules/activiti/model-add-or-update.vue
+++ b/back/src/views/modules/activiti/model-add-or-update.vue
@@ -1,78 +1,117 @@
-
-
+
+
-
+
-
+
-
+
- {{ $t('cancel') }}
- {{ $t('confirm') }}
+ {{ $t("cancel") }}
+ {{
+ $t("confirm")
+ }}
diff --git a/back/src/views/modules/activiti/model.vue b/back/src/views/modules/activiti/model.vue
index 92122c7a..7194b76e 100644
--- a/back/src/views/modules/activiti/model.vue
+++ b/back/src/views/modules/activiti/model.vue
@@ -1,21 +1,39 @@
-
+
-
+
-
+
- {{ $t('query') }}
+ {{
+ $t("query")
+ }}
- {{ $t('add') }}
+ {{
+ $t("add")
+ }}
- {{ $t('deleteBatch') }}
+ {{
+ $t("deleteBatch")
+ }}
-
-
-
-
-
-
-
+ style="width: 100%"
+ >
+
+
+
+
+
+
+
- {{ $t('model.design') }}
- {{ $t('model.deploy') }}
- {{ $t('export') }}
- {{ $t('delete') }}
+ {{ $t("model.design") }}
+ {{ $t("model.deploy") }}
+ {{ $t("export") }}
+ {{ $t("delete") }}
@@ -47,76 +124,90 @@
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
- @current-change="pageCurrentChangeHandle">
+ @current-change="pageCurrentChangeHandle"
+ >
-
+
diff --git a/back/src/views/modules/activiti/my-apply.vue b/back/src/views/modules/activiti/my-apply.vue
index 6443c2e9..3889bcb8 100644
--- a/back/src/views/modules/activiti/my-apply.vue
+++ b/back/src/views/modules/activiti/my-apply.vue
@@ -1,12 +1,22 @@
-
+
-
+
- {{ $t('query') }}
+ {{
+ $t("query")
+ }}
-
-
-
-
-
-
+ style="width: 100%"
+ >
+
+
+
+
+
+
- {{ $t('process.ended0') }}
- {{ $t('process.ended1') }}
+ {{
+ $t("process.ended0")
+ }}
+ {{
+ $t("process.ended1")
+ }}
-
+
-
-
-
+
+
+
- {{ $t('process.viewFlowImage') }}
+ {{ $t("process.viewFlowImage") }}
@@ -44,39 +115,39 @@
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
- @current-change="pageCurrentChangeHandle">
+ @current-change="pageCurrentChangeHandle"
+ >
diff --git a/back/src/views/modules/activiti/my-join-task.vue b/back/src/views/modules/activiti/my-join-task.vue
index 1cbac2bf..1e5731c0 100644
--- a/back/src/views/modules/activiti/my-join-task.vue
+++ b/back/src/views/modules/activiti/my-join-task.vue
@@ -1,12 +1,22 @@
-
+
-
+
- {{ $t('query') }}
+ {{
+ $t("query")
+ }}
+ style="width: 100%"
+ >
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
- {{ $t('process.viewFlowImage') }}
+ {{ $t("process.viewFlowImage") }}
@@ -43,39 +101,39 @@
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
- @current-change="pageCurrentChangeHandle">
+ @current-change="pageCurrentChangeHandle"
+ >
diff --git a/back/src/views/modules/activiti/my-todo-task-pool.vue b/back/src/views/modules/activiti/my-todo-task-pool.vue
index c6c0802f..0e37969f 100644
--- a/back/src/views/modules/activiti/my-todo-task-pool.vue
+++ b/back/src/views/modules/activiti/my-todo-task-pool.vue
@@ -1,12 +1,22 @@
-
+
-
+
- {{ $t('query') }}
+ {{
+ $t("query")
+ }}
-
-
-
-
-
-
-
-
+ style="width: 100%"
+ >
+
+
+
+
+
+
+
+
- {{ $t('process.claim') }}
- {{ $t('process.viewFlowImage') }}
+ {{ $t("process.claim") }}
+ {{ $t("process.viewFlowImage") }}
@@ -37,59 +105,62 @@
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
- @current-change="pageCurrentChangeHandle">
+ @current-change="pageCurrentChangeHandle"
+ >
diff --git a/back/src/views/modules/activiti/my-todo-task.vue b/back/src/views/modules/activiti/my-todo-task.vue
index 15a93f0c..29bff2c0 100644
--- a/back/src/views/modules/activiti/my-todo-task.vue
+++ b/back/src/views/modules/activiti/my-todo-task.vue
@@ -8,12 +8,22 @@
-
+
-
+
- {{ $t('query') }}
+ {{
+ $t("query")
+ }}
-
+ style="width: 100%"
+ >
+
- {{scope.row.params && scope.row.params.user||scope.row.params && scope.row.params.applyUserName||scope.row.params && scope.row.params.userName||scope.row.params && scope.row.params.undercarriageUserName}}
+ {{
+ (scope.row.params && scope.row.params.user) ||
+ (scope.row.params && scope.row.params.applyUserName) ||
+ (scope.row.params && scope.row.params.userName) ||
+ (scope.row.params && scope.row.params.undercarriageUserName)
+ }}
-
+
- {{scope.row.params && scope.row.params.system||scope.row.params && scope.row.params.demandSubject||scope.row.params && scope.row.params.resourceDTO && scope.row.params.resourceDTO.name||scope.row.params && scope.row.params.undercarriageReason}}
+ {{
+ (scope.row.params && scope.row.params.system) ||
+ (scope.row.params && scope.row.params.demandSubject) ||
+ (scope.row.params &&
+ scope.row.params.resourceDTO &&
+ scope.row.params.resourceDTO.name) ||
+ (scope.row.params && scope.row.params.undercarriageReason)
+ }}
-
-
+
+
-
-
+
+
- {{ $t('manage') }}
- {{ $t('process.viewFlowImage') }}
+ {{ $t("manage") }}
+ {{ $t("process.viewFlowImage") }}
@@ -54,49 +118,49 @@
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="pageSizeChangeHandle"
- @current-change="pageCurrentChangeHandle">
+ @current-change="pageCurrentChangeHandle"
+ >
diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue
index 40d92ca1..eb454c24 100644
--- a/back/src/views/modules/activiti/my-work-dynamics.vue
+++ b/back/src/views/modules/activiti/my-work-dynamics.vue
@@ -664,6 +664,11 @@ export default {
};
diff --git a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
index 00c211e3..0571e328 100644
--- a/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
+++ b/front/src/views/detailsAll/components/Business/BusinessUsageMode.vue
@@ -12,22 +12,17 @@
{{ item.title }}
- {{ item.titleSon }}
{{ item.link.name }}
- {{ item.link.value }}
-
-
- {{ item.postMethod.name }}
- {{ item.postMethod.value }}
+ {{ item.linkValue }}
@@ -51,20 +46,20 @@
-
{{ item.contact }}
+
{{ item.contact2 }}
- {{ item.people.name }}
+ {{ item.people2.name }}
- {{ item.people.value }}
- {{ item.people.value }}
+ {{ item.people2.value }}
+ {{ item.people2.value }}
- {{ item.phone.name }}
+ {{ item.phone2.name }}
- {{ item.phone.value }}
- {{ item.phone.value }}
+ {{ item.phone2.value }}
+ {{ item.phone2.value }}
@@ -83,26 +78,27 @@
englishTitle: 'USAGE',
content: [
{
- title: '技术对接',
- titleSon: '调用接口',
+ title: '组件地址',
link: {
name: '接口地址：',
- value: 'http://localhost:9999/#/details?id=1532278256619307010',
},
- postMethod: {
- name: '请求方式：',
- value: 'POST',
- },
- contact: '联系厂商：',
- facilitator: { name: '服务商：', value: '科大讯飞' },
- people: { name: '联系人：', value: '李四' },
+ linkValue: '',
+ contact: '归属部门',
+ facilitator: { name: '归属部门：', value: '讯飞科大' },
+ people: { name: '部门联系人：', value: '李四' },
phone: {
- name: '联系电话：',
+ name: '联系人电话：',
value: '12345678901',
},
+ contact2: '服务商',
+ facilitator2: { name: '服务商：', value: '科大讯飞' },
+ people2: { name: '服务商联系人：', value: '李四' },
+ phone2: {
+ name: '联系人电话：',
+ value: '1234567890',
+ },
},
],
- link: '',
})
//数据初始化
const props = defineProps({
@@ -118,20 +114,17 @@
} else {
// eslint-disable-next-line vue/no-setup-props-destructure
dataFrom.value.content[0].link.value = props.dataList.apiUrl
- // eslint-disable-next-line vue/no-setup-props-destructure
- dataFrom.value.content[0].postMethod.value = props.dataList.apiMethodType
+ dataFrom.value.content[0].facilitator.value = props.dataList.deptContacts
console.log('dataList', props.dataList)
props.dataList.infoList.map((item) => {
- if (item.attrType === '使用方式') {
- dataFrom.value.content[0].titleSon = item.attrValue
+ if (item.attrType === '组件地址') {
+ dataFrom.value.content[0].linkValue = item.attrValue || '--'
} else if (item.attrType === '服务商') {
dataFrom.value.content[0].facilitator.value = item.attrValue || '--'
} else if (item.attrType === '服务商联系人') {
dataFrom.value.content[0].people.value = item.attrValue || '--'
} else if (item.attrType === '服务商联系电话') {
dataFrom.value.content[0].phone.value = item.attrValue || '--'
- } else if (item.attrType === '技术文档') {
- dataFrom.value.link = item.attrValue || '--'
}
})
}
@@ -145,11 +138,11 @@
flag.value = false
} else {
dataFrom.value.content[0].link.value = val.apiUrl
- dataFrom.value.content[0].postMethod.value = val.apiMethodType
+ dataFrom.value.content[0].facilitator.value = val.deptContacts
console.log('dataList', val)
val.infoList.map((item) => {
- if (item.attrType === '使用方式') {
- dataFrom.value.content[0].titleSon = item.attrValue
+ if (item.attrType === '组件地址') {
+ dataFrom.value.content[0].linkValue = item.attrValue || '--'
} else if (item.attrType === '服务商') {
dataFrom.value.content[0].facilitator.value =
item.attrValue || '--'
@@ -157,8 +150,6 @@
dataFrom.value.content[0].people.value = item.attrValue || '--'
} else if (item.attrType === '服务商联系电话') {
dataFrom.value.content[0].phone.value = item.attrValue || '--'
- } else if (item.attrType === '技术文档') {
- dataFrom.value.link = item.attrValue || '--'
}
})
}
@@ -180,6 +171,21 @@
// btoa(encodeURI(dataFrom.value.link))
// )
}
+ function technicalNew() {
+ // 拼接路径
+ // const type = pinyin(props.dataList.type, {
+ // pattern: 'initial',
+ // }).replace(/\s*/g, '')
+ // // 打开文档
+ // const id = props.dataList.id
+ // window.open(window.SITE_CONFIG.frontUrl + type + '/' + id + '.md', '_blank')
+ console.log('dataFrom.value.link', dataFrom.value.link)
+ window.open(
+ window.SITE_CONFIG.previewUrl +
+ 'hisense_office/onlinePreview?url=' +
+ btoa(encodeURI(dataFrom.value.link))
+ )
+ }
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 84106d79..6c4639dd 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -59,20 +59,15 @@
-
+
-
- {{ item.content }}
- {{ item.title }}
-
-
- 设为已读
-
+ {{ item.content }}
+
查看更多
@@ -113,29 +108,30 @@
import { ref, onMounted, onBeforeUnmount, defineProps } from 'vue'
import { recordRoute } from '@/config'
import { useRoute, useRouter } from 'vue-router'
- import { getUser, mynotice, mynoticeRead } from '@/api/home'
+ import { getUser, mynotice } from '@/api/home'
import { useStore } from 'vuex'
import { getSgcTotal } from '@/api/home'
import mybus from '@/myplugins/mybus'
const store = useStore()
const router = useRouter()
const route = useRoute()
- const navList = ref([
- { name: '共享门户', key: 'home' },
- { name: '能力集市', key: 'DetailsPageconetent' },
- { name: '能力云图', key: 'capabilityCloud' },
- { name: '能力统计', key: 'abilityStatistics' },
- { name: '开发指南', key: 'developmentGuide' },
- { name: '需求中心', key: 'demandCenter' },
- // { name: '个人中心', key: 'personalCenter' },
- { name: '区市站点', key: 'mapTest' },
- // { name: '后台管理', key: 'houtaiguanli' },
- { name: '赋能案例', key: 'assignCase' },
- ])
+ // const navListManagement = ref([
+ // { name: '共享门户', key: 'home' },
+ // { name: '能力集市', key: 'DetailsPageconetent' },
+ // { name: '能力云图', key: 'capabilityCloud' },
+ // { name: '能力统计', key: 'abilityStatistics' },
+ // { name: '开发指南', key: 'developmentGuide' },
+ // { name: '需求中心', key: 'demandCenter' },
+ // // { name: '个人中心', key: 'personalCenter' },
+ // { name: '区市站点', key: 'mapTest' },
+ // // { name: '后台管理', key: 'houtaiguanli' },
+ // { name: '赋能案例', key: 'assignCase' },
+ // ])
const user = ref({})
const select = ref(router.currentRoute.value.name)
const mynoticeFlag = ref(false)
const mynoticeData = ref([])
+ const navList = ref(navListManagement.navList)
const props = defineProps({
showView: { type: String, default: '' },
})
@@ -243,15 +239,20 @@
mynotice({ page: 1, limit: 999, readStatus: 0 }).then((res) => {
console.log('我的消息', res.data.data)
mynoticeNum.value = res.data.data.total
- mynoticeData.value = res.data.data.list
+ mynoticeData.value = res.data.data.list.splice(0, 3)
})
}
- const read = (item) => {
- mynoticeRead(item.id).then((res) => {
- console.log('已读', res)
- getMynotice()
+ const goToView = () => {
+ router.push({
+ path: '/mynoticeView',
})
}
+ // const read = (item) => {
+ // mynoticeRead(item.id).then((res) => {
+ // console.log('已读', res)
+ // getMynotice()
+ // })
+ // }
onMounted(() => {
getSgcTotal().then((res) => {
console.log('初始化========================>', res.data.data.count)
@@ -397,7 +398,7 @@
}
}
.mynotice {
- width: 2.5rem;
+ width: 4rem;
height: 3rem;
background: #eee;
border-radius: 0.05rem;
@@ -405,24 +406,33 @@
top: 0.45rem;
right: 3.1rem;
overflow-y: scroll;
+ .bottom {
+ cursor: pointer;
+ width: 100%;
+ text-align: center;
+ color: #000;
+ font-size: 0.16rem;
+ }
}
.mynotice::-webkit-scrollbar {
display: none;
}
:deep(.ant-list-item) {
border-bottom: 0.01rem solid #ccc;
+ padding: 0.1rem;
}
:deep(.ant-list-item-meta-title) {
- display: flex;
- justify-content: space-around;
- align-items: center;
- padding: 0 0.05rem;
+ // display: flex;
+ // justify-content: space-around;
+ // align-items: center;
+ // padding: 0 0.05rem;
a {
- width: 1.5rem;
- // 超出显示...
+ width: 3.8rem;
overflow: hidden;
text-overflow: ellipsis;
- white-space: nowrap;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
}
button {
width: 0.7rem;
diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue
new file mode 100644
index 00000000..7e4db574
--- /dev/null
+++ b/front/src/views/mynoticeView/components/NoticeList.vue
@@ -0,0 +1,260 @@
+
+
+
+
+
+
+
+
{{ nav.title + '(' + nav.num + ')' }}
+
+
+
+
搜索
+
+
+
+
+
+
搜索
+
重置
+
+
+
+
+
+ 全部消息
+ 已读消息
+ 未读消息
+
+
+
+
全选
+
+ 共
+ 2
+ 条消息
+
+
+
+
标记为已读
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+ {{ '发布时间：' + item.time }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/front/src/views/mynoticeView/index.vue b/front/src/views/mynoticeView/index.vue
new file mode 100644
index 00000000..8b012893
--- /dev/null
+++ b/front/src/views/mynoticeView/index.vue
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
diff --git a/front/src/views/newHome/components/WorkDynList.vue b/front/src/views/newHome/components/WorkDynList.vue
index 7017a313..59a6fbf6 100644
--- a/front/src/views/newHome/components/WorkDynList.vue
+++ b/front/src/views/newHome/components/WorkDynList.vue
@@ -125,7 +125,6 @@
.total-num-content {
font-size: 14px;
color: #212121;
- margin: 18px 0 10px;
border-bottom: 1px solid #dddee1;
height: 35px;
display: flex;
@@ -141,16 +140,11 @@
}
:deep(.ant-list-item) {
width: 1300px;
- padding: 16px 0;
+ padding: 30px 0;
position: relative;
border-bottom: #dddee1 solid 1px;
- .ant-list-item-main {
- height: 140px;
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-box-orient: vertical;
- -webkit-line-clamp: 4;
+ .ant-list-item-meta {
+ margin: 0;
}
.ant-list-item-meta-title {
white-space: nowrap;
@@ -167,17 +161,18 @@
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
- -webkit-line-clamp: 4;
+ -webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.pulish-time {
position: absolute;
left: 196px;
- bottom: 50px;
+ bottom: 35px;
color: #212121;
}
.ant-image-img {
width: 180px;
+ min-height: 120px;
}
&:hover {