diff --git a/hb_client/src/api/pm.js b/hb_client/src/api/pm.js index f78b62f..7beed12 100644 --- a/hb_client/src/api/pm.js +++ b/hb_client/src/api/pm.js @@ -105,6 +105,23 @@ export function createConvert(data) { data }) } +//首件检查表初始化 +export function firstTestInit(id,data) { + return request({ + url: `/pm/subproduction_plan/${id}/first_test_init/`, + method: 'post', + data + }) +} +//首件检查责任人审核 +export function firstAudit(id,data) { + return request({ + url: `/pm/subproduction_plan/${id}/first_audit/`, + method: 'post', + data + }) +} + //任务终止 export function planstop(id) { return request({ @@ -120,4 +137,4 @@ export function plantoggle(id) { method: 'put', }) -} \ No newline at end of file +} diff --git a/hb_client/src/assets/beijing.jpg b/hb_client/src/assets/beijing.jpg deleted file mode 100644 index 2d1941c..0000000 Binary files a/hb_client/src/assets/beijing.jpg and /dev/null differ diff --git a/hb_client/src/assets/bg-login.png b/hb_client/src/assets/bg-login.png new file mode 100644 index 0000000..c7f85be Binary files /dev/null and b/hb_client/src/assets/bg-login.png differ diff --git a/hb_client/src/components/customForm/index.vue b/hb_client/src/components/customForm/index.vue index c809024..97a0760 100644 --- a/hb_client/src/components/customForm/index.vue +++ b/hb_client/src/components/customForm/index.vue @@ -239,13 +239,15 @@ let imag= this.formData.filter(item => { return item.field_type === 'draw'; }); - that.img = new Image(); - that.img.crossOrigin = 'anonymous'; - let value = imag[0].field_value?imag[0].field_value:imag[0].draw_template; - that.img = 'http://47.95.0.242:2222'+value; - setTimeout(function(){ - that.canvasInit(); - },500); + if(imag.length>0){ + that.img = new Image(); + that.img.crossOrigin = 'anonymous'; + let value = imag[0].field_value?imag[0].field_value:imag[0].draw_template; + that.img = 'http://47.95.0.242:2222'+value; + setTimeout(function(){ + that.canvasInit(); + },500); + } }, data(){ return{ @@ -695,7 +697,7 @@ that.field = []; //检查项目 let submit = isSubmit=='1'?false:true; that.formData.forEach((item) => { - let field_value = null; + let field_value; if(item.field_type==='int'){ field_value = parseInt(that.checkForm[item.field_key]) }else if(item.field_type==='float'){ diff --git a/hb_client/src/components/faceLogin/review.vue b/hb_client/src/components/faceLogin/review.vue new file mode 100644 index 0000000..4ff2ac3 --- /dev/null +++ b/hb_client/src/components/faceLogin/review.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/hb_client/src/components/faceLogin/tracking.vue b/hb_client/src/components/faceLogin/tracking.vue index 98727da..6505e97 100644 --- a/hb_client/src/components/faceLogin/tracking.vue +++ b/hb_client/src/components/faceLogin/tracking.vue @@ -1,11 +1,11 @@ diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js index c0b6376..a24bbc6 100644 --- a/hb_client/src/router/index.js +++ b/hb_client/src/router/index.js @@ -226,8 +226,7 @@ export const asyncRoutes = [ name: 'operation', component: () => import('@/views/wpm/operation'), meta: { title: '车间操作', icon: 'workshopOperation', perms: ['index_manage'] } - } - , + }, { path: 'operationdo/:id', name: 'operationdo', @@ -240,13 +239,18 @@ export const asyncRoutes = [ name: 'need', component: () => import('@/views/wpm/need'), meta: { title: '过程检验', icon: 'processTest', perms: ['index_manage'] } - } - , + }, { path: 'productjy', name: 'productjy', component: () => import('@/views/wpm/productjy'), meta: { title: '成品检验', icon: 'finishedCheck', perms: ['index_manage'] } + }, + { + path: 'firstCheck', + name: 'firstCheck', + component: () => import('@/views/wpm/firstCheck'), + meta: { title: '首件确认', icon: 'finishedCheck', perms: ['index_manage'] } } ] diff --git a/hb_client/src/utils/request.js b/hb_client/src/utils/request.js index 4aa482a..8db7072 100644 --- a/hb_client/src/utils/request.js +++ b/hb_client/src/utils/request.js @@ -20,7 +20,7 @@ service.interceptors.request.use( // please modify it according to the actual situation config.headers['Authorization'] = 'Bearer ' + getToken() } - let data = config.params; + let data = config.data; /*debugger; console.log(data)*/ if(data){ diff --git a/hb_client/src/views/login/index.vue b/hb_client/src/views/login/index.vue index 7edff04..5625c57 100644 --- a/hb_client/src/views/login/index.vue +++ b/hb_client/src/views/login/index.vue @@ -1,8 +1,8 @@