Merge branch 'develop-cd' of http://39.106.8.246:3003/web/wanda-bm-guide into develop-cd-xxd

src/utils/ganttChart/GanttChart_day.js

@@ -383,15 +383,15 @@ GanttChartDay.prototype.handleClick = function(task, flag, ev) {
 GanttChartDay.prototype.statusColor =function(task) {
   switch (task.statusType) {
     case 1:
-      return ['#c3c7cb', '#e7e9ea'];
+      return ['#e7e9ea', '#c3c7cb'];
     case 2:
-      return ['#5b8ff9', '#5b8ff933'];
+      return ['#dee9fe', '#5b8ff9'];
     case 3:
-      return ['#f58300', '#fbce99'];
+      return ['#fbce99', '#f58300'];
     case 4:
-      return ['#f54e45', '#fbb8b5'];
+      return ['#fbb8b5', '#f54e45'];
     default:
-      return ['#f54e45', '#fbb8b5'];
+      return ['#fbb8b5', '#f54e45'];
   }
 }
 

src/utils/ganttChart/GanttChart_month.js

@@ -28,7 +28,7 @@ export function GanttChartMonth(options) {
   // 拖动定时器
   this.dragTimer = null;
   // 每天的间隔宽度
-  this.dayStep = parseInt(this.cWidth/365*2/3);
+  this.dayStep = parseInt(this.cWidth/365);
   // 分组标题高度
   this.groupTitleHeight = 18;
   // 任务矩形高度

src/views/analysis/GanttChart.vue

@@ -37,7 +37,7 @@
       <div class="chart-container" id="chartContainer" ref="chartContainer">
         <div id="ganttContainer"></div>
       </div>
-      <el-dialog :title="detailTitle" :visible.sync="showDetail" width="840px">
+      <el-dialog :title="ganttDetail.name" :visible.sync="showDetail" width="840px">
         <div class="dialog-container">
           <div class="row task-status">
             <div>
@@ -188,7 +188,7 @@ export default {
 
       // 弹窗相关
       showDetail: false, // 弹框显示状态
-      detailTitle: "", // 弹窗标题
+      // detailTitle: "", // 弹窗标题
       pictures: [
         // {
         //   id: 1,
@@ -434,7 +434,7 @@ export default {
      */
     showDialog(task) {
       this.showDetail = true;
-      this.detailTitle = task._pdata.description;
+      // this.detailTitle = task._pdata.description;
       this.curTask = task;
       this.getGanttDetailData();
       this.getPictureOrReportData(0);
@@ -460,7 +460,8 @@ export default {
             planEndDate,
             realStartDate,
             realEndDate,
-            statusType
+            statusType,
+            name
           } = data;
           let color;
           switch (statusType) {
@@ -483,6 +484,7 @@ export default {
           let newData = {
             status,
             color: color,
+            name: name,
             planTime: this.dealDetailTime(planStartDate, planEndDate),
             realTime: this.dealDetailTime(realStartDate, realEndDate)
           };

src/views/analysis/SpecificationUpdateRecord.vue

@@ -173,7 +173,6 @@ export default {
      * 跳转到工程信息化系统
      */
     changeToSystem(row) {
-      console.log('row', row)
       const { objtype } = row;
       let url;
       switch (objtype) {
@@ -181,14 +180,21 @@ export default {
           url = `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=GCZXWXLINE&uniqueid=${row.id}`;
           break
         case 1: // 维保
-          url = `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.id}`;
+          let value;
+          if (row.apptype === '外委' || row.apptype === '自维') {
+            value = 'WB_GZGL';
+          } else if (row.apptype === '安全维保') {
+            value = 'AQ_WB_GZGL';
+          } else {
+            return
+          }
+          url = `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=${value}&uniqueid=${row.id}`;
           break
         case 2: // 第三方视图
           url = `http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=DSF_GZGL&uniqueid=${row.id}`;
           break
       }
-      console.log('url', url)
-      // window.open(url, '_blank');
+      window.open(url, '_blank');
     }
   },
 }