heyang 2 anos atrás
pai
commit
31bddc7698

+ 1 - 1
package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "demo2",
+  "name": "labBigData",
   "version": "0.1.0",
   "lockfileVersion": 2,
   "requires": true,

+ 1 - 1
package.json

@@ -1,5 +1,5 @@
 {
-  "name": "demo2",
+  "name": "labBigData",
   "version": "0.1.0",
   "private": true,
   "scripts": {

BIN
public/favicon.ico


+ 3 - 1
src/assets/styles/publicEle.scss

@@ -7,7 +7,9 @@
 
   @return $px*100/1080 *1vh;
 }
-
+.el-picker-panel__icon-btn{
+  color:#fff!important;;
+}
 .el-table__empty-text{
   color:rgba(0,0,0,0);
   width:100%;

+ 8 - 0
src/main.js

@@ -17,6 +17,14 @@ Vue.config.productionTip = false
 const router = new VueRouter({
   routes
 });
+router.beforeEach((to, from, next) => {
+
+  if (to.meta.title) {
+    document.title = to.meta.title
+  }
+  next()
+})
+
 
 new Vue({
   router,

+ 2 - 0
src/router/index.js

@@ -123,4 +123,6 @@ const router = [
     },
 
 ]
+
+
 export default router

+ 0 - 3
src/views/home.vue

@@ -497,7 +497,6 @@ export default {
             }
           }else{
             data.forEach(function (item) {
-              console.log(item.content)
               illegalX.push(item.content)
               illegalData.push(item.count)
             })
@@ -519,8 +518,6 @@ export default {
             dataValue.push(data[i].applyNum);
 
           }
-          console.log(dataX)
-          console.log(dataValue)
           this.admittanceFun(dataX,dataValue)
 
         }

+ 5 - 5
src/views/illegalDetail.vue

@@ -168,11 +168,11 @@ export default {
 
           if(data.length<=1){
             illegalDetailData=[
-              ['product', '0', '0', '0', '0', '0','0'],
-              ['0', 0, 0, 0,0,0,0],
-              ['0', 0, 0, 0,0,0,0],
-              ['0', 0, 0, 0,0,0,0],
-              ['0', 0, 0, 0,0,0,0],
+              ['product', '离开未打卡', '未佩戴护目镜', '未佩戴实验手套', '非法闯入', '未穿着实验服','实验室清洁'],
+              ['第一季度', 0, 0, 0,0,0,0],
+              ['第二季度', 0, 0, 0,0,0,0],
+              ['第三季度', 0, 0, 0,0,0,0],
+              ['第四季度', 0, 0, 0,0,0,0],
 
             ]
             dataNum= [