hfxc226 3 年之前
父節點
當前提交
b9eebfb9ad

+ 1 - 0
public/hitch-screen/index.html

@@ -11,6 +11,7 @@
 </head>
 <body>
   <div class="title-name">设备运行状态一览图</div>
+  <div class="title-icon"><span>正常设备</span><span>计划性维修设备</span><span>非计划性维修设备</span></div>
   <div id="echart" class="echart"></div>
   <div class="data">
     <div>

二進制
public/hitch-screen/static/blue.png


+ 92 - 12
public/hitch-screen/static/index.css

@@ -1,14 +1,94 @@
-body{padding:0px;margin:0px;width:1920px;height:1080px;}
-.echart{float:left;width:1334px;height:1080px;}
-.data{float:right;width:586px;height:1080px;background:url("right.png") no-repeat;}
-.data>div:nth-child(1){margin-top:240px;width:100%;font-size:40px;color:#ffffff;text-align:center;}
-.data>div:nth-child(2){margin-top:30px;width:100%;font-size:16px;color:#ffffff;text-align:center;}
+body {
+  padding: 0px;
+  margin: 0px;
+  width: 1920px;
+  height: 1080px;
+}
+
+.echart {
+  float: left;
+  width: 1334px;
+  height: 1080px;
+}
+
+.data {
+  float: right;
+  width: 586px;
+  height: 1080px;
+  background: url("right.png") no-repeat;
+}
+
+.data > div:nth-child(1) {
+  margin-top: 240px;
+  width: 100%;
+  font-size: 40px;
+  color: #ffffff;
+  text-align: center;
+}
+
+.data > div:nth-child(2) {
+  margin-top: 30px;
+  width: 100%;
+  font-size: 16px;
+  color: #ffffff;
+  text-align: center;
+}
+
 /*.data>div:nth-child(2)>span:nth-child(1){padding-left:22px;background:url("red.png") no-repeat 5px 5px;}
 .data>div:nth-child(2)>span:nth-child(2){padding-left:22px;background:url("green.png") no-repeat 5px 5px;}*/
-.data>div:nth-child(3){margin-top:70px;color:#ffffff;}
-.data .item{float:left;clear:both;padding-left:50px;margin-bottom: 10px;}
-.data .item>span{float:left;line-height:30px;text-align:center;}
-.data .item>span:nth-child(1){width:100px;}
-.data .item>span:nth-child(2){width:200px;}
-.data .item>span:nth-child(3){width:150px;}
-.data .title{color:#2495bf;}
+.data > div:nth-child(3) {
+  margin-top: 70px;
+  color: #ffffff;
+}
+
+.data .item {
+  float: left;
+  clear: both;
+  padding-left: 50px;
+  margin-bottom: 10px;
+}
+
+.data .item > span {
+  float: left;
+  line-height: 30px;
+  text-align: center;
+}
+
+.data .item > span:nth-child(1) {
+  width: 100px;
+}
+
+.data .item > span:nth-child(2) {
+  width: 200px;
+}
+
+.data .item > span:nth-child(3) {
+  width: 150px;
+}
+
+.data .title {
+  color: #2495bf;
+}
+
+.title-icon {
+  position: absolute;
+  top: 175px;
+  left: 24%;
+  color: black;
+  z-index: 10000;
+}
+
+.title-icon span:nth-child(1) {
+  padding-left: 22px;
+  background: url("green.png") no-repeat 5px 5px;
+}
+
+.title-icon span:nth-child(2) {
+  padding-left: 22px;
+  background: url("yellow.png") no-repeat 5px 5px;
+}
+
+.title-icon span:nth-child(3) {
+  padding-left: 22px;
+  background: url("red.png") no-repeat 5px 5px;
+}

二進制
public/hitch-screen/static/yellow.png


+ 6 - 0
public/tui-calendar/checkJobCalendar.html

@@ -9,6 +9,12 @@
     <link rel="stylesheet" type="text/css" href="./dist/tui-calendar.css">
     <link rel="stylesheet" type="text/css" href="./css/default.css">
     <link rel="stylesheet" type="text/css" href="./css/icons.css">
+  <style>
+    .tui-full-calendar-section-button {
+      display: none;
+    }
+
+  </style>
 </head>
 <body>
     <div id="top">

+ 4 - 4
public/tui-calendar/js/app.js

@@ -7,7 +7,7 @@
 
 (function(window, Calendar) {
     var cal, resizeThrottled;
-    var useCreationPopup = true;
+    var useCreationPopup = false;
     var useDetailPopup = true;
     var datePicker, selectedCalendar;
 
@@ -35,14 +35,14 @@
             console.log('clickMore', e);
         },
         'clickSchedule': function(e) {
-            console.log('clickSchedule', e);
+          console.log('clickSchedule', e);
         },
         'clickDayname': function(date) {
             console.log('clickDayname', date);
         },
         'beforeCreateSchedule': function(e) {
             console.log('beforeCreateSchedule', e);
-            saveNewSchedule(e);
+            // saveNewSchedule(e);
         },
         'beforeUpdateSchedule': function(e) {
             var schedule = e.schedule;
@@ -352,7 +352,7 @@
           // 更新localStorage的数据
           ScheduleList.forEach((item) => {
             if(item.id == schedule.id){
-              alert("找:" + new Date(changes.start) + "到:" + new Date(changes.end))
+              // alert("找:" + new Date(changes.start) + "到:" + new Date(changes.end))
               item.start = new Date(changes.start);
               item.end = new Date(changes.end);
               return;

+ 1 - 1
src/views/repair/application-form/modules/BaseForm.vue

@@ -40,7 +40,7 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="维修类别"
+            label="工单类别"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >