@@ -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/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 {