From e5fe34356d67c3474a0181f9c922cb16b9260596 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期六, 14 九月 2024 19:22:54 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/taskReliability/RBD-edit-img.vue | 160 ++++++++++++++++++++++++++++++++-------
web/src/views/pages/login.vue | 64 ++++++++--------
web/src/views/modules/taskReliability/ReliabilityAssess.vue | 1
web/packages/assets/img/fz_login-bg.png | 0
web/src/App.vue | 2
web/packages/assets/scss/pages/login.scss | 1
6 files changed, 166 insertions(+), 62 deletions(-)
diff --git a/web/packages/assets/img/fz_login-bg.png b/web/packages/assets/img/fz_login-bg.png
index dc39589..e5d4fe4 100644
--- a/web/packages/assets/img/fz_login-bg.png
+++ b/web/packages/assets/img/fz_login-bg.png
Binary files differ
diff --git a/web/packages/assets/scss/pages/login.scss b/web/packages/assets/scss/pages/login.scss
index 2142f35..93c551f 100644
--- a/web/packages/assets/scss/pages/login.scss
+++ b/web/packages/assets/scss/pages/login.scss
@@ -12,6 +12,7 @@
&::before {
background-image: url(../../assets/img/fz_login-bg.png);
background-size: cover;
+ background-repeat: no-repeat;
}
&::after {
background-color: rgba(38, 50, 56, .4);
diff --git a/web/src/App.vue b/web/src/App.vue
index a38f7e2..6a04123 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -25,7 +25,7 @@
document.querySelector('html').setAttribute('lang', val)
// 鍙互鍦ㄨ繖閲屼慨鏀瑰浗闄呭寲鏄剧ず鍚嶇О
- messages[val].brand.lg = '鍙潬鎬т豢鐪熷缓妯�'
+ messages[val].brand.lg = '鍙潬鎬т豢鐪熻瘎浼板強璇勫畾'
messages[val].company.name = '鍗曚綅鍚嶇О'
messages[val].company.code = '鍗曚綅浠ｇ爜'
messages[val].company.shortName = '鍗曚綅绠�绉�'
diff --git a/web/src/views/modules/taskReliability/RBD-edit-img.vue b/web/src/views/modules/taskReliability/RBD-edit-img.vue
index c7f5609..67c368e 100644
--- a/web/src/views/modules/taskReliability/RBD-edit-img.vue
+++ b/web/src/views/modules/taskReliability/RBD-edit-img.vue
@@ -43,7 +43,7 @@
<el-button @click="redo()">閲嶅仛</el-button>
</el-form-item>
<el-form-item>
- <zt-button type="delete" @click="deleteCompment()" />
+ <zt-button type="delete" @click="deleteCompment()"/>
</el-form-item>
</el-form>
<div id="containerImg" style="border: 1px solid #EAEBEE;border-radius: 6px;
@@ -468,7 +468,11 @@
"shape": "edge",
"id": "66c81c68-0827-4a3c-8343-e2c453d3e9e7",
"router": {
- "name": "manhattan"
+ "name": "manhattan",
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
},
"connector": {
"name": "rounded"
@@ -487,7 +491,11 @@
"shape": "edge",
"id": "a0f3cf90-6d37-4ee0-a254-90b4ec2b6a7f",
"router": {
- "name": "manhattan"
+ "name": "manhattan",
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
},
"connector": {
"name": "rounded"
@@ -510,8 +518,8 @@
},
data() {
return {
- nodeX:'',
- nodeY:'',
+ nodeX: '',
+ nodeY: '',
isFirstLoad: true,
hasMoveNode: false,
hasMoveSingleNode: null,
@@ -617,7 +625,13 @@
stroke: '#5F95FF',
strokeWidth: 1,
connector: 'rounded',
- router: 'manhattan',
+ router: {
+ name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
+ },
label: '',
nodeStroke: '#5F95FF',
nodeStrokeWidth: 1,
@@ -820,6 +834,10 @@
connecting: {
router: {
name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
},
connector: {
name: 'rounded',
@@ -830,7 +848,7 @@
anchor: 'center',
connectionPoint: 'anchor',
allowBlank: false,
- allowLoop:false, // 鏄惁鍏佽鍒涘缓寰幆杩炵嚎锛屽嵆杈圭殑璧峰鑺傜偣鍜岀粓姝㈣妭鐐逛负鍚屼竴鑺傜偣锛岄粯璁や负 true
+ allowLoop: false, // 鏄惁鍏佽鍒涘缓寰幆杩炵嚎锛屽嵆杈圭殑璧峰鑺傜偣鍜岀粓姝㈣妭鐐逛负鍚屼竴鑺傜偣锛岄粯璁や负 true
snap: {
radius: 20,
},
@@ -1017,7 +1035,7 @@
repairMttcr: item.repairMttcr,
repairMttcrOther2: item.repairMttcrOtherParams2,
repairMttcrOther3: item.repairMttcrOtherParams3,
- successRate:item.successRate,
+ successRate: item.successRate,
imgHeight: item.imgHeight,
imgWidth: item.imgWidth,
@@ -1403,7 +1421,7 @@
})
return false
})
- }else if (this.isMultipleBrach(node)) {
+ } else if (this.isMultipleBrach(node)) {
//鎻愮ず鏄惁瑕佸垹闄�
this.$confirm('鏄惁鍒犻櫎璇ヨ妭鐐�?', '鎻愮ず', {
confirmButtonText: '纭畾',
@@ -1431,7 +1449,7 @@
})
return false
})
- }else {
+ } else {
//鎻愮ず涓嶈兘鍒犻櫎
this.$message({message: '璇ユ潯绾胯矾涓婂彧鏈夎鑺傜偣锛屾棤娉曞垹闄�', type: 'warning'})
return false; // 鍙栨秷鎿嶄綔
@@ -1462,13 +1480,13 @@
}
})
},
- getNodeArr(){
+ getNodeArr() {
const nodes = this.graph.getNodes()
let nodeArr2 = []
// 妫�鏌ラ櫎褰撳墠鑺傜偣涔嬪鐨勬墍鏈夎妭鐐圭殑鍖呭洿妗嗘槸鍚︾浉浜�
for (const node of nodes) {
console.log(node, 'saveDiagram node')
- if (node.getData().nodeType == 'node' && node.getData().dataId) {
+ if (node.getData().nodeType == 'node' && node.getData().dataId) {
nodeArr2.push(node.getData().dataId)
}
}
@@ -1481,13 +1499,13 @@
this.getNodeArr()
const nodes = this.graph.getNodes()
for (const node of nodes) {
- if(node.getData().nodeType === 'dashedBox'){
+ if (node.getData().nodeType === 'dashedBox') {
this.$message({message: '璇ユā鍨嬩腑瀛樺湪铏氭锛屾棤娉曚繚瀛�', type: 'warning'})
return false; // 鍙栨秷娣诲姞鑺傜偣鎿嶄綔
}
- if(node.getData().nodeType === 'vote'){
+ if (node.getData().nodeType === 'vote') {
const edges = this.graph.getConnectedEdges(node);
- if(node.getData().voteNum>=edges.length){
+ if (node.getData().voteNum >= edges.length) {
this.$message({message: '琛ㄥ喅鏁伴噺涓嶈兘楂樹簬璇ヨ妭鐐圭殑杩涚嚎鏁伴噺', type: 'warning'})
return false; // 鍙栨秷娣诲姞鑺傜偣鎿嶄綔
}
@@ -1738,13 +1756,25 @@
this.graph.addEdge({
source: {cell: graphNodeStartNode, port: 'right1'},
target: {cell: result.newStartNode, port: 'left1'},
- router: {name: 'manhattan'},
+ router: {
+ name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
+ },
connector: {name: 'rounded'}
})
this.graph.addEdge({
source: {cell: result.newEndNode, port: 'right1'},
target: {cell: graphNode, port: 'left1'},
- router: {name: 'manhattan'},
+ router: {
+ name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
+ },
connector: {name: 'rounded'}
})
}
@@ -1840,14 +1870,26 @@
this.graph.addEdge({
source: {cell: result.newEndNode, port: startPort},
target: {cell: endNode, port: endPort},
- router: {name: 'manhattan'},
+ router: {
+ name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
+ },
connector: {name: 'rounded'}
})
} else {
this.graph.addEdge({
source: {cell: startNode, port: startPort},
target: {cell: result.newStartNode, port: endPort},
- router: {name: 'manhattan'},
+ router: {
+ name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
+ },
connector: {name: 'rounded'}
})
graphEdge.source = {cell: result.newEndNode.id, port: startPort}
@@ -1888,13 +1930,25 @@
this.graph.addEdge({
source: {cell: connectNode, port: 'right1'},
target: {cell: dashedBox, port: 'left1'},
- router: {name: 'manhattan'},
+ router: {
+ name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
+ },
connector: {name: 'rounded'}
})
this.graph.addEdge({
source: {cell: dashedBox, port: 'right1'},
target: {cell: dragNode, port: 'left1'},
- router: {name: 'manhattan'},
+ router: {
+ name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
+ },
connector: {name: 'rounded'}
})
return {newStartNode: connectNode, newEndNode: dragNode}
@@ -1940,52 +1994,100 @@
this.graph.addEdge({
source: {cell: leftConnectNode, port: 'right1'},
target: {cell: leftTopDashedBox, port: 'left1'},
- router: {name: 'manhattan'},
+ router: {
+ name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
+ },
connector: {name: 'rounded'},
})
this.graph.addEdge({
source: {cell: leftConnectNode, port: 'right1'},
target: {cell: leftBottomDashedBox, port: 'left1'},
- router: {name: 'manhattan'},
+ router: {
+ name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
+ },
connector: {name: 'rounded'},
})
let edgeTop = this.graph.addEdge({
source: {cell: leftTopDashedBox, port: 'right1'},
target: {cell: rightTopDashedBox, port: 'left1'},
- router: {name: 'manhattan'},
+ router: {
+ name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
+ },
connector: {name: 'rounded'},
})
let edgeBottom = this.graph.addEdge({
source: {cell: leftBottomDashedBox, port: 'right1'},
target: {cell: rightBottomDashedBox, port: 'left1'},
- router: {name: 'manhattan'},
+ router: {
+ name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
+ },
connector: {name: 'rounded'},
})
this.graph.addEdge({
source: {cell: rightTopDashedBox, port: 'right1'},
target: {cell: rightConnectNode, port: 'left1'},
- router: {name: 'manhattan'},
+ router: {
+ name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
+ },
connector: {name: 'rounded'},
})
this.graph.addEdge({
source: {cell: rightBottomDashedBox, port: 'right1'},
target: {cell: rightConnectNode, port: 'left1'},
- router: {name: 'manhattan'},
+ router: {
+ name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
+ },
connector: {name: 'rounded'},
})
this.graph.addEdge({
source: {cell: edgeTop},
target: {cell: alignCenterDashedBox, port: 'top1'},
- router: {name: 'manhattan'},
+ router: {
+ name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
+ },
connector: {name: 'rounded'},
})
this.graph.addEdge({
source: {cell: alignCenterDashedBox, port: 'bottom1'},
target: {cell: edgeBottom},
- router: {name: 'manhattan'},
+ router: {
+ name: 'manhattan',
+ args: {
+ startDirections: ['top','bottom'], // 浠庝笅鏂瑰紑濮�
+ endDirections: ['left'], // 鍚戝乏鏂圭粨鏉�
+ },
+ },
connector: {name: 'rounded'},
})
dragNode.remove()
diff --git a/web/src/views/modules/taskReliability/ReliabilityAssess.vue b/web/src/views/modules/taskReliability/ReliabilityAssess.vue
index 743b946..2f5dada 100644
--- a/web/src/views/modules/taskReliability/ReliabilityAssess.vue
+++ b/web/src/views/modules/taskReliability/ReliabilityAssess.vue
@@ -108,6 +108,7 @@
onTaskSelected(data) {
console.log(data, ' onProductSelected(data)')
this.dataForm.taskId = data.id
+ this.page()
},
onAssessDataSelected(data) {
this.dataForm.itemId = data.id
diff --git a/web/src/views/pages/login.vue b/web/src/views/pages/login.vue
index 0fbb7a0..ebbfdf1 100644
--- a/web/src/views/pages/login.vue
+++ b/web/src/views/pages/login.vue
@@ -51,7 +51,7 @@
</el-button>
</el-form-item>-->
<el-form-item class="login-form-margin">
- <el-button class="btn" style="margin-bottom:0;width: 100%" type="primary" @click="formSubmit()">{{
+ <el-button style="margin-bottom:0;width: 100%" type="primary" @click="formSubmit()">{{
$t('login.clickTitle') }}
</el-button>
</el-form-item>
@@ -238,15 +238,13 @@
</script>
<style>
.login__h2 {
- margin: 0;
- width: 600px;
- position: absolute;
- left: -11%;
- top: -10%;
- letter-spacing: 35px;
+ margin: 0 0 20px 5px;
+ text-align: center;
+ letter-spacing: 15px;
color: #fff;
- font-size: 1.5rem;
- font-weight: 400;
+ font-size: 2rem;
+ font-weight: bold;
+ font-family: 'Microsoft YaHei', Arial, sans-serif;
}
.clear {
@@ -266,15 +264,15 @@
.login-content {
position: absolute;
- border-radius: 20px;
top:50%;
left:50%;
transform: translate(-50%,-50%);
width: 25%;
- background:#ecf0f3;
box-shadow: 0 3px 6px 0 rgb(72 119 232 / 14%);
//border: 15px solid transparent;
//border-image: url(../../assets/img/page-border.png) 20 stretch;
+ display: flex;
+ flex-direction: column;
}
.login-h6 {
@@ -285,6 +283,8 @@
}
.login-body {
position: relative;
+ background:#ecf0f3;
+ border-radius: 20px;
}
.login-body .el-input{
border-radius: 3px;
@@ -302,22 +302,22 @@
-20px -20px 30px rgba(255,255,255,1);
transition: all 0.4s ease-out;
}
- .login-body .el-input:hover{
- box-shadow:
- 0 0 0 rgba(0,0,0,0.2),
- 0 0 0 rgba(255,255,255,0.8),
- inset 10px 10px 20px rgba(0,0,0,0.1),
- inset -10px -10px 20px rgba(255,255,255,1);
- }
+ /*.login-body .el-input:hover{*/
+ /* box-shadow:*/
+ /* 0 0 0 rgba(0,0,0,0.2),*/
+ /* 0 0 0 rgba(255,255,255,0.8),*/
+ /* inset 10px 10px 20px rgba(0,0,0,0.1),*/
+ /* inset -10px -10px 20px rgba(255,255,255,1);*/
+ /*}*/
.login-body .el-input__inner{
font-size: 18px;
height: inherit;
transition: all 0.4s ease-out;
border: none; /* 绉婚櫎榛樿鐨勮竟妗嗘牱寮� */
}
- .login-body .el-input__inner:hover{
- font-size: 16px;
- }
+ /*.login-body .el-input__inner:hover{*/
+ /* font-size: 16px;*/
+ /*}*/
.login-form-margin .btn{
border: none !important;
@@ -325,13 +325,13 @@
-20px -20px 30px rgba(255,255,255,1);
transition: all 0.4s ease-out;
}
- .login-form-margin .btn:hover{
- box-shadow:
- 0 0 0 rgba(0,0,0,0.2),
- 0 0 0 rgba(255,255,255,0.8),
- inset 10px 10px 20px rgba(0,0,0,0.1),
- inset -10px -10px 20px rgba(255,255,255,1);
- }
+ /*.login-form-margin .btn:hover{*/
+ /* box-shadow:*/
+ /* 0 0 0 rgba(0,0,0,0.2),*/
+ /* 0 0 0 rgba(255,255,255,0.8),*/
+ /* inset 10px 10px 20px rgba(0,0,0,0.1),*/
+ /* inset -10px -10px 20px rgba(255,255,255,1);*/
+ /*}*/
input:-webkit-autofill ,
textarea:-webkit-autofill,
select:-webkit-autofill{
@@ -376,9 +376,9 @@
font-size: 80px;
}
- .aui-page__login__border.el-button--primary:hover,
- .aui-page__login__border.el-button--primary:focus {
- color: rgba(0, 153, 255, 1)
- }
+ /*.aui-page__login__border.el-button--primary:hover,*/
+ /*.aui-page__login__border.el-button--primary:focus {*/
+ /* color: rgba(0, 153, 255, 1)*/
+ /*}*/
</style>
--
Gitblit v1.9.1