Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/api/mes/eqp/equipmentManagement.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备管理（合并在役和退役设备）列表
+export function listEquipmentManagement(query) {
+  return request({
+    url: '/eqp/equipmentManagement/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备管理（合并在役和退役设备）详细
+export function getEquipmentManagement(equipmentId) {
+  return request({
+    url: '/eqp/equipmentManagement/' + equipmentId,
+    method: 'get'
+  })
+}
+
+// 新增设备管理（合并在役和退役设备）
+export function addEquipmentManagement(data) {
+  return request({
+    url: '/eqp/equipmentManagement',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备管理（合并在役和退役设备）
+export function updateEquipmentManagement(data) {
+  return request({
+    url: '/eqp/equipmentManagement',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备管理（合并在役和退役设备）
+export function delEquipmentManagement(equipmentId) {
+  return request({
+    url: '/eqp/equipmentManagement/' + equipmentId,
+    method: 'delete'
+  })
+}

klp-ui/src/api/mes/eqp/equipmentParam.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备参数列表
+export function listEquipmentParam(query) {
+  return request({
+    url: '/eqp/equipmentParam/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备参数详细
+export function getEquipmentParam(paramId) {
+  return request({
+    url: '/eqp/equipmentParam/' + paramId,
+    method: 'get'
+  })
+}
+
+// 新增设备参数
+export function addEquipmentParam(data) {
+  return request({
+    url: '/eqp/equipmentParam',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备参数
+export function updateEquipmentParam(data) {
+  return request({
+    url: '/eqp/equipmentParam',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备参数
+export function delEquipmentParam(paramId) {
+  return request({
+    url: '/eqp/equipmentParam/' + paramId,
+    method: 'delete'
+  })
+}

klp-ui/src/api/mes/eqp/equipmentType.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备类型列表
+export function listEquipmentType(query) {
+  return request({
+    url: '/eqp/equipmentType/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备类型详细
+export function getEquipmentType(typeId) {
+  return request({
+    url: '/eqp/equipmentType/' + typeId,
+    method: 'get'
+  })
+}
+
+// 新增设备类型
+export function addEquipmentType(data) {
+  return request({
+    url: '/eqp/equipmentType',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备类型
+export function updateEquipmentType(data) {
+  return request({
+    url: '/eqp/equipmentType',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备类型
+export function delEquipmentType(typeId) {
+  return request({
+    url: '/eqp/equipmentType/' + typeId,
+    method: 'delete'
+  })
+}

klp-ui/src/api/mes/eqp/inspectedEquipment.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询待检设备列表
+export function listInspectedEquipment(query) {
+  return request({
+    url: '/eqp/inspectedEquipment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询待检设备详细
+export function getInspectedEquipment(inspectId) {
+  return request({
+    url: '/eqp/inspectedEquipment/' + inspectId,
+    method: 'get'
+  })
+}
+
+// 新增待检设备
+export function addInspectedEquipment(data) {
+  return request({
+    url: '/eqp/inspectedEquipment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改待检设备
+export function updateInspectedEquipment(data) {
+  return request({
+    url: '/eqp/inspectedEquipment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除待检设备
+export function delInspectedEquipment(inspectId) {
+  return request({
+    url: '/eqp/inspectedEquipment/' + inspectId,
+    method: 'delete'
+  })
+}

klp-ui/src/api/mes/eqp/inspectionRecord.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询检修记录列表
+export function listInspectionRecord(query) {
+  return request({
+    url: '/eqp/inspectionRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询检修记录详细
+export function getInspectionRecord(recordId) {
+  return request({
+    url: '/eqp/inspectionRecord/' + recordId,
+    method: 'get'
+  })
+}
+
+// 新增检修记录
+export function addInspectionRecord(data) {
+  return request({
+    url: '/eqp/inspectionRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改检修记录
+export function updateInspectionRecord(data) {
+  return request({
+    url: '/eqp/inspectionRecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除检修记录
+export function delInspectionRecord(recordId) {
+  return request({
+    url: '/eqp/inspectionRecord/' + recordId,
+    method: 'delete'
+  })
+}

klp-ui/src/api/mes/eqp/sparePart.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询备品备件列表
+export function listSparePart(query) {
+  return request({
+    url: '/eqp/sparePart/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询备品备件详细
+export function getSparePart(partId) {
+  return request({
+    url: '/eqp/sparePart/' + partId,
+    method: 'get'
+  })
+}
+
+// 新增备品备件
+export function addSparePart(data) {
+  return request({
+    url: '/eqp/sparePart',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改备品备件
+export function updateSparePart(data) {
+  return request({
+    url: '/eqp/sparePart',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除备品备件
+export function delSparePart(partId) {
+  return request({
+    url: '/eqp/sparePart/' + partId,
+    method: 'delete'
+  })
+}

klp-ui/src/api/mes/eqp/sparePartsChange.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询备品备件变动记录列表
+export function listSparePartsChange(query) {
+  return request({
+    url: '/eqp/sparePartsChange/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询备品备件变动记录详细
+export function getSparePartsChange(changeId) {
+  return request({
+    url: '/eqp/sparePartsChange/' + changeId,
+    method: 'get'
+  })
+}
+
+// 新增备品备件变动记录
+export function addSparePartsChange(data) {
+  return request({
+    url: '/eqp/sparePartsChange',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改备品备件变动记录
+export function updateSparePartsChange(data) {
+  return request({
+    url: '/eqp/sparePartsChange',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除备品备件变动记录
+export function delSparePartsChange(changeId) {
+  return request({
+    url: '/eqp/sparePartsChange/' + changeId,
+    method: 'delete'
+  })
+}

klp-ui/src/api/mes/eqp/typeParam.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询设备类型参数（某类设备的通用参数标准）列表
+export function listTypeParam(query) {
+  return request({
+    url: '/eqp/typeParam/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询设备类型参数（某类设备的通用参数标准）详细
+export function getTypeParam(typeParamId) {
+  return request({
+    url: '/eqp/typeParam/' + typeParamId,
+    method: 'get'
+  })
+}
+
+// 新增设备类型参数（某类设备的通用参数标准）
+export function addTypeParam(data) {
+  return request({
+    url: '/eqp/typeParam',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改设备类型参数（某类设备的通用参数标准）
+export function updateTypeParam(data) {
+  return request({
+    url: '/eqp/typeParam',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除设备类型参数（某类设备的通用参数标准）
+export function delTypeParam(typeParamId) {
+  return request({
+    url: '/eqp/typeParam/' + typeParamId,
+    method: 'delete'
+  })
+}

klp-ui/src/assets/styles/element-ui.scss

@@ -1556,8 +1556,8 @@ body {
   background: $--metal-gradient-light;
   border-color: $--border-color-light;
   color: $--color-text-regular;
-  padding: 2px 8px;
-  border-radius: 2px;
+  padding: 2px 4px;
+  border-radius: 4px;
   font-size: 12px;
   height: auto;
   margin-right: 0;
@@ -1573,7 +1573,7 @@ body {
   .cell & {
     margin-right: 0;
     padding: 1px !important;
-    border-radius: 0 !important;
+    border-radius: 4px !important;
   }
 }
 

klp-ui/src/views/mes/qc/history/index.vue

@@ -38,9 +38,12 @@
       <el-table-column label="机组" align="center" prop="unitGroup" />
       <el-table-column label="检验结果" align="center" prop="inspectionResult">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.inspectionResult === 1 ? 'success' : (scope.row.inspectionResult === 2 ? 'danger' : 'info')">
-            {{ scope.row.inspectionResult === 0 ? '未检验' : (scope.row.inspectionResult === 1 ? '合格' : (scope.row.inspectionResult === 2 ? '不合格' : '')) }}
-          </el-tag>
+           <span>
+              <span v-if="scope.row.inspectionResult == 0" style="color: grey;">未检验</span>
+              <span v-else-if="scope.row.inspectionResult == 1" style="color: #67C23A;">合格</span>
+              <span v-else-if="scope.row.inspectionResult == 2" style="color: #FF4949;">不合格</span>
+              <span v-else style="color: grey;">未知</span>
+            </span>
         </template>
       </el-table-column>
       <el-table-column label="检验类型" align="center" prop="inspectionType" />
@@ -96,14 +99,12 @@
           </el-table-column>
           <el-table-column label="状态" align="center">
             <template slot-scope="scope">
-              <el-tag
-                :type="scope.row.status == 1 ? 'success' : (scope.row.status == 2 ? 'danger' : 'info')"
-              >
-                <span v-if="scope.row.status == 0">未检测</span>
-                <span v-else-if="scope.row.status == 1">通过</span>
-                <span v-else-if="scope.row.status == 2">不通过</span>
-                <span v-else>未知</span>
-              </el-tag>
+              <span>
+                <span v-if="scope.row.status == 0" style="color: gray;">未检测</span>
+                <span v-else-if="scope.row.status == 1" style="color: #67C23A;">通过</span>
+                <span v-else-if="scope.row.status == 2" style="color: #FF4949;">不通过</span>
+                <span v-else style="color: gray;">未知</span>
+              </span>
             </template>
           </el-table-column>
         </KLPTable>

klp-ui/src/views/mes/qc/task/pages/auxiliary.vue

@@ -49,13 +49,12 @@
         <el-table-column label="规格型号" align="center" prop="verifyTarget.specificationModel" />
         <el-table-column label="检验结果" align="center">
           <template slot-scope="scope">
-            <el-tag
-              :type="scope.row.inspectionResult == 1 ? 'success' : (scope.row.inspectionResult == 2 ? 'danger' : 'info')">
-              <span v-if="scope.row.inspectionResult == 0">未检验</span>
-              <span v-else-if="scope.row.inspectionResult == 1">合格</span>
-              <span v-else-if="scope.row.inspectionResult == 2">不合格</span>
-              <span v-else>未知</span>
-            </el-tag>
+           <span>
+              <span v-if="scope.row.inspectionResult == 0" style="color: grey;">未检验</span>
+              <span v-else-if="scope.row.inspectionResult == 1" style="color: #67C23A;">合格</span>
+              <span v-else-if="scope.row.inspectionResult == 2" style="color: #FF4949;">不合格</span>
+              <span v-else style="color: grey;">未知</span>
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
@@ -103,19 +102,19 @@
           <el-table-column label="单位" align="center" prop="unit"></el-table-column>
           <el-table-column label="状态" align="center">
             <template slot-scope="scope">
-              <el-tag :type="scope.row.status == 1 ? 'success' : (scope.row.status == 2 ? 'danger' : 'info')">
-                <span v-if="scope.row.status == 0">未检测</span>
-                <span v-else-if="scope.row.status == 1">通过</span>
-                <span v-else-if="scope.row.status == 2">不通过</span>
-                <span v-else>未知</span>
-              </el-tag>
+              <span>
+                <span v-if="scope.row.status == 0" style="color: gray;">未检测</span>
+                <span v-else-if="scope.row.status == 1" style="color: #67C23A;">通过</span>
+                <span v-else-if="scope.row.status == 2" style="color: #FF4949;">不通过</span>
+                <span v-else style="color: gray;">未知</span>
+              </span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.status == 0" size="mini" type="success"
+              <el-button v-if="scope.row.status == 0" size="mini" type="text" style="color: #67C23A;"
                 @click="changeItemStatus(detailData.taskId, scope.row.itemId, 1)">通过</el-button>
-              <el-button v-if="scope.row.status == 0" size="mini" type="danger" style="margin-left: 8px;"
+              <el-button v-if="scope.row.status == 0" size="mini" type="text" style="margin-left: 8px; color: #FF4949;"
                 @click="changeItemStatus(detailData.taskId, scope.row.itemId, 2)">不通过</el-button>
             </template>
           </el-table-column>

klp-ui/src/views/mes/qc/task/pages/lab.vue

@@ -45,13 +45,12 @@
         <el-table-column label="机组" align="center" prop="unitGroup" />
         <el-table-column label="检验结果" align="center">
           <template slot-scope="scope">
-            <el-tag
-              :type="scope.row.inspectionResult == 1 ? 'success' : (scope.row.inspectionResult == 2 ? 'danger' : 'info')">
-              <span v-if="scope.row.inspectionResult == 0">未检验</span>
-              <span v-else-if="scope.row.inspectionResult == 1">合格</span>
-              <span v-else-if="scope.row.inspectionResult == 2">不合格</span>
-              <span v-else>未知</span>
-            </el-tag>
+            <span>
+              <span v-if="scope.row.inspectionResult == 0" style="color: grey;">未检验</span>
+              <span v-else-if="scope.row.inspectionResult == 1" style="color: #67C23A;">合格</span>
+              <span v-else-if="scope.row.inspectionResult == 2" style="color: #FF4949;">不合格</span>
+              <span v-else style="color: grey;">未知</span>
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
@@ -99,19 +98,19 @@
           <el-table-column label="单位" align="center" prop="unit"></el-table-column>
           <el-table-column label="状态" align="center">
             <template slot-scope="scope">
-              <el-tag :type="scope.row.status == 1 ? 'success' : (scope.row.status == 2 ? 'danger' : 'info')">
-                <span v-if="scope.row.status == 0">未检测</span>
-                <span v-else-if="scope.row.status == 1">通过</span>
-                <span v-else-if="scope.row.status == 2">不通过</span>
-                <span v-else>未知</span>
-              </el-tag>
+               <span>
+                <span v-if="scope.row.status == 0" style="color: gray;">未检测</span>
+                <span v-else-if="scope.row.status == 1" style="color: #67C23A;">通过</span>
+                <span v-else-if="scope.row.status == 2" style="color: #FF4949;">不通过</span>
+                <span v-else style="color: gray;">未知</span>
+              </span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.status == 0" size="mini" type="success"
+               <el-button v-if="scope.row.status == 0" size="mini" type="text" style="color: #67C23A;"
                 @click="changeItemStatus(detailData.taskId, scope.row.itemId, 1)">通过</el-button>
-              <el-button v-if="scope.row.status == 0" size="mini" type="danger" style="margin-left: 8px;"
+              <el-button v-if="scope.row.status == 0" size="mini" type="text" style="margin-left: 8px; color: #FF4949;"
                 @click="changeItemStatus(detailData.taskId, scope.row.itemId, 2)">不通过</el-button>
             </template>
           </el-table-column>

klp-ui/src/views/mes/qc/task/pages/raw.vue

@@ -51,13 +51,12 @@
         <el-table-column label="重量" align="center" prop="verifyTarget.weight" />
         <el-table-column label="检验结果" align="center">
           <template slot-scope="scope">
-            <el-tag
-              :type="scope.row.inspectionResult == 1 ? 'success' : (scope.row.inspectionResult == 2 ? 'danger' : 'info')">
-              <span v-if="scope.row.inspectionResult == 0">未检验</span>
-              <span v-else-if="scope.row.inspectionResult == 1">合格</span>
-              <span v-else-if="scope.row.inspectionResult == 2">不合格</span>
-              <span v-else>未知</span>
-            </el-tag>
+            <span>
+              <span v-if="scope.row.inspectionResult == 0" style="color: grey;">未检验</span>
+              <span v-else-if="scope.row.inspectionResult == 1" style="color: #67C23A;">合格</span>
+              <span v-else-if="scope.row.inspectionResult == 2" style="color: #FF4949;">不合格</span>
+              <span v-else style="color: grey;">未知</span>
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
@@ -105,19 +104,19 @@
           <el-table-column label="单位" align="center" prop="unit"></el-table-column>
           <el-table-column label="状态" align="center">
             <template slot-scope="scope">
-              <el-tag :type="scope.row.status == 1 ? 'success' : (scope.row.status == 2 ? 'danger' : 'info')">
-                <span v-if="scope.row.status == 0">未检测</span>
-                <span v-else-if="scope.row.status == 1">通过</span>
-                <span v-else-if="scope.row.status == 2">不通过</span>
-                <span v-else>未知</span>
-              </el-tag>
+              <span>
+                <span v-if="scope.row.status == 0" style="color: gray;">未检测</span>
+                <span v-else-if="scope.row.status == 1" style="color: #67C23A;">通过</span>
+                <span v-else-if="scope.row.status == 2" style="color: #FF4949;">不通过</span>
+                <span v-else style="color: gray;">未知</span>
+              </span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.status == 0" size="mini" type="success"
+               <el-button v-if="scope.row.status == 0" size="mini" type="text" style="color: #67C23A;"
                 @click="changeItemStatus(detailData.taskId, scope.row.itemId, 1)">通过</el-button>
-              <el-button v-if="scope.row.status == 0" size="mini" type="danger" style="margin-left: 8px;"
+              <el-button v-if="scope.row.status == 0" size="mini" type="text" style="margin-left: 8px; color: #FF4949;"
                 @click="changeItemStatus(detailData.taskId, scope.row.itemId, 2)">不通过</el-button>
             </template>
           </el-table-column>

klp-ui/src/views/mes/qc/task/pages/section.vue

@@ -45,13 +45,12 @@
         <el-table-column label="机组" align="center" prop="unitGroup" />
         <el-table-column label="检验结果" align="center">
           <template slot-scope="scope">
-            <el-tag
-              :type="scope.row.inspectionResult == 1 ? 'success' : (scope.row.inspectionResult == 2 ? 'danger' : 'info')">
-              <span v-if="scope.row.inspectionResult == 0">未检验</span>
-              <span v-else-if="scope.row.inspectionResult == 1">合格</span>
-              <span v-else-if="scope.row.inspectionResult == 2">不合格</span>
-              <span v-else>未知</span>
-            </el-tag>
+            <span>
+              <span v-if="scope.row.inspectionResult == 0" style="color: grey;">未检验</span>
+              <span v-else-if="scope.row.inspectionResult == 1" style="color: #67C23A;">合格</span>
+              <span v-else-if="scope.row.inspectionResult == 2" style="color: #FF4949;">不合格</span>
+              <span v-else style="color: grey;">未知</span>
+            </span>
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
@@ -99,19 +98,19 @@
           <el-table-column label="单位" align="center" prop="unit"></el-table-column>
           <el-table-column label="状态" align="center">
             <template slot-scope="scope">
-              <el-tag :type="scope.row.status == 1 ? 'success' : (scope.row.status == 2 ? 'danger' : 'info')">
-                <span v-if="scope.row.status == 0">未检测</span>
-                <span v-else-if="scope.row.status == 1">通过</span>
-                <span v-else-if="scope.row.status == 2">不通过</span>
-                <span v-else>未知</span>
-              </el-tag>
+              <span>
+                <span v-if="scope.row.status == 0" style="color: gray;">未检测</span>
+                <span v-else-if="scope.row.status == 1" style="color: #67C23A;">通过</span>
+                <span v-else-if="scope.row.status == 2" style="color: #FF4949;">不通过</span>
+                <span v-else style="color: gray;">未知</span>
+              </span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.status == 0" size="mini" type="success"
+              <el-button v-if="scope.row.status == 0" size="mini" type="text" style="color: #67C23A;"
                 @click="changeItemStatus(detailData.taskId, scope.row.itemId, 1)">通过</el-button>
-              <el-button v-if="scope.row.status == 0" size="mini" type="danger" style="margin-left: 8px;"
+              <el-button v-if="scope.row.status == 0" size="mini" type="text" style="margin-left: 8px; color: #FF4949;"
                 @click="changeItemStatus(detailData.taskId, scope.row.itemId, 2)">不通过</el-button>
             </template>
           </el-table-column>