@@ -62,7 +69,6 @@ export default {
deleteIsBatch: true
},
dataForm: {
- name: ''
}
}
},
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index e426e6b..a8d3dd5 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -52,7 +52,7 @@
+
+
diff --git a/src/views/process-inspection/Counting/NPGraph.vue b/src/views/process-inspection/Counting/NPGraph.vue
new file mode 100644
index 0000000..0a75d89
--- /dev/null
+++ b/src/views/process-inspection/Counting/NPGraph.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/process-inspection/Counting/PGraph.vue b/src/views/process-inspection/Counting/PGraph.vue
new file mode 100644
index 0000000..7f063da
--- /dev/null
+++ b/src/views/process-inspection/Counting/PGraph.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/process-inspection/Counting/UGraph.vue b/src/views/process-inspection/Counting/UGraph.vue
new file mode 100644
index 0000000..392104e
--- /dev/null
+++ b/src/views/process-inspection/Counting/UGraph.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/process-inspection/Metrological/XMRGraph.vue b/src/views/process-inspection/Metrological/XMRGraph.vue
new file mode 100644
index 0000000..7fadfcd
--- /dev/null
+++ b/src/views/process-inspection/Metrological/XMRGraph.vue
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}{{ parseFloat(item.value).toFixed(4) }}
+
+
+
+
+ {{ key }}{{ val.length?val: parseFloat(val).toFixed(4) }}
+
+
+
+
+ {{ key }}{{ val.length?val: parseFloat(val).toFixed(4) }}
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/process-inspection/Metrological/XbarRGraph.vue b/src/views/process-inspection/Metrological/XbarRGraph.vue
new file mode 100644
index 0000000..704ffaf
--- /dev/null
+++ b/src/views/process-inspection/Metrological/XbarRGraph.vue
@@ -0,0 +1,184 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}{{ parseFloat(item.value).toFixed(4) }}
+
+
+
+
+ {{ key
+ }}{{
+ val.length ? val : parseFloat(val).toFixed(4)
+ }}
+
+
+
+
+ {{ key
+ }}{{
+ val.length ? val : parseFloat(val).toFixed(4)
+ }}
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/process-inspection/Metrological/XbarSGraph.vue b/src/views/process-inspection/Metrological/XbarSGraph.vue
new file mode 100644
index 0000000..317b8be
--- /dev/null
+++ b/src/views/process-inspection/Metrological/XbarSGraph.vue
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}{{ parseFloat(item.value).toFixed(4) }}
+
+
+
+
+ {{ key }}{{ val.length?val: parseFloat(val).toFixed(4) }}
+
+
+
+
+ {{ key }}{{ val.length?val: parseFloat(val).toFixed(4) }}
+
+
+
+ {{ item }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/process-inspection/charts/echart-2line.vue b/src/views/process-inspection/charts/echart-2line.vue
new file mode 100644
index 0000000..6265a75
--- /dev/null
+++ b/src/views/process-inspection/charts/echart-2line.vue
@@ -0,0 +1,618 @@
+
+
+
+
+
+
+
diff --git a/src/views/process-inspection/charts/echart-3line.vue b/src/views/process-inspection/charts/echart-3line.vue
new file mode 100644
index 0000000..b43420a
--- /dev/null
+++ b/src/views/process-inspection/charts/echart-3line.vue
@@ -0,0 +1,239 @@
+
+
+
+
+
+
+
diff --git a/src/views/process-inspection/components/detail-table.vue b/src/views/process-inspection/components/detail-table.vue
new file mode 100644
index 0000000..264ac49
--- /dev/null
+++ b/src/views/process-inspection/components/detail-table.vue
@@ -0,0 +1,274 @@
+
+
+
+
+
+
+ 添加样本组
+
+
+ 提交
+
+
+
+
+
+
+
+
+
+ {{ scope.row[item.prop] }}
+
+
+
+
+
+
+
diff --git a/src/views/process-inspection/components/features-table.vue b/src/views/process-inspection/components/features-table.vue
new file mode 100644
index 0000000..b63d17f
--- /dev/null
+++ b/src/views/process-inspection/components/features-table.vue
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+ {{
+ { 1: '致命缺陷',2: '严重缺陷',3: '轻微缺陷' }[
+ scope.row.defectLevel
+ ]
+ }}
+
+
+
+ {{
+ { 1: "计量型", 2: "计数型"}[
+ scope.row.type
+ ]
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/process-inspection/components/generalOperation-add.vue b/src/views/process-inspection/components/generalOperation-add.vue
new file mode 100644
index 0000000..e0aa424
--- /dev/null
+++ b/src/views/process-inspection/components/generalOperation-add.vue
@@ -0,0 +1,432 @@
+
+
+
+
+ {{ !dataForm.id ? "登记" : "修改" }}
+
+
+
+
+ 检验信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 开单
+ 关闭
+
+
+
+
+
+ 特性信息
+
+
+
+
+
+ 详情
+
+
+
+
+
+
+
diff --git a/src/views/process-inspection/generalOperation.vue b/src/views/process-inspection/generalOperation.vue
new file mode 100644
index 0000000..bdb1dba
--- /dev/null
+++ b/src/views/process-inspection/generalOperation.vue
@@ -0,0 +1,306 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 登记
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+ {{
+ { 1: "进货检验", 2: "过程检验", 3: "成品检验", 4: "出货检验" }[
+ scope.row.inspectionStage
+ ]
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/process-inspection/query-form.vue b/src/views/process-inspection/query-form.vue
new file mode 100644
index 0000000..28f82f4
--- /dev/null
+++ b/src/views/process-inspection/query-form.vue
@@ -0,0 +1,255 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 原始数据
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
diff --git a/src/views/quality-planning/components/controlRatio.js b/src/views/quality-planning/components/controlRatio.js
new file mode 100644
index 0000000..40c4706
--- /dev/null
+++ b/src/views/quality-planning/components/controlRatio.js
@@ -0,0 +1,66 @@
+/*
+ * @Author: zwq
+ * @Date: 2022-12-01 15:04:30
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-12-01 15:39:48
+ * @Description:
+ */
+
+const dataArr = [
+ [2, 2.121, 3.76, 1.88, 2.659, 1, 1.88, 0.5642, 0.7979, 1.253, 0, 1.843, 0, 3.267, 0, 2.606, 1.128, 0.8865, 0.853, 0, 3.686, 0, 3.2672],
+ [3, 1.732, 2.394, 1.023, 1.954, 1.16, 1.187, 0.7236, 0.8862, 1.128, 0, 1.858, 0, 2.586, 0, 2.276, 1.693, 0.5907, 0.888, 0, 4.358, 0, 2.575],
+ [4, 1.5, 1.88, 0.729, 1.628, 1.092, 0.796, 0.7979, 0.9213, 1.085, 0, 1.808, 0, 2.266, 0, 2.088, 2.059, 0.4857, 0.88, 0, 4.689, 0, 2.282],
+ [5, 1.342, 1.596, 0.577, 1.427, 1.198, 0.691, 0.8407, 0.94, 1.064, 0, 1.756, 0, 2.089, 0, 1.964, 2.326, 0.4299, 0.864, 0, 4.198, 0, 2.115],
+ [6, 1.225, 1.41, 0.483, 1.287, 1.135, 0.549, 0.8686, 0.9515, 1.051, 0.026, 0.711, 0.03, 1.97, 0.029, 1.874, 2.534, 0.3946, 0.848, 0, 5.078, 0, 2.004],
+ [7, 1.134, 1.277, 0.419, 1.182, 1.214, 0.509, 0.8882, 0.9594, 1.042, 0.105, 1.672, 0.118, 1.882, 0.113, 1.806, 2.704, 0.3698, 0.833, 0.205, 5.203, 0.067, 1.924],
+ [8, 1.061, 1.175, 0.373, 1.099, 1.16, 0.432, 0.9027, 0.965, 1.036, 0.167, 1.638, 0.185, 1.851, 0.179, 1.751, 2.847, 0.3512, 0.82, 0.387, 5.307, 0.136, 1.864],
+ [9, 1, 1.094, 0.337, 1.032, 1.223, 0.412, 0.9139, 0.9693, 1.032, 0.219, 1.609, 0.239, 1.761, 0.232, 1.707, 2.97, 0.3367, 0.808, 0.546, 5.394, 0.184, 1.816],
+ [10, 0.949, 1.028, 0.308, 0.975, 1.176, 0.363, 0.9227, 0.9727, 1.028, 0.262, 1.584, 0.284, 1.716, 0.276, 1.669, 3.078, 0.3249, 0.797, 0.687, 5.469, 0.223, 1.777],
+ [11, 0.905, 0.973, 0.285, 0.927, 0, 0, 0.93, 0.9754, 1.025, 0.299, 1.561, 0.321, 1.679, 0.313, 1.637, 3.173, 0.3152, 0.787, 0.812, 5.534, 0.256, 1.744],
+ [12, 0.866, 0.925, 0.266, 0.886, 0, 0, 0.9359, 0.9776, 1.023, 0.331, 1.541, 0.354, 1.646, 0.346, 1.61, 3.258, 0.3069, 0.778, 0.924, 5.592, 0.284, 1.716],
+ [13, 0.832, 0.884, 0.249, 0.85, 0, 0, 0.941, 0.9794, 1.021, 0.359, 1.523, 0.382, 1.618, 0.374, 1.585, 3.336, 0.2998, 0.77, 1.026, 5.646, 0.308, 1.692],
+ [14, 0.802, 0.848, 0.235, 0.817, 0, 0, 0.9453, 0.981, 1.019, 0.384, 1.507, 0.406, 1.594, 0.399, 1.563, 3.407, 0.2935, 0.762, 1.121, 5.693, 0.329, 1.671],
+ [15, 0.775, 0.816, 0.223, 0.789, 0, 0, 0.949, 0.9823, 1.018, 0.406, 1.492, 0.428, 1.572, 0.421, 1.544, 3.472, 0.288, 0.755, 1.207, 5.737, 0.348, 1.652],
+ [16, 0.75, 0.788, 0.212, 0.763, 0, 0, 0.9523, 0.9835, 1.017, 0.427, 1.478, 0.448, 1.552, 0.44, 1.526, 3.532, 0.2831, 0.749, 1.285, 5.779, 0.364, 1.636],
+ [17, 0.728, 0.762, 0.203, 0.739, 0, 0, 0.9551, 0.9845, 1.016, 0.445, 1.465, 0.466, 1.534, 0.458, 1.511, 3.588, 0.2787, 0.743, 1.359, 5.187, 0.379, 1.621],
+ [18, 0.707, 0.738, 0.194, 0.718, 0, 0, 0.9576, 0.9854, 1.015, 0.461, 1.454, 0.482, 1.518, 0.475, 1.496, 3.64, 0.2747, 0.738, 1.426, 5.854, 0.392, 1.608],
+ [19, 0.688, 0.717, 0.187, 0.698, 0, 0, 0.9599, 0.9862, 1.014, 0.477, 1.443, 0.497, 1.503, 0.49, 1.483, 3.689, 0.2711, 0.733, 1.49, 5.888, 0.404, 1.596],
+ [20, 0.671, 0.697, 0.18, 0.68, 0, 0, 0.9619, 0.9869, 1.013, 0.491, 1.433, 0.51, 1.49, 0.504, 1.47, 3.735, 0.2677, 0.729, 1.548, 5.922, 0.414, 1.586],
+ [21, 0.655, 0.679, 0.173, 0.663, 0, 0, 0.9638, 0.9876, 1.013, 0.504, 1.424, 0.523, 1.477, 0.516, 1.459, 3.778, 0.2647, 0.724, 1.606, 5.95, 0.425, 1.575],
+ [22, 0.64, 0.662, 0.167, 0.647, 0, 0, 0.9655, 0.9882, 1.012, 0.516, 1.415, 0.534, 1.466, 0.528, 1.448, 3.819, 0.2618, 0.72, 1.659, 5.979, 0.434, 1.556],
+ [23, 0.626, 0.647, 0.162, 0.633, 0, 0, 0.967, 0.9887, 1.011, 0.527, 1.407, 0.545, 1.455, 0.539, 1.438, 3.858, 0.2592, 0.716, 1.71, 6.006, 0.443, 1.557],
+ [24, 0.612, 0.632, 0.157, 0.619, 0, 0, 0.9684, 0.9892, 1.011, 0.538, 1.399, 0.555, 1.445, 0.549, 1.429, 3.895, 0.2567, 0.712, 1.759, 6.031, 0.452, 1.548],
+ [25, 0.6, 0.619, 0.153, 0.606, 0, 0, 0.9696, 0.9896, 1.011, 0.548, 1.392, 0.565, 1.435, 0.559, 1.42, 3.931, 0.2544, 0.709, 1.804, 6.058, 0.459, 1.541],
+]
+export function list() {
+ let arr = []
+ dataArr.forEach(item => {
+ const obj = {
+ name: item[0],
+ A: item[1],
+ A1: item[2],
+ A2: item[3],
+ A3: item[4],
+ m3: item[5],
+ m3A2: item[6],
+ C2: item[7],
+ C4: item[8],
+ '1/C4': item[9],
+ B1: item[10],
+ B2: item[11],
+ B3: item[12],
+ B4: item[13],
+ B5: item[14],
+ B6: item[15],
+ d2: item[16],
+ '1/d2': item[17],
+ d3: item[18],
+ D1: item[19],
+ D2: item[20],
+ D3: item[21],
+ D4: item[22],
+ }
+ arr.push(obj)
+ })
+ return arr
+}
\ No newline at end of file
diff --git a/src/views/quality-planning/components/interpretationScheme-add.vue b/src/views/quality-planning/components/interpretationScheme-add.vue
new file mode 100644
index 0000000..a53ffc0
--- /dev/null
+++ b/src/views/quality-planning/components/interpretationScheme-add.vue
@@ -0,0 +1,180 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 监控图形一
+
+ {{ item.ruleKey.split("x")[0] }}
+
+ {{ item.ruleKey.split("x")[1] }}
+
+ {{ item.ruleKey.split("x")[2] }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/quality-planning/controlGraph.vue b/src/views/quality-planning/controlGraph.vue
new file mode 100644
index 0000000..1bf2e87
--- /dev/null
+++ b/src/views/quality-planning/controlGraph.vue
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.type === '2' ? "计数" : "计量"
+ }}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/quality-planning/controlRatio.vue b/src/views/quality-planning/controlRatio.vue
new file mode 100644
index 0000000..f706901
--- /dev/null
+++ b/src/views/quality-planning/controlRatio.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/quality-planning/interpretationScheme.vue b/src/views/quality-planning/interpretationScheme.vue
new file mode 100644
index 0000000..5d3aaa7
--- /dev/null
+++ b/src/views/quality-planning/interpretationScheme.vue
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/quality-planning/query-form.vue b/src/views/quality-planning/query-form.vue
new file mode 100644
index 0000000..65c605f
--- /dev/null
+++ b/src/views/quality-planning/query-form.vue
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 新增
+
+
+
+ 导出
+
+
+
+
+
+
+
diff --git a/src/views/spc-basic/components/flowMethods.js b/src/views/spc-basic/components/flowMethods.js
index df3b58d..c481b58 100644
--- a/src/views/spc-basic/components/flowMethods.js
+++ b/src/views/spc-basic/components/flowMethods.js
@@ -1,103 +1,149 @@
-import { Addon} from '@antv/x6';
+import { Addon } from '@antv/x6';
// 拖拽生成四边形
-export const startDragToGraph = (graph,data,e) =>{
- const node =
+export const startDragToGraph = (graph, data, e) => {
+ const node =
graph.createNode({
- width: 100, //节点的宽度
- height: 60, //节点的高度
- attrs: {
- label: {
- text: data.name,
- workingProcedureId: data.id,
- fill: 'white',
- fontSize: 14,
- textWrap: {
- width: -10 ,
- height: -10,
- ellipsis: true,
- },
+ label: '圆角矩形',
+ data: {
+ type: 'defaultYSquare'
},
- body: {
- stroke: '#000000',
- strokeWidth: 1,
- fill: '#5bdeff',
- }
- },
- ports: ports
- })
- const dnd = new Addon.Dnd({target:graph})
- dnd.start(node,e)
+ shape: 'rect',
+ width: 100, //节点的宽度
+ height: 60, //节点的高度
+ attrs: {
+ label: {
+ text: data.name,
+ workingProcedureId: data.id,
+ fill: '#FFFFFF',
+ fontSize: 14,
+ textWrap: {
+ width: -10,
+ height: -10,
+ ellipsis: true,
+ },
+ },
+ body: {
+ stroke: '#000000',
+ strokeWidth: 1,
+ fill: '#5bdeff',
+ rx: 10,
+ ry: 10,
+ }
+ },
+ })
+ const dnd = new Addon.Dnd({ target: graph })
+ dnd.start(node, e)
}
//下面是锚点的代码。 知道就行了 我就不一一写了。
export const ports = {
- groups: {
- // 输入链接桩群组定义
- top: {
- position: 'top',
- attrs: {
- circle: {
- r: 4,
- magnet: true,
- stroke: '#2D8CF0',
- strokeWidth: 2,
- fill: '#fff',
- },
- },
- },
- // 输出链接桩群组定义
- bottom: {
- position: 'bottom',
- attrs: {
- circle: {
- r: 4,
- magnet: true,
- stroke: '#2D8CF0',
- strokeWidth: 2,
- fill: '#fff',
- },
- },
- },
- left: {
- position: 'left',
- attrs: {
- circle: {
- r: 4,
- magnet: true,
- stroke: '#2D8CF0',
- strokeWidth: 2,
- fill: '#fff',
- },
- },
- },
- right: {
- position: 'right',
- attrs: {
- circle: {
- r: 4,
- magnet: true,
- stroke: '#2D8CF0',
- strokeWidth: 2,
- fill: '#fff',
- },
+ groups: {
+ // 输入链接桩群组定义
+ top: {
+ position: 'top',
+ attrs: {
+ circle: {
+ r: 4,
+ magnet: true,
+ stroke: '#2D8CF0',
+ strokeWidth: 2,
+ fill: '#fff',
},
},
},
- items: [
+ // 输出链接桩群组定义
+ bottom: {
+ position: 'bottom',
+ attrs: {
+ circle: {
+ r: 4,
+ magnet: true,
+ stroke: '#2D8CF0',
+ strokeWidth: 2,
+ fill: '#fff',
+ },
+ },
+ },
+ left: {
+ position: 'left',
+ attrs: {
+ circle: {
+ r: 4,
+ magnet: true,
+ stroke: '#2D8CF0',
+ strokeWidth: 2,
+ fill: '#fff',
+ },
+ },
+ },
+ right: {
+ position: 'right',
+ attrs: {
+ circle: {
+ r: 4,
+ magnet: true,
+ stroke: '#2D8CF0',
+ strokeWidth: 2,
+ fill: '#fff',
+ },
+ },
+ },
+ },
+ items: [
+ {
+ id: 'port1',
+ group: 'top',
+ },
+ {
+ id: 'port2',
+ group: 'bottom',
+ },
+ {
+ id: 'port3',
+ group: 'left',
+ },
+ {
+ id: 'port4',
+ group: 'right',
+ }
+ ],
+}
+
+
+// 连线 label 设置
+export const configEdgeLabel = (labelText, fontColor, fill, stroke) => {
+ if (!labelText) return { attrs: { labelText: { text: '' }, labelBody: { fill: '', stroke: '' } } }
+ return {
+ markup: [
{
- id: 'port1',
- group: 'top',
+ tagName: 'rect',
+ selector: 'labelBody',
},
{
- id: 'port2',
- group: 'bottom',
+ tagName: 'text',
+ selector: 'labelText',
},
- {
- id: 'port3',
- group: 'left',
- },
- {
- id: 'port4',
- group: 'right',
- }
],
+ attrs: {
+ labelText: {
+ text: labelText || '',
+ fill: fontColor || '#333',
+ textAnchor: 'middle',
+ textVerticalAnchor: 'middle',
+ },
+ labelBody: {
+ ref: 'labelText',
+ refX: -8,
+ refY: -5,
+ refWidth: '100%',
+ refHeight: '100%',
+ refWidth2: 16,
+ refHeight2: 10,
+ stroke: stroke || '#555',
+ fill: fill || '#fff',
+ strokeWidth: 2,
+ rx: 5,
+ ry: 5,
+ },
+ }
+ }
}
\ No newline at end of file
diff --git a/src/views/spc-basic/components/processFlow-graph.vue b/src/views/spc-basic/components/processFlow-graph.vue
index 8421793..0fea6a8 100644
--- a/src/views/spc-basic/components/processFlow-graph.vue
+++ b/src/views/spc-basic/components/processFlow-graph.vue
@@ -2,13 +2,16 @@
* @Author: zwq
* @Date: 2022-09-01 15:42:34
* @LastEditors: zwq
- * @LastEditTime: 2022-09-09 13:42:48
+ * @LastEditTime: 2022-12-12 15:44:25
* @Description:
-->
-
+
+
+
+
{{ editTitle }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
预览
+
+ {{ form.labelText }}
+
+
+
+
+
+
+ 保存
+ 删除此{{ editTitle === "编辑节点" ? "节点" : "连线" }}
+
+
-
+
+
+
diff --git a/src/views/spc-basic/components/productList-four-content.vue b/src/views/spc-basic/components/productList-four-content.vue
index a20e9f0..eec9794 100644
--- a/src/views/spc-basic/components/productList-four-content.vue
+++ b/src/views/spc-basic/components/productList-four-content.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
- * @LastEditTime: 2022-09-07 16:04:53
+ * @LastEditTime: 2022-12-13 16:00:33
* @Description:
-->
@@ -20,7 +20,7 @@
border
style="width: 50%;"
>
-
+
-
+
-
-
-
+
+
+
{{ scope.row.type === 2 ? "计数" : "计量" }}
-
+
{{
scope.row.defectLevel === 1
@@ -75,24 +75,24 @@
}}
-
-
+
+
{{ scope.row.isSpc === 1 ? "是" : "否" }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
{
this.getSelection();
diff --git a/src/views/spc-basic/components/productList-four-history.vue b/src/views/spc-basic/components/productList-four-history.vue
index 03a5218..4ee8916 100644
--- a/src/views/spc-basic/components/productList-four-history.vue
+++ b/src/views/spc-basic/components/productList-four-history.vue
@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
- * @LastEditTime: 2022-09-07 16:06:00
+ * @LastEditTime: 2022-12-01 15:51:44
* @Description:
-->
@@ -19,14 +19,14 @@
>
-
-
-
+
+
+
{{ scope.row.type === 2 ? "计数" : "计量" }}
-
+
{{
scope.row.defectLevel === 1
@@ -37,24 +37,24 @@
}}
-
-
+
+
{{ scope.row.isSpc === 1 ? "是" : "否" }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
- 查询
-
-
-
- 新增
-
-
-
- 导出
-
-
-
+
-
-
-
-
+
+
+
+
import AddOrUpdate from './components/machineManage-add'
import basicPage from '@/mixins/basic-page'
+import queryForm from './query-form'
export default {
mixins: [basicPage],
data() {
@@ -154,6 +131,7 @@ export default {
},
components: {
AddOrUpdate,
+ queryForm,
},
methods: {
},
diff --git a/src/views/spc-basic/processDefine.vue b/src/views/spc-basic/processDefine.vue
index 04355c1..37e8ad5 100644
--- a/src/views/spc-basic/processDefine.vue
+++ b/src/views/spc-basic/processDefine.vue
@@ -1,36 +1,12 @@
-
-
-
-
-
-
-
- 查询
-
-
-
- 新增
-
-
-
- 导出
-
-
-
+
-
-
-
-
+
+
+
+
{{ scope.row.machineName}}
@@ -164,6 +140,7 @@
import AddOrUpdate from './components/processDefine-add'
import BindMachine from './components/processDefine-machine'
import basicPage from '@/mixins/basic-page'
+import queryForm from './query-form'
export default {
mixins: [basicPage],
data() {
@@ -179,6 +156,7 @@ export default {
},
components: {
AddOrUpdate,
+ queryForm,
BindMachine
},
methods: {
diff --git a/src/views/spc-basic/processFlow.vue b/src/views/spc-basic/processFlow.vue
index 992025a..74be7dc 100644
--- a/src/views/spc-basic/processFlow.vue
+++ b/src/views/spc-basic/processFlow.vue
@@ -1,152 +1,781 @@
-
-
-
-
+
+
+
-
-
-
-
-
-
- 查询
-
-
-
-
-
+
+
+
+
+
+
+
{{ editTitle }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
预览
+
+ {{ form.labelText }}
+
+
+
+
+
+
+
+
+
+
+ 字体颜色:
+
+
+ 背景颜色:
+
+
+ 描边颜色:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
删除此{{ editTitle === "编辑节点" ? "节点" : "连线" }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/views/spc-basic/processType.vue b/src/views/spc-basic/processType.vue
index 55ca998..efff8d0 100644
--- a/src/views/spc-basic/processType.vue
+++ b/src/views/spc-basic/processType.vue
@@ -1,36 +1,12 @@
-
-
-
-
-
-
-
- 查询
-
-
-
- 新增
-
-
-
- 导出
-
-
-
+
-
-
+
+
import AddOrUpdate from './components/processType-add'
import basicPage from '@/mixins/basic-page'
+import queryForm from './query-form'
export default {
mixins: [basicPage],
data() {
@@ -147,6 +124,7 @@ export default {
},
components: {
AddOrUpdate,
+ queryForm,
},
methods: {
},
diff --git a/src/views/spc-basic/productList.vue b/src/views/spc-basic/productList.vue
index 4cdfff5..53ccbba 100644
--- a/src/views/spc-basic/productList.vue
+++ b/src/views/spc-basic/productList.vue
@@ -7,20 +7,50 @@
@keyup.enter.native="getDataList()"
>
-
+
+
+
+
+
+
+ >
+
+
+
+
+
+
+
-
+
查询
-
+
新增
@@ -37,7 +67,7 @@
:header-cell-style="{
background: '#eef1f6',
color: '#606266',
- height: '56px'
+ height: '56px',
}"
v-loading="dataListLoading"
style="width: 100%;"
@@ -51,33 +81,27 @@
width="50"
>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
- 进货检验
- 过程检验
- 成品检验
- 出货检验
-
+
+ 进货检验
+ 过程检验
+ 成品检验
+ 出货检验
+
-
+
{{
scope.row.status === 0 ? "不可用" : "可用"
@@ -110,26 +134,11 @@
-->
-
+
-
-
-
+
+
+
@@ -181,24 +190,63 @@
\ No newline at end of file
+
diff --git a/src/views/spc-basic/productType.vue b/src/views/spc-basic/productType.vue
index 056a1cc..a37a791 100644
--- a/src/views/spc-basic/productType.vue
+++ b/src/views/spc-basic/productType.vue
@@ -1,36 +1,12 @@
-
-
-
-
-
-
-
- 查询
-
-
-
- 新增
-
-
-
- 导出
-
-
-
+
-
-
-
+
+
+
{{
@@ -112,6 +88,7 @@
+
+
diff --git a/src/views/spc-basic/siteManage.vue b/src/views/spc-basic/siteManage.vue
index 6a5fe2a..b0b9393 100644
--- a/src/views/spc-basic/siteManage.vue
+++ b/src/views/spc-basic/siteManage.vue
@@ -1,36 +1,12 @@
-
-
-
-
-
-
-
- 查询
-
-
-
- 新增
-
-
-
- 导出
-
-
-
+
-
-
-
+
+
+
import AddOrUpdate from './components/siteManage-add'
import basicPage from '@/mixins/basic-page'
+import queryForm from './query-form'
export default {
mixins: [basicPage],
data() {
@@ -153,6 +130,7 @@ export default {
},
components: {
AddOrUpdate,
+ queryForm,
},
methods: {
},
diff --git a/src/views/spc-basic/toolsType.vue b/src/views/spc-basic/toolsType.vue
index e9cc3ca..6aa71c7 100644
--- a/src/views/spc-basic/toolsType.vue
+++ b/src/views/spc-basic/toolsType.vue
@@ -1,36 +1,12 @@
-
-
-
-
-
-
-
- 查询
-
-
-
- 新增
-
-
-
- 导出
-
-
-
+
-
-
-
+
+
+
{{
scope.row.type === '2' ? "计数" : "计量"
@@ -167,6 +143,7 @@
import AddOrUpdate from './components/toolsType-add'
import Detail from './components/toolsType-detail'
import basicPage from '@/mixins/basic-page'
+import queryForm from './query-form'
export default {
mixins: [basicPage],
data() {
@@ -182,6 +159,7 @@ export default {
},
components: {
AddOrUpdate,
+ queryForm,
Detail
},
methods: {
diff --git a/src/views/spc-basic/unitList.vue b/src/views/spc-basic/unitList.vue
index 25116ce..f039ded 100644
--- a/src/views/spc-basic/unitList.vue
+++ b/src/views/spc-basic/unitList.vue
@@ -1,36 +1,12 @@
-
-
-
-
-
-
-
- 查询
-
-
-
- 新增
-
-
-
- 导出
-
-
-
+
-
-
-
+
+
+
{{
scope.row.type === 2 ? "不可计数" : "可计数"
@@ -144,6 +120,7 @@
+
+
diff --git a/src/views/spc/echart-3line.vue b/src/views/spc-chart/echart-3line.vue
similarity index 100%
rename from src/views/spc/echart-3line.vue
rename to src/views/spc-chart/echart-3line.vue
diff --git a/src/views/spc/echart-line.vue b/src/views/spc-chart/echart-line.vue
similarity index 100%
rename from src/views/spc/echart-line.vue
rename to src/views/spc-chart/echart-line.vue
diff --git a/src/views/spc/test3data.js b/src/views/spc-chart/test3data.js
similarity index 100%
rename from src/views/spc/test3data.js
rename to src/views/spc-chart/test3data.js
diff --git a/src/views/spc/testdata.js b/src/views/spc-chart/testdata.js
similarity index 100%
rename from src/views/spc/testdata.js
rename to src/views/spc-chart/testdata.js