对接了日执行-修改计划-撒料计划及撒料计划顺序

.env.development

@@ -5,6 +5,11 @@ ENV = 'development'
 # 测试线
 # VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
 
+<<<<<<< HEAD
+=======
+
+# 测试连这个1111
+>>>>>>> 0b4eb5e13920ae5c62cff4a41331a02241eb8c77
 VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 
 # 沙巍

src/views/basicData/feedTable/index.vue

@@ -1014,7 +1014,7 @@ export default {
               tHeader: [
                '饲料名称', '饲料分类', '唯一编码',  '饲料来源', '计划类型', '允许误差数（kg）', '包装单位重量(kg)', '单价', '跳转重量域(kg)', '跳转延时', '确认开始', '继电器位置', '无上域', '备用字段01', '备用字段02', '备用字段03'
              ],
-              filterVal:  ['fname', 'fclass', 'feedcode', '', '','', '', '', '', '', '', '', '', '', '', ''],
+              filterVal:  ['', '', '', '', '','', '', '', '', '', '', '', '', '', '', ''],
               tableDatas: this.download.list,
               sheetName: 'Sheet1'
             }, {

src/views/systemManagement/customboard2/Addboard2/index.vue

@@ -0,0 +1,109 @@
+<template>
+
+  <div v-loading="loading" class="container" style="position:relactive">
+  
+  </div>
+
+</template>
+
+<script>
+import draggable from 'vuedraggable'
+ 
+import { GetDataByName } from '@/api/common'
+import Cookies from 'js-cookie'
+ 
+export default {
+  name: 'Addboard2',
+  components: {  draggable },
+  data() {
+    return {
+      isRoleEdit: [],
+      isEdit: 'view',
+      dashboardList: [],
+      currentDashboard: undefined,
+      editDialogVisible: false,
+      dbObj: {},
+      loading: false,
+      isCollapse: false,
+      did: undefined,
+      isTitle: '2',
+      editBtn: false,
+      control_btn: '编辑',
+      control_btn_l: false,
+
+ 
+
+    }
+  },
+
+  created() {
+    // console.log('this.$route.params.id', this.$route.params.id)
+    // const isEdit = this.$route.params.isEdit
+
+    // this.isEdit = isEdit
+ 
+    this.getList()
+  },
+
+  methods: {
+
+     
+
+    getList() {
+      this.loading = true
+
+      // if (this.$route.params.id) {
+      //   this.did = this.$route.params.id
+      // } else {
+      //   this.did = this.did
+      // }
+
+     
+    } 
+   
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  display: flex;
+  min-height: calc(100vh - 62px);
+  // align-items: stretch;
+  .dashboard-list {
+    width: 250px;
+    min-height: 100%;
+    padding: 20px 10px;
+    /deep/ .el-card__header {
+      div {
+        display: flex;
+        justify-content: space-between;
+        font-size: 14px;
+        color: #606266;
+        i {
+          cursor: pointer;
+        }
+      }
+      padding: 5px 0px;
+    }
+    .dashboard-list-item {
+      display: flex;
+      justify-content: space-between;
+      line-height: 35px;
+      font-size: 14px;
+      cursor: pointer;
+      color: #606266;
+      i {
+        margin-right: 10px;
+        line-height: 35px;
+      }
+    }
+    .high-light-dashboard {
+      color: #205cd8;
+    }
+  }
+  .dashboard-wrapper {
+    width: 100%;
+  }
+}
+</style>