From 46629a064c0e0db2de0d09185546ceb839d9a3fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=E2=80=9Cshijing?= <“1378914240@qq.com> Date: Wed, 8 Sep 2021 09:20:48 +0800 Subject: [PATCH 1/6] addWord --- hb_client/src/api/testModel.js | 8 + hb_client/src/views/login/index.vue | 1 + hb_client/src/views/mtm/stepdo.vue | 684 ++++++++++---------- hb_client/src/views/testModel/faceLogin.vue | 30 +- hb_client/src/views/testModel/markImage.vue | 180 ++++-- 5 files changed, 470 insertions(+), 433 deletions(-) create mode 100644 hb_client/src/api/testModel.js diff --git a/hb_client/src/api/testModel.js b/hb_client/src/api/testModel.js new file mode 100644 index 0000000..fc6204e --- /dev/null +++ b/hb_client/src/api/testModel.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' +export function faceLogin(data) { + return request({ + url: '/system/facelogin/', + method: 'post', + data + }) +} diff --git a/hb_client/src/views/login/index.vue b/hb_client/src/views/login/index.vue index 9e606b4..f9ad27a 100644 --- a/hb_client/src/views/login/index.vue +++ b/hb_client/src/views/login/index.vue @@ -103,6 +103,7 @@ }, + activeName: "", loading: false, passwordType: "password", redirect: undefined, diff --git a/hb_client/src/views/mtm/stepdo.vue b/hb_client/src/views/mtm/stepdo.vue index e613d63..e4470c9 100644 --- a/hb_client/src/views/mtm/stepdo.vue +++ b/hb_client/src/views/mtm/stepdo.vue @@ -1,237 +1,202 @@ @@ -505,4 +469,4 @@ export default { .my-content { background: #FDE2E2; } - \ No newline at end of file + diff --git a/hb_client/src/views/testModel/faceLogin.vue b/hb_client/src/views/testModel/faceLogin.vue index bd0ecba..111a824 100644 --- a/hb_client/src/views/testModel/faceLogin.vue +++ b/hb_client/src/views/testModel/faceLogin.vue @@ -12,6 +12,7 @@ - \ No newline at end of file diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue index a0ea94c..cd9c760 100644 --- a/hb_client/src/views/mtm/step.vue +++ b/hb_client/src/views/mtm/step.vue @@ -29,7 +29,14 @@ - + + + Date: Wed, 8 Sep 2021 10:44:38 +0800 Subject: [PATCH 3/6] addWord --- hb_client/src/views/mtm/step.vue | 857 +++++++++++++++++++++++-------- 1 file changed, 644 insertions(+), 213 deletions(-) diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue index 19f8556..8bb6078 100644 --- a/hb_client/src/views/mtm/step.vue +++ b/hb_client/src/views/mtm/step.vue @@ -1,14 +1,14 @@ + + From d5ab0dad5f222923572977acaaf05287dc43c5a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=E2=80=9Cshijing?= <“1378914240@qq.com> Date: Wed, 8 Sep 2021 11:29:09 +0800 Subject: [PATCH 4/6] addWord --- hb_client/src/views/mtm/step.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue index e1ec802..ac0fdd3 100644 --- a/hb_client/src/views/mtm/step.vue +++ b/hb_client/src/views/mtm/step.vue @@ -653,7 +653,7 @@ const isEdit = this.dialogType1 === "edit"; if (isEdit) { this.field.form=this.formID; - this.field.field_choice = this.options; + this.field.field_choice = this.field_choice; updaterffield(this.field.id, this.field).then((res) => { if (res.code >= 200) { this.fieldLists() @@ -663,7 +663,7 @@ }); } else { this.field.form=this.formID; - this.field.field_choice = this.options; + this.field.field_choice = this.field_choice; createrffield(this.field).then((res) => { if (res.code >= 200) { this.fieldLists() From 9bacdad594a2c1fd3af53f44061682dfb77ee8d1 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 8 Sep 2021 14:13:10 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E4=BB=B6=20step?= =?UTF-8?q?.vue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_client/src/views/mtm/step.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue index ac0fdd3..ff42826 100644 --- a/hb_client/src/views/mtm/step.vue +++ b/hb_client/src/views/mtm/step.vue @@ -79,7 +79,6 @@ :label="item.label" :value="item.value"> -<<<<<<< HEAD From a97dd9e768c5916448eb990669339e02596f7085 Mon Sep 17 00:00:00 2001 From: shilixia <2309368887@qq.com> Date: Thu, 9 Sep 2021 14:06:03 +0800 Subject: [PATCH 6/6] xial --- hb_client/src/router/index.js | 2 +- hb_client/src/views/equipment/index.vue | 34 +++++++++++++++++++++- hb_client/src/views/inm/warehouse.vue | 4 ++- hb_client/src/views/mtm/material.vue | 9 ++++-- hb_client/src/views/mtm/process.vue | 3 ++ hb_client/src/views/mtm/step.vue | 4 ++- hb_client/src/views/procurement/vendor.vue | 4 ++- 7 files changed, 52 insertions(+), 8 deletions(-) diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js index e1724b0..5a7774c 100644 --- a/hb_client/src/router/index.js +++ b/hb_client/src/router/index.js @@ -97,7 +97,7 @@ export const asyncRoutes = [ path: 'index', name: 'index', component: () => import('@/views/equipment/index'), - meta: { title: '设备台账', icon: 'example', perms: ['index_manage'] } + meta: { title: '运维记录', icon: 'example', perms: ['index_manage'] } } ] }, diff --git a/hb_client/src/views/equipment/index.vue b/hb_client/src/views/equipment/index.vue index 0943614..1826b5e 100644 --- a/hb_client/src/views/equipment/index.vue +++ b/hb_client/src/views/equipment/index.vue @@ -50,6 +50,9 @@ + + + @@ -66,6 +69,9 @@ + + + + + + + + + + @@ -127,6 +144,8 @@ + + @@ -220,6 +239,18 @@ export default { equipmentList: { count: 0, }, + type_: { + '1':'生产设备', + '2':'检验工具', + + }, + typeoptions: [{ + value: 1, + label: '生产设备' + }, { + value: 2, + label: '检验工具' + }], options: [{ value: 0, label: '运转正常' @@ -242,6 +273,7 @@ export default { rule1: { name: [{ required: true, message: "请输入", trigger: "blur" }], number: [{ required: true, message: "请输入", trigger: "blur" }], + type: [{ required: true, message: "请输入", trigger: "blur" }], model: [{ required: true, message: "请输入", trigger: "blur" }], state: [{ required: true, message: "请选择", trigger: "blur" }], belong_dept:[{ required: true, message: "请选择", trigger: "blur" }] @@ -270,7 +302,7 @@ export default { //组员列表 getUserList() { getUserList({pageoff:true}).then((res) => { - this.keeperOptions = genTree(res.data.results); + this.keeperOptions = genTree(res.data); }); }, //部门列表 diff --git a/hb_client/src/views/inm/warehouse.vue b/hb_client/src/views/inm/warehouse.vue index 9e9a3c3..eb6e1e9 100644 --- a/hb_client/src/views/inm/warehouse.vue +++ b/hb_client/src/views/inm/warehouse.vue @@ -52,7 +52,9 @@ - + + + - + + + - + - + { diff --git a/hb_client/src/views/mtm/process.vue b/hb_client/src/views/mtm/process.vue index 758d359..767628f 100644 --- a/hb_client/src/views/mtm/process.vue +++ b/hb_client/src/views/mtm/process.vue @@ -34,6 +34,9 @@ + + + {{ scope.row.field_choice }} - + + + - + + +