试验计划——计划排期：查询列表显示（ceshi不用了）

itdmWeb/src/api/api.js

@@ -56,6 +56,9 @@ const queryMyDepartTreeList = (params)=>getAction("/sys/sysDepart/queryMyDeptTre
 const checkGuzhang = (params) => putAction('/itdmDevice/itdmDevice/edit1', params)
 // 获取设备下拉列表
 const getDeviceList = (params) => getAction('/itdmDevice/itdmDevice/xialalist', params)
+// 计划员计划列表
+const getJhList = (params) => getAction('/sych/JHYList', params)
+
 
 
 //日志管理
@@ -163,7 +166,8 @@ export {
   getUserNoticeInfo,
   getDictItemsFromCache,
   checkGuzhang,
-  getDeviceList
+  getDeviceList,
+  getJhList
 }
 
 

itdmWeb/src/components/Gantt.vue

@@ -5,7 +5,7 @@
 
 <script>
 import {gantt} from 'dhtmlx-gantt';
-import {getDeviceList} from '@/api/api'
+import {getDeviceList,getJhList} from '@/api/api'
 export default {
   name: 'gantt',
   props: {
@@ -16,168 +16,17 @@ export default {
       }
     }
   },
+  data () {
+    return {
+      queryParam:{
+        weituoId: undefined
+      }
+    }
+  },
   created() {
     this.getDevicelist();
+    console.log(1112,this.tasks)
   },
-  // mounted: function () {
-  //   // 启用动态加载
-  //     gantt.config.branch_loading = true
-  //     //日期格式化
-  //     gantt.config.xml_date = "%Y-%m-%d";
-  //     gantt.config.order_branch = true;
-  //     gantt.config.order_branch_free = true;
-  //     //左侧是否自适应
-  //     gantt.config.autofit = true;
-  //     gantt.config.drag_links = false;//连线
-  //     gantt.config.readonly = false;  //只读
-  //     gantt.config.date_scale = "%m月%d日"; //右侧显示列名
-  //     gantt.config.layout = {//拖拽布局
-  //       css: "gantt_container",
-  //       rows: [
-  //         {
-  //           cols: [
-  //             { view: "grid", id: "grid", scrollX: "scrollHor", scrollY: "scrollVer" },
-  //             { resizer: true, width: 1 },
-  //             { view: "timeline", id: "timeline", scrollX: "scrollHor", scrollY: "scrollVer" },
-  //             { view: "scrollbar", scroll: "y", id: "scrollVer" }
-  //           ]
-  //         },
-  //         { view: "scrollbar", scroll: "x", id: "scrollHor", height: 20 }
-  //       ]
-  //     };
-  //     gantt.config.start_on_monday = true;
-  //     gantt.config.work_time = true;
-  //     gantt.config.fit_tasks = true;   //自动调整图表坐标轴区间用于适配task的长度
-  //   // 甘特图汉化
-  //   gantt.locale = {
-  //       date: {
-  //         month_full: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"],
-  //         month_short: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
-  //         day_full: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"],
-  //         day_short: ["日", "一", "二", "三", "四", "五", "六"]
-  //       },
-  //       labels: {
-  //         dhx_cal_today_button: "今天",
-  //         day_tab: "日",
-  //         week_tab: "周",
-  //         month_tab: "月",
-  //         new_event: "新建日程",
-  //         icon_save: "保存",
-  //         icon_cancel: "关闭",
-  //         icon_details: "详细",
-  //         icon_edit: "编辑",
-  //         icon_delete: "删除",
-  //         confirm_closing: "请确认是否撤销修改!", //Your changes will be lost, are your sure?
-  //         confirm_deleting: "是否删除计划?",
-  //         section_description: "描述:",
-  //         section_time: "时间范围:",
-  //         section_type: "类型:",
-  //         section_text: "计划名称:",
-  //         section_test: "测试:",
-  //         section_projectClass: "项目类型:",
-  //         taskProjectType_0: "项目任务",
-  //         taskProjectType_1: "普通任务",
-  //         section_head: "项目经理:",
-  //         section_device: "试验设备:",
-  //         section_priority: '优先级:',
-  //         taskProgress: '任务状态',
-  //         taskProgress_0: "未开始",
-  //         taskProgress_1: "进行中",
-  //         taskProgress_2: "已完成",
-  //         taskProgress_3: "已延期",
-  //         taskProgress_4: "搁置中",
-  //         section_template: 'Details',
-  //         /* grid columns */
-  //         column_text: "计划名称",
-  //         column_sample: "样品名称",
-  //         column_project: "检测项目",
-  //         column_start_date: "开始时间",
-  //         column_duration: "持续时间",
-  //         column_add: "",
-  //         column_priority: "难度",
-  //         /* link confirmation */
-  //         link: "关联",
-  //         confirm_link_deleting: "将被删除",
-  //         link_start: " (开始)",
-  //         link_end: " (结束)",
-  //         type_task: "任务",
-  //         type_project: "项目",
-  //         type_milestone: "里程碑",
-  //
-  //         minutes: "分钟",
-  //         hours: "小时",
-  //         days: "天",
-  //         weeks: "周",
-  //         months: "月",
-  //         years: "年"
-  //       }
-  //     };
-  //
-  //   //定义各种编辑器及类型
-  //   // var textEditor = {type: "text", map_to: "text"};
-  //   // var startDateEditor = {type: "date", map_to: "start_date"};
-  //   // var endDateEditor = {type: "date", map_to: "end_date"};
-  //   //设置甘特图中各个列相关配置
-  //   gantt.config.columns = [
-  //     { name: "text", min_width:100,max_width:200, label:"任务", align: "left",resize: true, tree: true },
-  //     { name: "sample", label: "样品名称", width: 130, resize: true, align: "left" },
-  //     { name: "project", label: "检测项目", width: 130, resize: true, align: "left" },
-  //     { name: "start_date", label: "开始时间", width: 130, resize: true, align: "left" },
-  //     { name: "end_date", label: "结束时间", width: 130, resize: true, align: "left" },
-  //     { name: "add", label:"", width: 30 },
-  //     // {
-  //     //   name: 'text',
-  //     //   label: '项目名称',
-  //     //   editor: textEditor,
-  //     //   resize: true,
-  //     //   tree: true,
-  //     //   width: '100',
-  //     // },
-  //     // {
-  //     //   name: 'start_date',
-  //     //   label: '项目开始时间',
-  //     //   align: "center",
-  //     //   editor: startDateEditor,
-  //     //   resize:true,
-  //     //   tree: false,
-  //     //   width: '130',
-  //     // },
-  //     // {
-  //     //   name: 'end_date',
-  //     //   label: '项目结束时间',
-  //     //   width: '130',
-  //     //   align: 'center',
-  //     //   editor: endDateEditor,
-  //     //   resize: true,
-  //     // },
-  //   ];
-  //   // var staff = [
-  //   //       { id: 1, label: '大王' },
-  //   //       { id: 2, label: '小王' },
-  //   //       { id: 3, label: '老王' }
-  //   //   ];
-  //     //弹出层
-  //     gantt.config.lightbox.sections = [
-  //       { name: "text", height: 30, map_to: "text", type: "textarea", focus: true, width: "*" },
-  //       {
-  //         name: "time", height: 40, map_to: "auto", type: "duration",
-  //         time_format: ["%Y", "%m", "%d"],
-  //       },
-  //       { name: "head", height: 30, map_to: "head_id", type: "select", options:gantt.serverList("staff") },
-  //       {
-  //         name: "device", height: 30, map_to: "device_id", type: "select", options: gantt.serverList('staff',[]),
-  //       },
-  //       { name: "description", height: 70, map_to: "description", type: "textarea" },
-  //       // {
-  //       //   name: "priority", height: 40, map_to: "priority", type: "radio", options: gantt.serverList("priority")
-  //       // },
-  //
-  //     ];
-  //
-  //
-  //   gantt.init(this.$refs.gantt);
-  //   gantt.parse(this.$props.tasks);
-  // },
   methods: {
     getDevicelist(){
       getDeviceList().then((res) => {
@@ -195,6 +44,26 @@ export default {
         this.initData()
       })
     },
+    getinit(queryParam){
+      console.log(22,queryParam)
+      getJhList(queryParam).then((res) => {
+        console.log(res.result)
+        this.tasks.data = res.result.map(res => {
+          return {
+            id: res.testItemsId,
+            // text:res.reportNo,
+            start_date:res.jihuaStartDate,
+            duration:res.lastTime,
+            sampleName:res.sampleName,
+            testItems:res.testItems
+
+          }
+        })
+        gantt.init(this.$refs.gantt);
+        gantt.parse(this.$props.tasks);
+        console.log(33,this.tasks)
+      })
+    },
     initData(){
         // 启用动态加载
         gantt.config.branch_loading = true
@@ -219,8 +88,26 @@ export default {
               ]
             },
             { view: "scrollbar", scroll: "x", id: "scrollHor", height: 20 }
-          ]
+          ],
+          // cols: [
+          //   {
+          //     width:400,
+          //     min_width: 300,
+          //     rows:[
+          //       {view: "grid", scrollX: "gridScroll", scrollable: true, scrollY: "scrollVer"},
+          //       {view: "scrollbar", id: "gridScroll", group:"horizontal"}            ]
+          //   },
+          //   {resizer: true, width: 1},
+          //   {
+          //     rows:[
+          //       {view: "timeline", scrollX: "scrollHor", scrollY: "scrollVer"},
+          //       {view: "scrollbar", id: "scrollHor", group:"horizontal"}            ]
+          //   },
+          //   {view: "scrollbar", id: "scrollVer"}
+          // ]
         };
+        // 重置布局
+        gantt.resetLayout();
         gantt.config.start_on_monday = true;
         gantt.config.work_time = true;
         gantt.config.fit_tasks = true;   //自动调整图表坐标轴区间用于适配task的长度
@@ -265,8 +152,8 @@ export default {
             section_template: 'Details',
             /* grid columns */
             column_text: "计划名称",
-            column_sample: "样品名称",
-            column_project: "检测项目",
+            column_sampleName: "样品名称",
+            column_testItems: "检测项目",
             column_start_date: "开始时间",
             column_duration: "持续时间",
             column_add: "",
@@ -289,49 +176,47 @@ export default {
           }
         };
 
-        //定义各种编辑器及类型
+        //定义各种编辑器及类型(可直接双击左侧进行编辑，不需要弹窗)
         // var textEditor = {type: "text", map_to: "text"};
         // var startDateEditor = {type: "date", map_to: "start_date"};
         // var endDateEditor = {type: "date", map_to: "end_date"};
         //设置甘特图中各个列相关配置
+        // gantt.config.columns = [
+        //   {
+        //     name: 'text',
+        //     label: '项目名称',
+        //     editor: textEditor,
+        //     resize: true,
+        //     tree: true,
+        //     width: '100',
+        //   },
+        //   {
+        //     name: 'start_date',
+        //     label: '项目开始时间',
+        //     align: "center",
+        //     editor: startDateEditor,
+        //     resize:true,
+        //     tree: false,
+        //     width: '130',
+        //   },
+        //   {
+        //     name: 'end_date',
+        //     label: '项目结束时间',
+        //     width: '130',
+        //     align: 'center',
+        //     editor: endDateEditor,
+        //     resize: true,
+        //   },
+        // ];
+        // 左侧列表内容
         gantt.config.columns = [
-          { name: "text", min_width:100,max_width:200, label:"任务", align: "left",resize: true, tree: true },
-          { name: "sample", label: "样品名称", width: 130, resize: true, align: "left" },
-          { name: "project", label: "检测项目", width: 130, resize: true, align: "left" },
-          { name: "start_date", label: "开始时间", width: 130, resize: true, align: "left" },
-          { name: "end_date", label: "结束时间", width: 130, resize: true, align: "left" },
-          { name: "add", label:"", width: 30 },
-          // {
-          //   name: 'text',
-          //   label: '项目名称',
-          //   editor: textEditor,
-          //   resize: true,
-          //   tree: true,
-          //   width: '100',
-          // },
-          // {
-          //   name: 'start_date',
-          //   label: '项目开始时间',
-          //   align: "center",
-          //   editor: startDateEditor,
-          //   resize:true,
-          //   tree: false,
-          //   width: '130',
-          // },
-          // {
-          //   name: 'end_date',
-          //   label: '项目结束时间',
-          //   width: '130',
-          //   align: 'center',
-          //   editor: endDateEditor,
-          //   resize: true,
-          // },
+          // { name: "text", min_width:100,max_width:200, label:"任务", align: "left",resize: true, tree: true },
+          { name: "testItems", label: "检测项目", width: 130, resize: true, align: "left",resize: true, tree: true },
+          { name: "sampleName", label: "样品名称", width: 130, resize: true, align: "center" },
+          { name: "start_date", label: "开始时间", width: 130, resize: true, align: "center" },
+          { name: "end_date", label: "结束时间", width: 130, resize: true, align: "center" },
+          { name: "add", label:"", width: 30 }
         ];
-        // var staff = [
-        //       { id: 1, label: '大王' },
-        //       { id: 2, label: '小王' },
-        //       { id: 3, label: '老王' }
-        //   ];
         //弹出层
         gantt.config.lightbox.sections = [
           { name: "text", height: 30, map_to: "text", type: "textarea", focus: true, width: "*" },
@@ -361,5 +246,3 @@ export default {
 <style>
     @import "~dhtmlx-gantt/codebase/dhtmlxgantt.css";
 </style>
-
-</style>

itdmWeb/src/views/module-iTDM/itdmTestPlan/itdmTestPlanList1.vue

@@ -0,0 +1,88 @@
+{{ src/App.vue }}
+<template>
+  <div class="container" style="height:650px;">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="getHjlist">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="委托编号">
+              <a-input placeholder="请输入委托编号" v-model="tasks.queryParam.weituoId"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="getHjlist" icon="search">查询</a-button>
+              <!-- <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> -->
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <gantt ref="gantt" class="left-container" :tasks="tasks" style="height:600px;"></gantt>
+  </div>
+</template>
+
+<script>
+import Gantt from '../../../components/Gantt.vue';
+
+import { getAction } from '@api/manage'
+import { gantt } from 'dhtmlx-gantt'
+
+export default {
+  name: 'app',
+  components: {Gantt},
+  data () {
+    return {
+      tasks: {
+        data: [
+          // {id: 1, text: 'Task #1', start_date: '2020-01-17', duration: 3, progress: 0.6,"open": true},
+          // {id: 1, text: 'Task #1', start_date: '2020-01-17', duration: 3},
+          // {id: 2, text: 'Task #2', start_date: '2020-01-20', duration: 3}
+          // {"id":"1", "text":"Project #2", "start_date":"2020-01-17", "duration":3, "sampleName":"样品名称", "testItems":"检测项目" ,},
+          // {"id":"2", "text":"Task #1", "start_date":"2020-01-17", "duration":17,  "parent":"1"},
+          // {"id":"3", "text":"Task #2", "start_date":"2020-01-20", "duration":1,  "parent":"1"}
+        ],
+        // links: [
+        //   {id: 1, source: 1, target: 2, type: '0'},
+        //   {id: 2, source: 2, target: 3, type: '0'},
+        // ],
+        collections: {
+          staff:[],
+          staff2:[],
+        },
+        queryParam:{
+          weituoId: undefined
+        }
+      },
+    }
+  },
+  methods: {
+    getHjlist(){
+      let that = this
+      console.log(that.tasks.queryParam.weituoId)
+      var queryParam = that.tasks.queryParam
+      console.log(11,queryParam)
+      this.$refs.gantt.getinit( queryParam )
+
+    }
+  }
+}
+</script>
+
+<style>
+  html, body {
+    height: 100%;
+    margin: 0;
+    padding: 0;
+    /* overflow:hidden; */
+  }
+  .container {
+    height: 100%;
+    width: 100%;
+  }
+  .left-container {
+    overflow: hidden;
+    position: relative;
+    height: 100%;
+  }
+</style>