From 3ecb68c427a627ad8e90d8c555655e7724be2d96 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 06 九月 2024 11:06:12 +0800
Subject: [PATCH] 修改
---
web/src/router.js | 7
web/src/views/modules/taskReliability/RelisbilityAssess-AddOrUpdate.vue | 2
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/dao/TestSchemeDao.java | 1
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dto/StatisticsDto.java | 15 +
web/src/views/modules/taskReliability/ReliabilityAssess.vue | 6
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/service/TestSchemeService.java | 5
web/src/views/modules/taskReliability/PlanMake.vue | 29 +-
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java | 2
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/TaskReliabData.java | 17 ++
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/StatisticsController.java | 23 ++
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/model/TestScheme.java | 7
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/BaseReliabData.java | 17 ++
/dev/null | 73 ---------
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java | 4
modules/mainPart/src/main/resources/mapper/basicInfo/StatisticsDao.xml | 46 +++++
web/src/views/modules/taskReliability/ModelRbd-AddOrUpdate.vue | 7
modules/mainPart/src/main/resources/mapper/TestScheme/TestSchemeDao.xml | 6
web/src/views/modules/taskReliability/ModelRbd.vue | 4
web/src/views/modules/home.vue | 106 +++++++++++++
zt/core/src/main/java/com/zt/security/controller/LoginController.java | 4
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/AssessResult.java | 17 ++
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/StatisticsService.java | 27 +++
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/StatisticsDao.java | 21 ++
23 files changed, 334 insertions(+), 112 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/dao/TestSchemeDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/dao/TestSchemeDao.java
index 5a2b9e1..761ab21 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/dao/TestSchemeDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/dao/TestSchemeDao.java
@@ -20,4 +20,5 @@
List<TestScheme> getList();
+ void insertNum();
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/model/TestScheme.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/model/TestScheme.java
index 9340874..0303cec 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/model/TestScheme.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/model/TestScheme.java
@@ -23,12 +23,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
- private Integer pc;
+ private Integer num;
- @ApiModelProperty(value = "")
- private BigDecimal pa;
-
- @ApiModelProperty(value = "")
- private Double value;
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/service/TestSchemeService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/service/TestSchemeService.java
index 3c1ce06..abac0ea 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/service/TestSchemeService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/TestScheme/service/TestSchemeService.java
@@ -49,6 +49,7 @@
}
public List<ResultDto> getResult(ConditionDto dto) {
+ this.insertNum();
List<ResultDto> result = new ArrayList<>();
switch (dto.getTjlx()) {
case "鎸夐闄╁悕涔夊�兼煡璇�":
@@ -64,6 +65,10 @@
return result;
}
+ private void insertNum() {
+ baseDao.insertNum();
+ }
+
private List<ResultDto> getCondition1(ConditionDto dto) {
List<ResultDto> result = new ArrayList<>();
int C = 1;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/StatisticsController.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/StatisticsController.java
new file mode 100644
index 0000000..e171926
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/StatisticsController.java
@@ -0,0 +1,23 @@
+package com.zt.life.modules.mainPart.basicInfo.controller;
+
+
+import com.zt.common.servlet.Result;
+import com.zt.life.modules.mainPart.basicInfo.dto.StatisticsDto;
+import com.zt.life.modules.mainPart.basicInfo.service.StatisticsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+
+@RestController
+@RequestMapping("/basicInfo/Statistics/")
+public class StatisticsController {
+ @Autowired
+ StatisticsService statisticsService;
+
+ @GetMapping("getStatisticsInfo")
+ public Result<StatisticsDto> getStatisticsInfo() {
+ StatisticsDto data = statisticsService.getStatisticsInfo();
+ return Result.ok(data);
+ }
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/StatisticsDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/StatisticsDao.java
new file mode 100644
index 0000000..05e1d29
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dao/StatisticsDao.java
@@ -0,0 +1,21 @@
+package com.zt.life.modules.mainPart.basicInfo.dao;
+
+import com.zt.common.dao.BaseDao;
+import com.zt.life.modules.mainPart.basicInfo.model.BaseReliabData;
+import com.zt.life.modules.mainPart.basicInfo.model.TaskReliabData;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+
+@Mapper
+public interface StatisticsDao extends BaseDao<TaskReliabData> {
+
+ List<TaskReliabData> getTaskReliabList();
+
+ List<BaseReliabData> getBaseReliabList();
+
+ Integer getPlanMakeNum();
+
+ Integer getLoginNum();
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dto/StatisticsDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dto/StatisticsDto.java
new file mode 100644
index 0000000..285d61f
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/dto/StatisticsDto.java
@@ -0,0 +1,15 @@
+package com.zt.life.modules.mainPart.basicInfo.dto;
+
+import com.zt.life.modules.mainPart.basicInfo.model.BaseReliabData;
+import com.zt.life.modules.mainPart.basicInfo.model.TaskReliabData;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class StatisticsDto {
+ private List<BaseReliabData> baseReliabList;
+ private List<TaskReliabData> taskReliabList;
+ private Integer planMakeNum;
+ private Integer loginNum;
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/BaseReliabData.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/BaseReliabData.java
new file mode 100644
index 0000000..1c4408d
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/BaseReliabData.java
@@ -0,0 +1,17 @@
+package com.zt.life.modules.mainPart.basicInfo.model;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class BaseReliabData {
+ private String name;
+ private String xtNum;
+ private String sbNum;
+ private Double mtbf;
+ private Double mttr;
+ private Double availability;
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/TaskReliabData.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/TaskReliabData.java
new file mode 100644
index 0000000..16e9c8d
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/TaskReliabData.java
@@ -0,0 +1,17 @@
+package com.zt.life.modules.mainPart.basicInfo.model;
+
+import com.zt.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class TaskReliabData extends BaseEntity {
+ private String name;
+ private Integer taskNum;
+ private Integer operatConNum;
+ private Integer modelNum;
+ private Integer simulatNum;
+ private Integer testData;
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/StatisticsService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/StatisticsService.java
new file mode 100644
index 0000000..58c937c
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/service/StatisticsService.java
@@ -0,0 +1,27 @@
+package com.zt.life.modules.mainPart.basicInfo.service;
+
+import com.zt.common.service.BaseService;
+import com.zt.life.modules.mainPart.basicInfo.dao.StatisticsDao;
+import com.zt.life.modules.mainPart.basicInfo.dto.StatisticsDto;
+import com.zt.life.modules.mainPart.basicInfo.model.BaseReliabData;
+import com.zt.life.modules.mainPart.basicInfo.model.TaskReliabData;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class StatisticsService extends BaseService<StatisticsDao, TaskReliabData> {
+
+ public StatisticsDto getStatisticsInfo() {
+ StatisticsDto dto =new StatisticsDto();
+ List<TaskReliabData> taskReliabDataList = baseDao.getTaskReliabList();
+ List<BaseReliabData> baseDaoTaskReliabList = baseDao.getBaseReliabList();
+ Integer planMakeNum = baseDao.getPlanMakeNum();
+ Integer loginNum = baseDao.getLoginNum();
+ dto.setBaseReliabList(baseDaoTaskReliabList);
+ dto.setTaskReliabList(taskReliabDataList);
+ dto.setPlanMakeNum(planMakeNum);
+ dto.setLoginNum(loginNum);
+ return dto;
+ }
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/AssessResult.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/AssessResult.java
new file mode 100644
index 0000000..4781e04
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/AssessResult.java
@@ -0,0 +1,17 @@
+package com.zt.life.modules.mainPart.taskReliability.model;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zt.common.entity.BusiEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class AssessResult extends BusiEntity {
+ private Long id;
+ private Long taskId;
+ private Long productId;
+ private Long itemId;
+ private Double confidence;
+}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java
index 0d68d40..2f17f4f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/ModelRbd.java
@@ -23,7 +23,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "")
- private Long pid;
+ private Long shipId;
@ApiModelProperty(value = "")
private String modelTag;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java
index 9d3531b..cd85f41 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/service/ReliabilityAssessService.java
@@ -91,8 +91,8 @@
String name = ImportUtil.getCellValue(row, 1, pattern); //鑺傜偣鍚嶇О
String type = ImportUtil.getCellValue(row, 2, pattern);//鑺傜偣绫诲瀷
- String runTime = ImportUtil.getCellValue(row, 3, pattern); //杩愯鏃堕暱
- String runNum = ImportUtil.getCellValue(row, 4, pattern); //杩愯娆℃暟
+ String runNum = ImportUtil.getCellValue(row, 3, pattern); //杩愯鏃堕暱
+ String runTime = ImportUtil.getCellValue(row, 4, pattern); //杩愯娆℃暟
String failNum = ImportUtil.getCellValue(row, 5, pattern); //澶辫触娆℃暟
if (StringUtils.isBlank(name) || StringUtils.isBlank(type))
diff --git a/modules/mainPart/src/main/resources/mapper/TestScheme/TestSchemeDao.xml b/modules/mainPart/src/main/resources/mapper/TestScheme/TestSchemeDao.xml
index cdf4c6e..f9df11e 100644
--- a/modules/mainPart/src/main/resources/mapper/TestScheme/TestSchemeDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/TestScheme/TestSchemeDao.xml
@@ -2,6 +2,12 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zt.life.modules.mainPart.TestScheme.dao.TestSchemeDao">
+ <update id="insertNum">
+ update test_scheme
+ set num = num + 1
+ where is_delete = 0
+ and id = 10000
+ </update>
<select id="getList" resultType="com.zt.life.modules.mainPart.TestScheme.model.TestScheme">
select a.*
diff --git a/modules/mainPart/src/main/resources/mapper/basicInfo/StatisticsDao.xml b/modules/mainPart/src/main/resources/mapper/basicInfo/StatisticsDao.xml
new file mode 100644
index 0000000..a4b941f
--- /dev/null
+++ b/modules/mainPart/src/main/resources/mapper/basicInfo/StatisticsDao.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.zt.life.modules.mainPart.basicInfo.dao.StatisticsDao">
+
+ <select id="getTaskReliabList" resultType="com.zt.life.modules.mainPart.basicInfo.model.TaskReliabData">
+ SELECT
+ a.name,
+ count(distinct b.id) AS taskNum,
+ count(distinct c.id) AS operatConNum,
+ count(distinct d.id) AS modelNum,
+ count(distinct e.id) AS simulatNum,
+ count(distinct f.id) AS testData
+ FROM product_model a
+ left join task b on b.product_id = a.id and b.IS_DELETE=0
+ left join operat_condit c on c.product_id = a.id and c.IS_DELETE=0
+ left join model_rbd d on d.ship_id = a.id and d.IS_DELETE=0
+ left join simulat_assess e on e.product_id = a.id and e.IS_DELETE=0
+ left join assess_item f on f.product_id = a.id and f.IS_DELETE=0
+ where a.product_type = 2 and a.IS_DELETE =0
+ group by a.id,a.name
+ order by a.name
+ </select>
+ <select id="getBaseReliabList" resultType="com.zt.life.modules.mainPart.basicInfo.model.BaseReliabData">
+ SELECT
+ a.name,
+ count(distinct b.id) AS xtNum,
+ count(distinct c.id) AS sbNum,
+ d.basic_mtbf_regulate AS mtbf,
+ d.repair_mttcr AS mttr,
+ d.ai AS availability
+ FROM product_model a
+ left join (SELECT id,ship_id FROM product_model WHERE product_type=3 and IS_DELETE=0) b on b.ship_id = a.id
+ left join (SELECT id,ship_id FROM product_model WHERE product_type=5 and IS_DELETE=0) c on c.ship_id = a.id
+ left join param_data d on d.product_id = a.id and d.is_delete =0
+ where a.product_type = 2 and a.IS_DELETE =0
+ group by a.id,a.name
+ order by a.name
+ </select>
+ <select id="getPlanMakeNum" resultType="java.lang.Integer">
+ SELECT num FROM `test_scheme` WHERE id = 10000
+ </select>
+ <select id="getLoginNum" resultType="java.lang.Integer">
+ SELECT count(*) FROM sys_log_login WHERE operation = 0 and status = 1
+ </select>
+</mapper>
diff --git a/web/src/router.js b/web/src/router.js
index f2d2e63..f6e76aa 100644
--- a/web/src/router.js
+++ b/web/src/router.js
@@ -53,14 +53,9 @@
// name: 'SYS_MENU',
// meta: {title: '鑿滃崟绠＄悊', isTab: true}
// },
- {path: '/home',
- component: () => import('./views/modules/sys/task/taskCenter'),
- name: 'home',
- meta: {title: '棣栭〉', isTab: true}
- },
{
path: '/home',
- component: () => import('./views/modules/home2'),
+ component: () => import('./views/modules/home'),
name: 'home',
meta: {title: '棣栭〉',isRefresh: 1, isTab: true}
},
diff --git a/web/src/views/modules/home.vue b/web/src/views/modules/home.vue
new file mode 100644
index 0000000..9a5027f
--- /dev/null
+++ b/web/src/views/modules/home.vue
@@ -0,0 +1,106 @@
+<template>
+ <div class="fa-card-b">
+ <span class="size">绯荤粺鐧诲綍娆℃暟:{{dataForm.loginNum}}</span>
+ <span class="size">璇曢獙鏂规鍒跺畾娆℃暟:{{dataForm.planMakeNum}}</span>
+ <el-table ref="taskTable" class="DataTable" :data="dataForm.taskReliabList" height="330px" border>
+ <el-table-column label="浠诲姟鍙潬鎬ф暟鎹�" align="center">
+ <el-table-column align="center" prop="name" label="鍚嶇О">
+ </el-table-column>
+ <el-table-column align="center" prop="taskNum" label="浠诲姟">
+ </el-table-column>
+ <el-table-column align="center" prop="operatConNum" label="鎬讳綋宸ュ喌">
+ </el-table-column>
+ <el-table-column align="center" prop="modelNum" label="妯″瀷">
+ </el-table-column>
+ <el-table-column align="center" prop="simulatNum" label="浠跨湡璇勪及(娆�)">
+ </el-table-column>
+ <el-table-column align="center" prop="testData" label="璇曢獙鏁版嵁(濂�)">
+ </el-table-column>
+ <el-table-column align="center" prop="assessNum" label="璇勫畾娆℃暟">
+ </el-table-column>
+ </el-table-column>
+ </el-table>
+
+ <el-table ref="baseTable" class="DataTable" height="230px" :data="dataForm.baseReliabList" border
+ v-adaptive="{bottomOffset:30}">
+ <el-table-column label="鍩烘湰鍙潬鎬ф暟鎹�" align="center">
+ <el-table-column align="center" prop="name" label="鍚嶇О">
+ </el-table-column>
+ <el-table-column align="center" prop="xtNum" label="绯荤粺">
+ </el-table-column>
+ <el-table-column align="center" prop="sbNum" label="璁惧">
+ </el-table-column>
+ <el-table-column align="center" prop="mtbf" label="MTBF">
+ <template slot-scope="scope">
+ <span>{{keepNumber(scope.row.mtbf) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="mttr" label="MTTR">
+ <template slot-scope="scope">
+ <span>{{keepNumber(scope.row.mttr) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" prop="availability" label="鍙敤搴�">
+ <template slot-scope="scope">
+ <span>{{keepNumber(scope.row.availability) }}</span>
+ </template>
+ </el-table-column>
+ </el-table-column>
+ </el-table>
+ </div>
+</template>
+
+<script>
+
+ export default {
+ data() {
+ return {
+ dataForm: {
+ taskReliabList: [],
+ baseReliabList: [],
+ loginNum: '',
+ planMakeNum: ''
+ }
+ }
+ },
+ components: {},
+ mounted() {
+ this.init()
+ },
+ computed: {
+ keepNumber() { //杩囨护鍣ㄤ繚鐣�4涓哄皬鏁�
+ return function (val) { // 瀵硅绠楀睘鎬ц繘琛屼紶鍙�
+ const numM = Number(val).toFixed(5);
+ return numM.substring(0, numM.length - 1);
+ }
+ },
+ },
+ methods: {
+ init() {
+ this.getInfo2()
+ },
+ async getInfo2() {
+ let res = await this.$http.get('/basicInfo/Statistics/getStatisticsInfo')
+ this.dataForm = {
+ ...this.dataForm,
+ ...res.data
+ }
+ },
+ }
+ }
+</script>
+<style>
+ .el-table .select-row {
+ background: rgba(23, 179, 163, 0.2) !important;
+ }
+
+ .DataTable.el-table thead.is-group th {
+ background: #edf6ff;
+ }
+
+ .size{
+ font-size: 20px;
+ margin: 10px;
+ color: #0aa0bf;
+ }
+</style>
diff --git a/web/src/views/modules/home2.vue b/web/src/views/modules/home2.vue
deleted file mode 100644
index fff0811..0000000
--- a/web/src/views/modules/home2.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-<template>
- <div class="fa-card-a" shadow="never">
- <div class="mod-sys__menu">
- <zt-table-wraper v-slot="{ table }" v-bind:paging='false'>
- <el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
- <el-form-item>
- <zt-button style="margin-left: 30px" type="add" @click="open"/>
- </el-form-item>
- </el-form>
- <el-table
- :data="tableData"
- style="width: 100%">
- <el-table-column
- prop="date"
- label="鏃ユ湡"
- width="180">
- </el-table-column>
- <el-table-column
- prop="name"
- label="濮撳悕"
- width="180">
- </el-table-column>
- <el-table-column
- prop="address"
- label="鍦板潃">
- </el-table-column>
- </el-table>
- <!-- 寮圭獥, 鏂板 / 淇敼 -->
- <HomeAdd ref="homeAdd" @refreshDataList="table.query"/>
- </zt-table-wraper>
- </div>
- </div>
-</template>
-
-<script>
-import HomeAdd from './home-add'
-export default {
- name: "home",
- data(){
- return {
- tableData: [{
- date: '2016-05-02',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�'
- }, {
- date: '2016-05-04',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�'
- }, {
- date: '2016-05-01',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�'
- }, {
- date: '2016-05-03',
- name: '鐜嬪皬铏�',
- address: '涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�'
- }]
- }
- },
- components: {
- HomeAdd
- },
- methods:{
- open(){
- this.$refs.homeAdd.$refs.dialog.init()
- }
- },
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/web/src/views/modules/taskReliability/ModelRbd-AddOrUpdate.vue b/web/src/views/modules/taskReliability/ModelRbd-AddOrUpdate.vue
index 5bede61..268fc28 100644
--- a/web/src/views/modules/taskReliability/ModelRbd-AddOrUpdate.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd-AddOrUpdate.vue
@@ -20,7 +20,7 @@
return {
dataForm: {
id: '',
- pid: '',
+ shipId: '',
modelId: '',
modelName: '',
productId: '',
@@ -30,8 +30,9 @@
}
},
methods: {
- init(id, productId) {
- this.dataForm.productId = productId
+ init(id, params) {
+ this.dataForm.productId = params.productId
+ this.dataForm.shipId = params.shipId
},
// 鑾峰彇淇℃伅
async getInfo() {
diff --git a/web/src/views/modules/taskReliability/ModelRbd.vue b/web/src/views/modules/taskReliability/ModelRbd.vue
index 63f7d68..f9cee46 100644
--- a/web/src/views/modules/taskReliability/ModelRbd.vue
+++ b/web/src/views/modules/taskReliability/ModelRbd.vue
@@ -69,6 +69,7 @@
modelState:'',
productId: '',
modelTag: '',
+ shipId: '',
}
}
},
@@ -82,10 +83,11 @@
},
methods: {
add() {
- this.$refs.AddOrUpdate.$refs.dialog.init(null, this.dataForm.productId)
+ this.$refs.AddOrUpdate.$refs.dialog.init(null, {productId:this.dataForm.productId,shipId:this.dataForm.shipId})
},
onProductSelected(data) {
this.dataForm.productId = data.id
+ this.dataForm.shipId = data.shipId
console.log(data, 'onProductSelected(data)')
this.$refs.tableObj.query()
},
diff --git a/web/src/views/modules/taskReliability/PlanMake.vue b/web/src/views/modules/taskReliability/PlanMake.vue
index 5a0e77c..b1ac542 100644
--- a/web/src/views/modules/taskReliability/PlanMake.vue
+++ b/web/src/views/modules/taskReliability/PlanMake.vue
@@ -135,36 +135,37 @@
methods: {
async check(row) {
let flag = true;
- if (row.specifiedValue < row.minAccepValue && row.specifiedValue) {
- this.$tip.alert("鏈�浣庡彲鎺ュ彈鍊间笉鑳藉ぇ浜庤瀹氬��")
- flag =false
+ console.log(row)
+ if (parseInt(row.specifiedValue) && parseInt(row.specifiedValue) < row.minAccepValue) {
+ this.$tip.alert("妫�楠屼笅闄愪笉鑳藉ぇ浜庢楠屼笂闄�")
+ flag = false
}
- if (row.tjlx === "鎸夐闄╁悕涔夊�兼煡璇�"){
- if (!row.specifiedValue ||!row.minAccepValue || !row.productionRisk||!row.userRisk) {
+ if (row.tjlx === "鎸夐闄╁悕涔夊�兼煡璇�") {
+ if (!row.specifiedValue || !row.minAccepValue || !row.productionRisk || !row.userRisk) {
this.$tip.alert("鏈夋湭濉啓鐨勫��")
- flag =false
+ flag = false
}
}
- if (row.tjlx === "涓嶉檺瀹氱敓浜ф柟椋庨櫓鏌ヨ"){
- if (!row.specifiedValue ||!row.minAccepValue || !row.showFailureTime||!row.userRisk) {
+ if (row.tjlx === "涓嶉檺瀹氱敓浜ф柟椋庨櫓鏌ヨ") {
+ if (!row.specifiedValue || !row.minAccepValue || !row.showFailureTime || !row.userRisk) {
this.$tip.alert("鏈夋湭濉啓鐨勫��")
- flag =false
+ flag = false
}
}
- if (row.tjlx === "涓嶉檺瀹氳瀹氬�兼煡璇�"){
- if (!row.showFailureTime ||!row.minAccepValue || !row.productionRisk||!row.userRisk) {
+ if (row.tjlx === "涓嶉檺瀹氳瀹氬�兼煡璇�") {
+ if (!row.showFailureTime || !row.minAccepValue || !row.productionRisk || !row.userRisk) {
this.$tip.alert("鏈夋湭濉啓鐨勫��")
- flag =false
+ flag = false
}
}
- if (!flag){
+ if (!flag) {
return
}
let res = await this.$http.get(`/TestScheme/TestScheme/condition`, {params: row})
this.dataList = res.data
if (row.tjlx === "涓嶉檺瀹氳瀹氬�兼煡璇�") {
this.isShow = true
- }else{
+ } else {
this.isShow = false
}
}
diff --git a/web/src/views/modules/taskReliability/ReliabilityAssess.vue b/web/src/views/modules/taskReliability/ReliabilityAssess.vue
index fc41f1a..88ee6f9 100644
--- a/web/src/views/modules/taskReliability/ReliabilityAssess.vue
+++ b/web/src/views/modules/taskReliability/ReliabilityAssess.vue
@@ -16,7 +16,7 @@
<zt-form-item label="缃俊搴�" prop="confidence">
<el-input v-model="dataForm.confidence" placeholder="缃俊搴�" clearable></el-input>
</zt-form-item>
- <el-button type="primary">璇勫畾</el-button>
+ <el-button type="primary" @click="">璇勫畾</el-button>
<el-button type="primary" @click="add()">鏂板璇勫畾鏁版嵁</el-button>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}"
@@ -25,9 +25,9 @@
:header-cell-style="{'text-align':'center'}"
border @selection-change="table.selectionChangeHandle">
<el-table-column prop="name" label="鍚嶇О"/>
- <el-table-column prop="runTimes" label="杩愯鏃堕暱" align="right">
+ <el-table-column prop="runNum" label="璇曢獙娆℃暟(鎴愯触鍨�)" align="right">
</el-table-column>
- <el-table-column prop="runNum" label="杩愯娆℃暟" align="right">
+ <el-table-column prop="runTimes" label="璇曢獙鏃堕暱(闈炴垚璐ュ瀷)" align="right">
</el-table-column>
<el-table-column prop="failNum" label="澶辫触娆℃暟" align="right">
</el-table-column>
diff --git a/web/src/views/modules/taskReliability/RelisbilityAssess-AddOrUpdate.vue b/web/src/views/modules/taskReliability/RelisbilityAssess-AddOrUpdate.vue
index fd6debc..95031dc 100644
--- a/web/src/views/modules/taskReliability/RelisbilityAssess-AddOrUpdate.vue
+++ b/web/src/views/modules/taskReliability/RelisbilityAssess-AddOrUpdate.vue
@@ -4,7 +4,7 @@
<zt-form-item label="鎬讳綋" prop="shipName">
<el-input v-model="dataForm.shipName"></el-input>
</zt-form-item>
- <zt-form-item label="鍚嶇О" prop="name" rules="required">
+ <zt-form-item label="璇勫畾鏁版嵁鍚嶇О" prop="name" rules="required">
<el-input v-model="dataForm.name"></el-input>
</zt-form-item>
<zt-form-item style="width:100%;" label="">
diff --git a/zt/core/src/main/java/com/zt/security/controller/LoginController.java b/zt/core/src/main/java/com/zt/security/controller/LoginController.java
index 34128f0..a662590 100644
--- a/zt/core/src/main/java/com/zt/security/controller/LoginController.java
+++ b/zt/core/src/main/java/com/zt/security/controller/LoginController.java
@@ -294,12 +294,12 @@
//
// throw new RenException(ErrorCode.ACCOUNT_DISABLE);
// }
-/* sysUserService.updateLogin(user.getId(), 0, 0, null);//淇敼鐢ㄦ埛
+// sysUserService.updateLogin(user.getId(), 0, 0, null);//淇敼鐢ㄦ埛
// 鐧诲綍鎴愬姛
log.setStatus(LoginStatusEnum.SUCCESS.value());
log.setCreator(user.getId());
log.setCreatorName(user.getUsername());
- sysLogLoginService.insert(log);*/
+ sysLogLoginService.insert(log);
sysUserTokenService.logout(user.getId());
Result a = sysUserTokenService.createToken(user.getId(),login.getSystemMarker(),login.getToken());
--
Gitblit v1.9.1