Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhbigscreen into dev

public/css/largeScreenStyle.css

@@ -1399,7 +1399,6 @@ table{
     height: 30px;
 }
 .project-expect-title-No{
-    width: 35px;
     border-bottom: 1px solid #69b9fe;
     text-align: center;
     line-height: 30px;

src/pages/components/MonitAndWarning.vue

@@ -103,12 +103,17 @@ export default {
         this.getMonitAndWarning();
       }
     });
+    if (this.$root.hasInitHeader) {
+      this.initMe();
+    }
   },
   created() {
-    this.init();
+    this.initMe();
   },
   methods: {
-    init() {
+    initMe() {
+      this.prjInfo = this.$root.project || {};
+      this.deptInfo = this.$root.dept || {};
       this.getMonitAndWarning();
     },
     getMonitAndWarning() {