修改

jinlin

2024-09-14 e5fe34356d67c3474a0181f9c922cb16b9260596

修改

 web/packages/assets/img/fz_login-bg.png

 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);

 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 = '单位简称'

 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()

 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

 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>