+
+
+
+
+
+
+
+
+
+
diff --git a/hb_client/src/components/faceLogin/faceLogin.vue b/hb_client/src/components/faceLogin/faceLogin.vue
index 269d70f..d1aaaf3 100644
--- a/hb_client/src/components/faceLogin/faceLogin.vue
+++ b/hb_client/src/components/faceLogin/faceLogin.vue
@@ -35,12 +35,56 @@
}
},
mounted() {
- this.init();
+ this.openTheCamera();
},
methods: {
+ openTheCamera () {
+ this.$nextTick(function () {
+ let _this = this;
+ this.video = document.getElementById('video');
+ // 旧版本浏览器可能根本不支持mediaDevices，我们首先设置一个空对象
+ if (navigator.mediaDevices === undefined) {
+ navigator.mediaDevices = {}
+ }
+ // 一些浏览器实现了部分mediaDevices，我们不能只分配一个对象
+ // 使用getUserMedia，因为它会覆盖现有的属性。
+ // 这里，如果缺少getUserMedia属性，就添加它。
+ if (navigator.mediaDevices.getUserMedia === undefined) {
+ navigator.mediaDevices.getUserMedia = function (constraints) {
+ // 首先获取现存的getUserMedia(如果存在)
+ let getUserMedia = navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.getUserMedia;
+ // 有些浏览器不支持，会返回错误信息
+ // 保持接口一致
+ if (!getUserMedia) {
+ return Promise.reject(new Error('getUserMedia is not implemented in this browser'))
+ }
+ // 否则，使用Promise将调用包装到旧的navigator.getUserMedia
+ return new Promise(function (resolve, reject) {
+ getUserMedia.call(navigator, constraints, resolve, reject)
+ })
+ }
+ }
+ let constraints = { audio: false, video: { width: this.videoWidth, height: this.videoHeight, transform: 'scaleX(-1)' } };
+ navigator.mediaDevices.getUserMedia(constraints).then(function (stream) {
+ // 旧的浏览器可能没有srcObject
+ if ('srcObject' in _this.video) {
+ _this.video.srcObject = stream
+ } else {
+ // 避免在新的浏览器中使用它，因为它正在被弃用。
+ _this.video.src = window.URL.createObjectURL(stream)
+ }
+ _this.video.onloadedmetadata = function (e) {
+ _this.video.play();
+ };
+ _this.init();
+ }).catch(err => {
+ console.log(err)
+ })
+ });
+ },
// 初始化设置
init() {
- this.video = document.getElementById('video');
+ // this.video = document.getElementById('video');
this.screenshotCanvas = document.getElementById('screenshotCanvas');
let canvas = document.getElementById('canvas');
let context = canvas.getContext('2d');
@@ -64,7 +108,6 @@
event.data.forEach(function (rect) {
context.strokeStyle = '#0764B7';
context.strokeRect(rect.x, rect.y, rect.width, rect.height);
- // window.plot(rect.x, rect.y, rect.width, rect.height+20);
// 避免重复发送请求
if(!_this.uploadLock){
_this.uploadLock = true;
@@ -133,7 +176,10 @@
that.uploadLock = false;
// this.$message.error('面部识别失败请重新验证');
});
- }
+ },
+ closeCamera () {
+ this.video.srcObject.getTracks()[0].stop();
+ },
}
}
diff --git a/hb_client/src/components/faceLogin/tracking.vue b/hb_client/src/components/faceLogin/tracking.vue
index 67457c6..4ef978b 100644
--- a/hb_client/src/components/faceLogin/tracking.vue
+++ b/hb_client/src/components/faceLogin/tracking.vue
@@ -24,12 +24,55 @@
}
},
mounted() {
- this.init();
+ this.openTheCamera();
},
methods: {
+ openTheCamera () {
+ this.$nextTick(function () {
+ let _this = this;
+ this.video = document.getElementById('video');
+ // 旧版本浏览器可能根本不支持mediaDevices，我们首先设置一个空对象
+ if (navigator.mediaDevices === undefined) {
+ navigator.mediaDevices = {}
+ }
+ // 一些浏览器实现了部分mediaDevices，我们不能只分配一个对象
+ // 使用getUserMedia，因为它会覆盖现有的属性。
+ // 这里，如果缺少getUserMedia属性，就添加它。
+ if (navigator.mediaDevices.getUserMedia === undefined) {
+ navigator.mediaDevices.getUserMedia = function (constraints) {
+ // 首先获取现存的getUserMedia(如果存在)
+ let getUserMedia = navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.getUserMedia;
+ // 有些浏览器不支持，会返回错误信息
+ // 保持接口一致
+ if (!getUserMedia) {
+ return Promise.reject(new Error('getUserMedia is not implemented in this browser'))
+ }
+ // 否则，使用Promise将调用包装到旧的navigator.getUserMedia
+ return new Promise(function (resolve, reject) {
+ getUserMedia.call(navigator, constraints, resolve, reject)
+ })
+ }
+ }
+ let constraints = { audio: false, video: { width: this.videoWidth, height: this.videoHeight, transform: 'scaleX(-1)' } };
+ navigator.mediaDevices.getUserMedia(constraints).then(function (stream) {
+ // 旧的浏览器可能没有srcObject
+ if ('srcObject' in _this.video) {
+ _this.video.srcObject = stream
+ } else {
+ // 避免在新的浏览器中使用它，因为它正在被弃用。
+ _this.video.src = window.URL.createObjectURL(stream)
+ }
+ _this.video.onloadedmetadata = function (e) {
+ _this.video.play();
+ };
+ _this.init();
+ }).catch(err => {
+ console.log(err)
+ })
+ });
+ },
// 初始化设置
init() {
- this.video = document.getElementById('video');
this.screenshotCanvas = document.getElementById('screenshotCanvas');
let canvas = document.getElementById('canvas');
let context = canvas.getContext('2d');
@@ -46,7 +89,6 @@
let _this = this;
//添加事件
tracker.on('track', function (event) {
-
// 检测出人脸 绘画人脸位置
context.clearRect(0, 0, canvas.width, canvas.height);
// 给每个人脸绘制对应的框
@@ -112,7 +154,10 @@
that.uploadLock = false;
// this.$message.error('面部识别失败请重新验证');
});
- }
+ },
+ closeCamera () {
+ this.video.srcObject.getTracks()[0].stop();
+ },
}
}
diff --git a/hb_client/src/views/dashboard/index.vue b/hb_client/src/views/dashboard/index.vue
index 7ff725e..1fbc573 100644
--- a/hb_client/src/views/dashboard/index.vue
+++ b/hb_client/src/views/dashboard/index.vue
@@ -1,47 +1,122 @@
+
+
+ {{currentDaySize.label}}
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.year }}年{{ key }}月
+ {{ fixdTopMonth }}
+
+
+
+
+
+
+
+
+ 今天
+
+ {{ j.date }}
+
+
+
+
+
+
+ {{ j.date }}
+
+
+
+
+
+
+
+ {{ j.date }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ currentProjectMsg.name }}
+
+
+ 工作周期：
+ {{ currentProjectMsg.allTime }}天
+
+
+ 当前进度：
+ {{ currentProjectMsg.per }}
+
+
+ 合格数量：
+ {{ currentProjectMsg.per1 }}
+
+
+ 开始时间：
+ {{ currentProjectMsg.startTime }}
+
+
+ 结束时间：
+ {{ currentProjectMsg.endTime }}
+
+
-
-
+
@@ -179,9 +179,61 @@
//人脸登录
takePhoto(){
this.limitedPhoto = true;
+ this.openTheCamera();
+ },
+ /*打开相机*/
+ openTheCamera () {
+ this.$nextTick(function () {
+ let _this = this;
+ this.thisVideo = document.getElementById('videoCamera');
+ // 旧版本浏览器可能根本不支持mediaDevices，我们首先设置一个空对象
+ if (navigator.mediaDevices === undefined) {
+ navigator.mediaDevices = {}
+ }
+ // 一些浏览器实现了部分mediaDevices，我们不能只分配一个对象
+ // 使用getUserMedia，因为它会覆盖现有的属性。
+ // 这里，如果缺少getUserMedia属性，就添加它。
+ if (navigator.mediaDevices.getUserMedia === undefined) {
+ navigator.mediaDevices.getUserMedia = function (constraints) {
+ // 首先获取现存的getUserMedia(如果存在)
+ let getUserMedia = navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.getUserMedia;
+ // 有些浏览器不支持，会返回错误信息
+ // 保持接口一致
+ if (!getUserMedia) {
+ return Promise.reject(new Error('getUserMedia is not implemented in this browser'))
+ }
+ // 否则，使用Promise将调用包装到旧的navigator.getUserMedia
+ return new Promise(function (resolve, reject) {
+ getUserMedia.call(navigator, constraints, resolve, reject)
+ })
+ }
+ }
+
+ let constraints = { audio: false, video: { width: this.videoWidth, height: this.videoHeight, transform: 'scaleX(-1)' } };
+ navigator.mediaDevices.getUserMedia(constraints).then(function (stream) {
+ // 旧的浏览器可能没有srcObject
+ if ('srcObject' in _this.thisVideo) {
+ _this.thisVideo.srcObject = stream
+ } else {
+ // 避免在新的浏览器中使用它，因为它正在被弃用。
+ _this.thisVideo.src = window.URL.createObjectURL(stream)
+ }
+ _this.thisVideo.onloadedmetadata = function (e) {
+ _this.thisVideo.play();
+ }
+ }).catch(err => {
+ console.log(err)
+ })
+ });
+ },
+ /*关闭相机*/
+ closeCamera () {
+ debugger;
+ this.$refs.faceTracking.closeCamera();
+ // this.thisVideo.srcObject.getTracks()[0].stop();
},
getMsgFormSon(data){
- this.limitedPhoto = data;
+ // this.limitedPhoto = data;
},
},
};
diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue
index 0caa4fb..384a3fd 100644
--- a/hb_client/src/views/mtm/material.vue
+++ b/hb_client/src/views/mtm/material.vue
@@ -121,7 +121,7 @@
+
-
+
-
-
-
数据统计
-
-
- 本月：{{contractTotalCurrent}}
- {{contractTotalCount}}
- 合同总数
-
-
- 本月：{{orderTotalCurrent}}
- {{orderTotalCount}}
- 生产订单总数
-
-
- 在制：{{planTotalCurrent}}
- {{planTotalCount}}
- 已排产生产任务
-
-
- 本月：4
- 20
- 累计交付产品数
-
-
-
- 本月：2
- 2
- 累计不合格产品数
-
-
-
-
-
-
-
-
-
+
-
-
- {{ scope.row.material_.number }}
-
-
- {{ scope.row.material_.name }}
-
-
- {{ scope.row.material_.specification }}
-
-
- {{options[scope.row.material_.type]}}
-
-
- {{scope.row.material_.unit}}
-
-
-
-
- {{ scope.row.warehouse_.name }}
-
-
-
+
-
+
-
-
-
-
-
-
-
-
-
+
diff --git a/hb_client/src/views/login/index.vue b/hb_client/src/views/login/index.vue
index 4f256c6..53da72e 100644
--- a/hb_client/src/views/login/index.vue
+++ b/hb_client/src/views/login/index.vue
@@ -64,10 +64,10 @@
- 任务排期
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- {{ scope.row.product_.name }}
-
-
- {{ scope.row.product_.specification }}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ 任务进度
+
+
+ 成品率
+
+
+
+
-
本周
- 本月
- 三个月
+
+ 本周
+
+ 本月
+
+ 三个月
+
-
-
-
- 成品率
-
-
-
-
-
-
-
-
- 本周
- 本月
- 三个月
-
库存列表
更多>>
-
+
+
+ {{ scope.row.material_.number }}
+
+
+ {{ scope.row.material_.name }}
+
+
+ {{ scope.row.material_.specification }}
+
+
+ {{options[scope.row.material_.type]}}
+
+
+ {{scope.row.material_.unit}}
+
+
+
+
+ {{ scope.row.warehouse_.name }}
+
+
+
+
提醒
-
-
-
-
- - 玻璃低于安全库存2021-12-30 --
-
-
- - {{item}}2021-12-20 --
-
-
-
-
-
- - 某某批货临近交货日期2021-12-20 --
-
-
- - {{item}}2021-12-20 --
-
-
-
-
- - 某某批货临近过期2021-11-20 --
-
-
- - {{item}}2021-12-20 --
-
+
+
+
+
+
+
+
+
+
+ -
+
-
+ + {{item.name}}2021-12-30 ++
+
-
+
-
+ + 某某批货临近交货日期2021-12-20 ++
+
-
+ + {{item}}2021-12-20 ++
+
-
+
-
+ + 某某批货临近过期2021-11-20 ++
+
-
+ + {{item}}2021-12-20 ++
+
打卡
-
+ {{item.field_name}}：
+ {{item.field_value}}
+
+
+ {{item.field_name}}：
+ ![]()
+
+
- 下料清单
-
-
-
+ 下料清单
+
创建时间 ：{{watchedCreateTime}}
+
+
-
diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue
index 5c58541..8c9e79c 100644
--- a/hb_client/src/views/wpm/need.vue
+++ b/hb_client/src/views/wpm/need.vue
@@ -613,6 +613,27 @@
+ {{item.field_name}}：
+ {{item.field_value}}
+
+
+ {{item.field_name}}：
+ ![]()
+
+