fujunwen 4 年 前
コミット
e3ff2d938b

+ 6 - 0
src/App.vue

@@ -287,4 +287,10 @@ body {
     line-height: 26px;
   }
 }
+.el-dialog__header{
+  border-bottom: 1px solid rgba(239,240,241,1);
+}
+.gantt-chart .el-dialog__title{
+  font-weight: 500;
+}
 </style>

+ 21 - 0
src/assets/svg/menu.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="12px" viewBox="0 0 16 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
+    <title>菜单</title>
+    <desc>Created with Sketch.</desc>
+    <g id="各种首页" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="甘特图-弹窗" transform="translate(-301.000000, -563.000000)" fill-rule="nonzero">
+            <g id="编组-3">
+                <g id="菜单" transform="translate(301.000000, 561.000000)">
+                    <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect>
+                    <path d="M0.699333328,3.66666667 C0.699333328,4.21895142 1.14704858,4.66666667 1.69933333,4.66666667 C2.25161808,4.66666667 2.69933333,4.21895142 2.69933333,3.66666667 C2.69933333,3.11438192 2.25161808,2.66666667 1.69933333,2.66666667 C1.14704858,2.66666667 0.699333328,3.11438192 0.699333328,3.66666667 Z" id="路径" fill="#8D9399"></path>
+                    <path d="M0.666666672,8.28 C0.666666672,8.83228475 1.11438192,9.28 1.66666667,9.28 C2.21895142,9.28 2.66666667,8.83228475 2.66666667,8.28 C2.66666667,7.72771525 2.21895142,7.28 1.66666667,7.28 C1.11438192,7.28 0.666666672,7.72771525 0.666666672,8.28 Z" id="路径" fill="#8D9399"></path>
+                    <path d="M0.666666672,12.984 C0.666666672,13.5362847 1.11438192,13.984 1.66666667,13.984 C2.21895142,13.984 2.66666667,13.5362847 2.66666667,12.984 C2.66666667,12.4317153 2.21895142,11.984 1.66666667,11.984 C1.11438192,11.984 0.666666672,12.4317153 0.666666672,12.984 Z" id="路径" fill="#8D9399"></path>
+                    <path d="M4.38333333,2.988 L14.3833333,2.988 C14.8277778,2.988 15.05,3.21022222 15.05,3.65466667 L15.05,3.65466667 C15.05,4.09911112 14.8277778,4.32133333 14.3833333,4.32133333 L4.38333333,4.32133333 C3.93888888,4.32133333 3.71666667,4.09911111 3.71666667,3.65466667 L3.71666667,3.65466667 C3.71666667,3.21022222 3.93888889,2.988 4.38333333,2.988 L4.38333333,2.988 Z" id="路径" fill="#8D9399"></path>
+                    <path d="M4.38333333,7.65466667 L14.3833333,7.65466667 C14.8277778,7.65466667 15.05,7.87688889 15.05,8.32133333 L15.05,8.32133333 C15.05,8.76577778 14.8277778,8.988 14.3833333,8.988 L4.38333333,8.988 C3.93888888,8.988 3.71666667,8.76577778 3.71666667,8.32133333 L3.71666667,8.32133333 C3.71666667,7.87688888 3.93888889,7.65466667 4.38333333,7.65466667 Z" id="路径" fill="#8D9399"></path>
+                    <path d="M4.38333333,12.3213333 L14.3833333,12.3213333 C14.8277778,12.3213333 15.05,12.5435556 15.05,12.988 L15.05,12.988 C15.05,13.4324444 14.8277778,13.6546667 14.3833333,13.6546667 L4.38333333,13.6546667 C3.93888888,13.6546667 3.71666667,13.4324444 3.71666667,12.988 L3.71666667,12.988 C3.71666667,12.5435556 3.93888889,12.3213333 4.38333333,12.3213333 Z" id="路径" fill="#8D9399"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

ファイルの差分が大きいため隠しています
+ 16 - 0
src/assets/svg/picture.svg


ファイルの差分が大きいため隠しています
+ 20 - 0
src/assets/svg/plan_time.svg


ファイルの差分が大きいため隠しています
+ 18 - 0
src/assets/svg/real_time.svg


ファイルの差分が大きいため隠しています
+ 19 - 0
src/assets/svg/report.svg


ファイルの差分が大きいため隠しています
+ 18 - 0
src/assets/svg/task.svg


+ 79 - 1
src/views/analysis/GanttChart.vue

@@ -35,7 +35,38 @@
         <div id="ganttContainer"></div>
       </div>
       <el-dialog :title="detailTitle" :visible.sync="showDetail" width="840px">
+        <div class="dialog-container">
+          <div class="row task-status">
+            <div>
+              <Task class="icon"/>
+              <div class="title">任务状态</div>
+            </div>
+            <div>进行中</div>
+          </div>
+          <div class="row">
+            <div>
+              <PlanTime class="icon" />
+              <div class="title">计划时间</div>
+            </div>
+            <div class="info">2020.05.02 09:00-2020.05.30 12:00</div>
+          </div>
+          <div class="row">
+            <div>
+              <RealTime class="icon" />
+              <div class="title">实际执行时间</div>
+            </div>
+            <div class="info">2020.05.02 09:00-</div>
+          </div>
+          <div class="row picture">
+            <div>
+              <Picture class="icon" />
+              <div class="title">照片</div>
+            </div>
+            <div>
 
+            </div>
+          </div>
+        </div>
       </el-dialog>
     </div>
   </div>
@@ -50,6 +81,10 @@ import moment from 'moment';
 // import '../../utils/ganttChart/g.js';
 import { GanttChart } from '../../utils/ganttChart/GanttChart.js';
 import { parse } from 'path';
+import Task from '../../assets/svg/task.svg';
+import PlanTime from '../../assets/svg/plan_time.svg';
+import RealTime from '../../assets/svg/real_time.svg';
+import Picture from '../../assets/svg/picture.svg';
 export default {
   data () {
     return {
@@ -70,7 +105,12 @@ export default {
     }
   },
 
-  components: {},
+  components: {
+    Task,
+    PlanTime,
+    RealTime,
+    Picture
+  },
 
   computed: {},
 
@@ -278,5 +318,43 @@ export default {
       overflow: hidden;
     }
   }
+  .dialog-container{
+    .row{
+      display: flex;
+      >div:first-child{
+        margin-right: 24px;
+        display: flex;
+        align-items: center;
+      }
+      &:not(:last-of-type){
+        margin-bottom: 14px;
+      }
+      .info{
+        font-size: 14px;
+        color: #1F2429;
+        line-height: 22px;
+      }
+    }
+    .icon{
+      margin-right: 6px;
+      width: 16px;
+    }
+    .title{
+      width: 84px;
+      font-size: 14px;
+      color: #646C73;
+      line-height: 22px;
+      font-weight: 400;
+    }
+    .task-status>div:nth-of-type(2){
+      width: 58px;
+      height: 24px;
+      background: rgba(91,143,249,0.2);
+      border-radius: 2px;
+      color: #5B8FF9;
+      line-height: 24px;
+      text-align: center;
+    }
+  }
 }
 </style>

+ 3 - 2
src/views/analysis/SpecificationUpdateRecord.vue

@@ -50,12 +50,13 @@ export default {
   data () {
     return {
       incidentList: [
+        {id: 'all', name: '全部'},
         {id: 0, name: '专维'},
         {id: 1, name: '维保'},
         {id: 2, name: '第三方检测'},
         {id: 3, name: '重点关注'},
       ], // 事件列表
-      incidentType: '', // 事件类型
+      incidentType: 'all', // 事件类型
       timeVal: '', // 时间
       tableData: [], // 表数据
       curPage: 1, // 当前页码
@@ -92,7 +93,7 @@ export default {
       if (this.endTime !== '') {
         param.changeDateEndDate = this.endTime;
       }
-      if (this.incidentType !== '') {
+      if (this.incidentType !== 'all') {
         param.objtype = this.incidentType;
       }
       getSpecificaltionData('/data/rpt_change_record/query', param).then((res) => {