diff --git a/base-vue/src/assets/img/login.png b/base-vue/src/assets/img/login.png
new file mode 100644
index 0000000..22342bb
Binary files /dev/null and b/base-vue/src/assets/img/login.png differ
diff --git a/base-vue/src/views/common/login.vue b/base-vue/src/views/common/login.vue
index 0760577..1a0f0bb 100644
--- a/base-vue/src/views/common/login.vue
+++ b/base-vue/src/views/common/login.vue
@@ -113,18 +113,20 @@
right: 0;
bottom: 0;
left: 0;
- background-color: rgba(38, 50, 56, .6);
+ background: linear-gradient(225deg,#f9fbff,#e4e9f0);
+ // background-image: url(~@/assets/img/bg_login.jpg);
+ // background-size: cover;
overflow: hidden;
- &:before {
+ &:after {
position: fixed;
- top: 0;
- left: 0;
- z-index: -1;
- width: 100%;
+ top: 0%;
+ left: 15%;
+ z-index: 1;
+ width: 30%;
height: 100%;
+ max-width: 579px;
content: "";
- background-image: url(~@/assets/img/login.jpg);
- background-size: cover;
+ background: center / 100% auto url(~@/assets/img/login.png) no-repeat;
}
.site-content__wrapper {
position: absolute;
@@ -160,12 +162,15 @@
}
.login-main {
position: absolute;
- top: 0;
- right: 0;
- padding: 150px 60px 180px;
- width: 470px;
- min-height: 100%;
- background-color: #fff;
+ top: 50%;
+ transform: translateY(-50%);
+ right: 15%;
+ width: 380px;
+ padding: 20px 40px;
+ background: #fff9;
+ border-radius: 8px;
+ -webkit-backdrop-filter: blur(10px);
+ backdrop-filter: blur(10px);
}
.login-title {
font-size: 16px;
diff --git a/base-vue/src/views/modules/deploy/flwdeployprodef.vue b/base-vue/src/views/modules/deploy/flwdeployprodef.vue
index 5f28232..ed31df6 100644
--- a/base-vue/src/views/modules/deploy/flwdeployprodef.vue
+++ b/base-vue/src/views/modules/deploy/flwdeployprodef.vue
@@ -232,24 +232,24 @@
this.flowForm.id = this.id
// 提交表单数据
this.$http({
- url: this.$http.adornUrl(`/flw/instance/startFlowInstance`),
- method: 'get',
- params: this.$http.adornParams(this.flowForm)
- }).then(({data}) => {
- if (data && data.code === 0) {
- this.$message({
- message: '操作成功',
- type: 'success',
- duration: 1500,
- onClose: () => {
- this.dialogFormVisible = false
- this.flowForm = {}
- }
- })
- } else {
- this.$message.error(data.msg)
+ url: this.$http.adornUrl(`/flw/instance/startFlowInstance`),
+ method: 'get',
+ params: this.$http.adornParams(this.flowForm)
+ }).then(({data}) => {
+ if (data && data.code === 0) {
+ this.$message({
+ message: '操作成功',
+ type: 'success',
+ duration: 1500,
+ onClose: () => {
+ this.dialogFormVisible = false
+ this.flowForm = {}
}
})
+ } else {
+ this.$message.error(data.msg)
+ }
+ })
},
// 多选
selectionChangeHandle (val) {
@@ -265,11 +265,11 @@
params: this.$http.adornParams()
}).then(({data}) => {
if (data && data.code === 0) {
- this.dynamiForm = data.data
- this.users = data.users
- this.roles = data.roles
+ this.dynamiForm = [...data.data]
+ this.users = [...data.users]
+ this.roles = [...data.roles]
// 需要动态的给 flowForm 绑定元素
- // for( var item of this.dynamiForm){
+ // for( var item of data.data){
// this.flowForm[item.key] = item.value
// }
this.dialogFormVisible = true
diff --git a/base-vue/src/views/modules/tickets/tickets.vue b/base-vue/src/views/modules/tickets/tickets.vue
index 8966114..f72d862 100644
--- a/base-vue/src/views/modules/tickets/tickets.vue
+++ b/base-vue/src/views/modules/tickets/tickets.vue
@@ -122,6 +122,7 @@
修改
删除
+ 指派
@@ -136,6 +137,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -156,7 +199,12 @@
dataListSelections: [],
addOrUpdateVisible: false,
dictConfigs: [{url: '/car/car/list', type: 'list', value: 'carId', label: 'carName'}, {type: 'dict', code: 'error_type'}, {url: '/flow/contract/list', type: 'list', value: 'contractId', label: 'contractNumber'}, {url: '/client/client/list', type: 'list', value: 'clientId', label: 'clientName'}],
- dictData: []
+ dictData: [],
+ dialogFormVisible: false,
+ flowForm:{id: 'Process_1:2:05cb9af4-03a2-11f0-8846-e40d36456f42', ticketsId: null},
+ dynamiForm:[],
+ users: [],
+ roles: []
}
},
mixins: [apiUtils],
@@ -240,6 +288,44 @@
}
})
}).catch(() => {})
+ },
+ startFlowHandle(id){
+ this.flowForm = {}
+ this.flowForm.ticketsId = id
+ this.$http({
+ url: this.$http.adornUrl(`/flow/deploy/flowDef/${id}`),
+ method: 'get',
+ params: this.$http.adornParams()
+ }).then(({data}) => {
+ if (data && data.code === 0) {
+ this.dynamiForm = [...data.data]
+ this.users = [...data.users]
+ this.roles = [...data.roles]
+ this.dialogFormVisible = true
+ }
+ })
+ },
+ submitStartFlow(){
+ // 提交表单数据
+ this.$http({
+ url: this.$http.adornUrl(`/flw/instance/startFlowInstance`),
+ method: 'get',
+ params: this.$http.adornParams(this.flowForm)
+ }).then(({data}) => {
+ if (data && data.code === 0) {
+ this.$message({
+ message: '操作成功',
+ type: 'success',
+ duration: 1500,
+ onClose: () => {
+ this.dialogFormVisible = false
+ this.flowForm = {}
+ }
+ })
+ } else {
+ this.$message.error(data.msg)
+ }
+ })
}
}
}