diff --git a/flowable-engine-web/src/api/request.js b/flowable-engine-web/src/api/request.js index c49d2b3..7be6306 100644 --- a/flowable-engine-web/src/api/request.js +++ b/flowable-engine-web/src/api/request.js @@ -10,8 +10,8 @@ Vue.prototype.$axios = axios; // 字体图标 export function getBaseUrl(){ - return "http://gateway.mytwins.top" - // return "http://localhost:8000" + // return "http://gateway.mytwins.top" + return "http://localhost:8000" } const service = axios.create({ diff --git a/flowable-engine-web/src/components/common/AvatarEllipsis.vue b/flowable-engine-web/src/components/common/AvatarEllipsis.vue new file mode 100644 index 0000000..aa73eeb --- /dev/null +++ b/flowable-engine-web/src/components/common/AvatarEllipsis.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/flowable-engine-web/src/main.js b/flowable-engine-web/src/main.js index f2fdd5f..e47427a 100644 --- a/flowable-engine-web/src/main.js +++ b/flowable-engine-web/src/main.js @@ -12,13 +12,13 @@ import "@/assets/theme.less"; import "@/assets/global.css"; import "@/assets/iconfont/iconfont.css" +import AvatarEllipsis from '@/components/common/AvatarEllipsis' import Ellipsis from '@/components/common/Ellipsis' import WDialog from '@/components/common/WDialog' import Tip from '@/components/common/Tip' -import axios from "axios"; -import {getBaseUrl} from "./api/request"; Vue.use(ElementUI); +Vue.use(AvatarEllipsis); Vue.use(Ellipsis); Vue.use(WDialog); Vue.use(Tip); diff --git a/flowable-engine-web/src/views/common/form/components/RatePicker.vue b/flowable-engine-web/src/views/common/form/components/RatePicker.vue index 1f9472a..d04c0db 100644 --- a/flowable-engine-web/src/views/common/form/components/RatePicker.vue +++ b/flowable-engine-web/src/views/common/form/components/RatePicker.vue @@ -74,6 +74,8 @@ export default { diff --git a/flowable-engine-web/src/views/common/operation/OperationRender.vue b/flowable-engine-web/src/views/common/operation/OperationRender.vue index 57ae57c..8a88a96 100644 --- a/flowable-engine-web/src/views/common/operation/OperationRender.vue +++ b/flowable-engine-web/src/views/common/operation/OperationRender.vue @@ -9,8 +9,18 @@ placement="top">
-
- +
+ +
+ +
{{ operation.operationName }}
@@ -67,46 +77,106 @@ export default { }, data() { return { - timeline: {} + timeline: {}, + } }, created() { - - - switch (this.state) { - case '1': - this.timeline = { - color: '#f78f5f', - icon: 'el-icon-more', - context: '审批进行中' + console.log(this.operationList) + this.init() + }, + methods: { + init() { + switch (this.state) { + case '1': + this.timeline = { + color: '#f78f5f', + icon: 'el-icon-more', + context: '审批进行中' + } + break + case '2': + this.timeline = { + color: '#0bbd87', + icon: 'el-icon-check', + context: '审批通过' + } + break + case '3': + this.timeline = { + color: '#f56c6c', + icon: 'el-icon-close', + context: '审核已驳回' + } + break + case '4': + this.timeline = { + color: '#0bbd87', + icon: 'el-icon-check', + context: '审批通过' + } + break + default: + break + } + // let operationListNew = [] + console.log(this.operationList.length, "sdjshjdhasjds") + for (let i = 0;i - +