修改甘特图

applications/dee-mes/src/views/assemblyPlanManagement/assemblyPlanMaintenance/content.vue

@@ -24,7 +24,7 @@
         <i class="el-icon-loading" />
         <span>数据加载中···</span>
       </div>
-      <div :id="onlyUuid" :ref="onlyUuid" style="height: calc(100vh - 100px)" />
+      <div :id="onlyUuid" :ref="onlyUuid" class="gannt" style="height: calc(100vh - 100px)" />
     </main>
   </div>
 </template>
@@ -174,7 +174,7 @@ export default {
       }
       ganttStm.templates.task_class = function(st, end, item) {
         if (item.$level === 0) {
-          return 'level' + item.status || ''
+          return item.status || ''
         } else {
           return item.status || ''
         }
@@ -596,7 +596,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .tf-mom-web-content{
   header{
     display: flex;
@@ -654,6 +654,99 @@ export default {
   }
   main{
     padding: 0 8px;
+    .gannt{
+      margin-top: 15px;
+      flex-grow: 1;
+      height: 20px;
+      position: relative;
+      > div {
+        position: relative;
+        height: 100%;
+        &.load {
+          position: absolute;
+          z-index: 1;
+          width: 100%;
+          height: 100%;
+          display: flex;
+          flex-direction: column;
+          justify-content: center;
+          align-items: center;
+          z-index: 99;
+          background-color: #ffffffc7;
+          > i {
+            font-size: 40px;
+            color: #589ce3;
+          }
+          > span {
+            display: block;
+          }
+        }
+      }
+
+      .gantt_link_control {
+        z-index: 10;
+      }
+      .gantt_task_link.critical_path {
+        .gantt_line_wrapper {
+          z-index: 8;
+          div {
+            background-color: red;
+          }
+        }
+        .gantt_link_arrow_right {
+          border-left-color: red;
+        }
+      }
+      .gantt_tooltip {
+        font-size: 14px;
+      }
+      .gantt_bars_area .gantt_task_line {
+        //  background: #F39C4F;
+        //  border: 1px solid #F39C4F;
+        z-index: 15;
+      }
+      .gantt_task_link.critical_path {
+        > .gantt_line_wrapper > div {
+          background-color: #ff1111;
+        }
+        > .gantt_link_arrow_right {
+          border-left-color: #ff1111;
+        }
+      }
+      .gantt_task_line.New {
+        background-color: #59c4e6;
+        border: 1px solid #59c4e6;
+      }
+      .gantt_task_line.Finish {
+        background-color: #97b552;
+        border: 1px solid #97b552;
+      }
+      .gantt_task_line.Run {
+        background-color: #fcce10;
+        border: 1px solid #fcce10;
+      }
+      .gantt_task_cell.week_end {
+        background-color: #eff5fd;
+      }
+      .gantt_task
+        .gantt_task_scale
+        .gantt_scale_line
+        > div:first-child.gantt_scale_cell {
+        color: #f3f6f7;
+      }
+      .gantt_grid_scale,
+      .gantt_task_scale,
+      .gantt_task_vscroll {
+        background-color: #f3f6f7;
+      }
+      .gantt_grid_scale .gantt_grid_head_cell,
+      .gantt_task .gantt_task_scale .gantt_scale_cell {
+        color: #2e2e2e;
+        font-weight: 700;
+        font-size: 14px;
+        border-right: 1px solid rgb(206, 206, 206);
+      }
+    }
   }
 }
 

applications/dee-mes/src/views/taskExecution/components/RecordMaintenance/index.vue

@@ -26,6 +26,13 @@
               trigger="hover"
               popper-class="record-maintenance-popper"
             >
+              <DeeUploadTable
+                v-model="scope.row.objFileLinks"
+                app-name="tf-mom"
+                :read-only="false"
+                :config-item="tableConfig"
+                :table-columns="tableColumns"
+              />
               <!-- <upload-files v-model="objFileLinks" /> -->
               <span slot="reference" style="cursor: pointer;olor: #409eff;">
                 附件浏览
@@ -55,9 +62,7 @@
 </template>
 <script>
 import { post } from '@/utils/http'
-// import UploadFiles from '@/components/Lean/UploadFiles'
 export default {
-  // components: { UploadFiles },
   data() {
     return {
       visible: false,
@@ -159,6 +164,65 @@ export default {
           width: 120
         }
       ],
+      tableColumns: [
+        {
+          'title': '文件名',
+          'key': 'target.originalFileName',
+          'parentKey': 'target',
+          'headerAlign': 'center',
+          'align': 'left'
+        },
+        {
+          'title': '文件大小',
+          'key': 'target.fileSize',
+          'parentKey': 'target',
+          'level': 1,
+          'show': true,
+          'headerAlign': 'center',
+          'align': 'left'
+        },
+        {
+          'title': '扩展名',
+          'key': 'target.fileExtension',
+          'parentKey': 'target',
+          'level': 1,
+          'show': true,
+          'headerAlign': 'center',
+          'align': 'left'
+        }
+      ],
+      tableConfig: {
+        component: {
+          alimit: 1,
+          appendFilter: ['ATTACH_FILE', 'SECONDARY', 'FLOW_FILE', 'PROCESS_CONTENTROLE_PDF'],
+          appendTitle: '附件',
+          appendUploadFilter: 'ATTACH_FILE',
+          defaultValueSelfFun: 'return null',
+          disabled: false,
+          filterKey: 'contentType',
+          // limit: 1,
+          masterFilter: ['MASTER_FILE', 'PRIMARY'],
+          masterTitle: '主内容',
+          masterUploadFilter: 'MASTER_FILE',
+          mlimit: 1,
+          mrequired: true,
+          name: 'DeeUploadTable',
+          placeholder: '',
+          required: false,
+          showFileList: true,
+          state: 'edit',
+          taleType: 'single',
+          url: '/dfs/fileManager/feign/uploadFile'
+        },
+        descriptionShowMode: 'text',
+        hidden: false,
+        key: 'objFileLinks',
+        name: '附件',
+        parentKey: 'objFileLinks',
+        premMark: true,
+        title: '',
+        width: 3
+      },
       objFileLinks: [],
       // 表格数据
       tableData: []