diff --git a/src/views/energy/analysis/contrastAnalysis/components/barChart.vue b/src/views/energy/analysis/contrastAnalysis/components/barChart.vue
index 943c5a36..075996b6 100644
--- a/src/views/energy/analysis/contrastAnalysis/components/barChart.vue
+++ b/src/views/energy/analysis/contrastAnalysis/components/barChart.vue
@@ -97,6 +97,22 @@ export default {
           trigger: 'axis',
           axisPointer: {
             type: 'shadow'
+          },
+          formatter: function(params) {
+            return (
+              params[0].axisValue + 
+              `<br>` +
+              params.map((item) => {
+                let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${item.color};"></span>`
+                let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</span>`
+						let value = item.value ? item.value : '-'
+						let valueStr = `<span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${value}</span>`
+						return `<span style="display:flex; justify-content:space-between; margin-bottom: 2px">
+									<span>${str}${seriesNameStr}</span>
+									<span>${valueStr}</span>
+								</span>`
+              }).join(``)
+            )
           }
         },
         grid: {
@@ -106,7 +122,11 @@ export default {
           containLabel: true
         },
         legend: {
-          data: legendData
+          data: legendData,
+          right: '1%',
+          icon: 'rect',
+          itemHeight: 8,
+          itemWidth: 8
         },
         xAxis: {
           type: 'category',
diff --git a/src/views/energy/analysis/contrastAnalysis/components/lineChart.vue b/src/views/energy/analysis/contrastAnalysis/components/lineChart.vue
index ae958da9..b1cc088e 100644
--- a/src/views/energy/analysis/contrastAnalysis/components/lineChart.vue
+++ b/src/views/energy/analysis/contrastAnalysis/components/lineChart.vue
@@ -103,7 +103,8 @@ export default {
           containLabel: true
         },
         legend: {
-          data: legendData
+          data: legendData,
+          right: '1%'
         },
         xAxis: {
           type: 'category',
diff --git a/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue b/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue
index 4d7d48ea..4370bfec 100644
--- a/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue
+++ b/src/views/energy/analysis/contrastAnalysis/components/searchArea.vue
@@ -425,7 +425,7 @@ export default {
   }
 }
 </script>
-<style>
+<style lang='scss'>
 /* 时间整点 */
 .noneMinute .el-time-spinner__wrapper {
   width: 100%;
@@ -433,6 +433,16 @@ export default {
 .noneMinute .el-scrollbar:nth-of-type(2) {
   display: none;
 }
+.demo-form-inline {
+  .el-date-editor .el-range__icon {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+  .el-input__prefix .el-icon-date {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+}
 </style>
 <style lang="scss" scoped>
 .demo-form-inline {
@@ -446,8 +456,6 @@ export default {
     margin-top: 12px;
   }
 }
-</style>
-<style scoped>
 .searchBarBox .foldClass {
   position: absolute;
   top: 14px;
diff --git a/src/views/energy/analysis/qoqAnalysis/components/lineChart.vue b/src/views/energy/analysis/qoqAnalysis/components/lineChart.vue
index ef025963..ec8e3d7c 100644
--- a/src/views/energy/analysis/qoqAnalysis/components/lineChart.vue
+++ b/src/views/energy/analysis/qoqAnalysis/components/lineChart.vue
@@ -15,7 +15,7 @@ export default {
     return {
       chartDom: '',
       chart: '',
-      chartHeight: this.tableHeight(350)
+      chartHeight: this.tableHeight(370)
     }
   },
   props: {
@@ -34,7 +34,7 @@ export default {
   },
   mounted() {
     window.addEventListener('resize', () => {
-      this.chartHeight = this.tableHeight(350)
+      this.chartHeight = this.tableHeight(370)
     })
   },
   methods: {
@@ -86,17 +86,35 @@ export default {
         }
       }
       var option = {
-        // title: {
-        //   text: 'World Population'
-        // },
         color:['#288AFF','#8EF0AB'],
         tooltip: {
           trigger: 'axis',
           axisPointer: {
             type: 'shadow'
+          },
+          formatter: function(params) {
+            return (
+              params[0].axisValue + 
+              `<br>` +
+              params.map((item) => {
+                let str = `<span style="display:inline-block;width:8px;height:8px;margin: 0 8px 0 -3px;border-radius:2px;background-color:${item.color};"></span>`
+                let seriesNameStr = `<span style="display:inline-block;">${item.seriesName}</span>`
+						let value = item.value ? item.value : '-'
+						let valueStr = `<span style="display:inline-block;margin-left:10px;color:rgba(0,0,0,0.45);">${value}</span>`
+						return `<span style="display:flex; justify-content:space-between; margin-bottom: 2px">
+									<span>${str}${seriesNameStr}</span>
+									<span>${valueStr}</span>
+								</span>`
+              }).join(``)
+            )
           }
         },
-        legend: {},
+        legend: {
+          right: '1%',
+          icon: 'rect',
+          itemHeight: 8,
+          itemWidth: 8
+        },
         grid: {
           left: '1%',
           right: '1%',
diff --git a/src/views/energy/analysis/qoqAnalysis/components/searchArea.vue b/src/views/energy/analysis/qoqAnalysis/components/searchArea.vue
index 4e832fcb..d98a27ba 100644
--- a/src/views/energy/analysis/qoqAnalysis/components/searchArea.vue
+++ b/src/views/energy/analysis/qoqAnalysis/components/searchArea.vue
@@ -194,13 +194,23 @@ export default {
   }
 }
 </script>
-<style>
+<style lang='scss'>
 /* 级联选择器 */
 .cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
   display: none;
 }
+.demo-form-inline {
+  .el-date-editor .el-range__icon {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+  .el-input__prefix .el-icon-date {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+}
 </style>
-<style scoped>
+<style lang="scss" scoped>
 .separateStyle {
   display: inline-block;
   width: 1px;
@@ -208,8 +218,6 @@ export default {
   background: #E8E8E8;
   vertical-align: middle;
 }
-</style>
-<style lang="scss" scoped>
 .demo-form-inline {
   .blue-block {
     display: inline-block;
diff --git a/src/views/energy/analysis/qoqAnalysis/index.vue b/src/views/energy/analysis/qoqAnalysis/index.vue
index 25918374..6c2ac964 100644
--- a/src/views/energy/analysis/qoqAnalysis/index.vue
+++ b/src/views/energy/analysis/qoqAnalysis/index.vue
@@ -9,7 +9,8 @@
         :table-data="list"
         class="qoq-out-table"
       />
-      <div style='width: 100%;height: 300px;padding-top: 30px;'>
+      <div class="chartTitle">环比分析图</div>
+      <div style='width: 100%'>
         <line-chart ref="analysisLineChart" :chartData="chartData"/>
       </div>
     </div>
@@ -111,4 +112,21 @@ export default {
     }
   }
 }
-</script>
\ No newline at end of file
+</script>
+<style lang='scss' scoped>
+.chartTitle {
+  font-size: 16px;
+  color: #000;
+  margin-top: 20px;
+}
+.chartTitle::before {
+  content: '';
+  display: inline-block;
+  width: 4px;
+  height: 18px;
+  background-color: #0B58FF;
+  border-radius: 1px;
+  margin-right: 8px;
+  vertical-align: bottom;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/energy/analysis/trendAnalysis/components/barChart.vue b/src/views/energy/analysis/trendAnalysis/components/barChart.vue
index f777a64f..4b4e91b9 100644
--- a/src/views/energy/analysis/trendAnalysis/components/barChart.vue
+++ b/src/views/energy/analysis/trendAnalysis/components/barChart.vue
@@ -68,12 +68,6 @@ export default {
       }
       var option = {
         color:['#288AFF'],
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'shadow'
-          }
-        },
         grid: {
           left: '4%',
           right: '1%',
diff --git a/src/views/energy/analysis/trendAnalysis/components/lineChart.vue b/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
index bb403169..82c8c900 100644
--- a/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
+++ b/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
@@ -70,9 +70,9 @@ export default {
 
       var option = {
         color:['#288AFF'],
-        tooltip: {
-          trigger: 'axis'
-        },
+        // tooltip: {
+        //   trigger: 'axis'
+        // },
         grid: {
           left: '4%',
           right: '1%',
diff --git a/src/views/energy/analysis/trendAnalysis/components/searchArea.vue b/src/views/energy/analysis/trendAnalysis/components/searchArea.vue
index 67842ab3..22262036 100644
--- a/src/views/energy/analysis/trendAnalysis/components/searchArea.vue
+++ b/src/views/energy/analysis/trendAnalysis/components/searchArea.vue
@@ -385,7 +385,7 @@ export default {
   }
 }
 </script>
-<style>
+<style lang='scss'>
 /* 级联选择器 */
 .cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
   display: none;
@@ -397,6 +397,16 @@ export default {
 .noneMinute .el-scrollbar:nth-of-type(2) {
   display: none;
 }
+.demo-form-inline {
+  .el-date-editor .el-range__icon {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+  .el-input__prefix .el-icon-date {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+}
 </style>
 <style lang="scss" scoped>
 .demo-form-inline {
@@ -410,8 +420,6 @@ export default {
     margin-top: 12px;
   }
 }
-</style>
-<style scoped>
 .searchBarBox .foldClass {
   position: absolute;
   top: 14px;
diff --git a/src/views/energy/analysis/yoyAnalysis/components/lineChart.vue b/src/views/energy/analysis/yoyAnalysis/components/lineChart.vue
index e7650d8d..b7e4f9a3 100644
--- a/src/views/energy/analysis/yoyAnalysis/components/lineChart.vue
+++ b/src/views/energy/analysis/yoyAnalysis/components/lineChart.vue
@@ -77,7 +77,8 @@ export default {
       var option = {
         color:['#FFDC94','#8EF0AB','#63BDFF','#288AFF','#7164FF','#FF6860','#FF9747','#B0EB42','#D680FF','#0043D2'],
         legend: {
-          data: keys
+          data: keys,
+          right:'1%'
         },
         tooltip: {
           trigger: 'axis'
diff --git a/src/views/energy/analysis/yoyAnalysis/components/searchArea.vue b/src/views/energy/analysis/yoyAnalysis/components/searchArea.vue
index 1b6e1544..d5e2dcf0 100644
--- a/src/views/energy/analysis/yoyAnalysis/components/searchArea.vue
+++ b/src/views/energy/analysis/yoyAnalysis/components/searchArea.vue
@@ -143,19 +143,20 @@ export default {
   }
 }
 </script>
-<style>
+<style lang='scss'>
 /* 级联选择器 */
 .cascaderParent .el-cascader-panel .el-scrollbar:first-child .el-radio {
   display: none;
 }
-</style>
-<style scoped>
-.separateStyle {
-  display: inline-block;
-  width: 1px;
-  height: 24px;
-  background: #E8E8E8;
-  vertical-align: middle;
+.demo-form-inline {
+  .el-date-editor .el-range__icon {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+  .el-input__prefix .el-icon-date {
+    font-size: 16px;
+    color: #0B58FF;
+  }
 }
 </style>
 <style lang="scss" scoped>
@@ -170,4 +171,11 @@ export default {
     margin-top: 10px;
   }
 }
+.separateStyle {
+  display: inline-block;
+  width: 1px;
+  height: 24px;
+  background: #E8E8E8;
+  vertical-align: middle;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/energy/analysis/yoyAnalysis/index.vue b/src/views/energy/analysis/yoyAnalysis/index.vue
index 670c2563..2b098f03 100644
--- a/src/views/energy/analysis/yoyAnalysis/index.vue
+++ b/src/views/energy/analysis/yoyAnalysis/index.vue
@@ -3,6 +3,7 @@
     <!-- 搜索工作栏 -->
     <search-area @submit="getList" @exportD="exportData"/>
     <div v-show='chartData.length'>
+      <div class="chartTitle">同比分析图</div>
       <div style='width: 100%;height: 400px;'>
         <line-chart ref="analysisLineChart" :chartData="chartData"/>
       </div>
@@ -33,12 +34,12 @@ export default {
       chartData: [],
       tableProps: [],
       list: [],
-      tableH: this.tableHeight(600)
+      tableH: this.tableHeight(640)
     }
   },
   mounted() {
     window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(600)
+      this.tableH = this.tableHeight(640)
     })
   },
   methods: {
@@ -122,4 +123,20 @@ export default {
     }
   }
 }
-</script>
\ No newline at end of file
+</script>
+<style lang='scss' scoped>
+.chartTitle {
+  font-size: 16px;
+  color: #000;
+}
+.chartTitle::before {
+  content: '';
+  display: inline-block;
+  width: 4px;
+  height: 18px;
+  background-color: #0B58FF;
+  border-radius: 1px;
+  margin-right: 8px;
+  vertical-align: bottom;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue b/src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue
index 41b9cd36..ab1dd648 100644
--- a/src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue
+++ b/src/views/energy/base/energyPlcConnect/components/energyPlcParam.vue
@@ -130,7 +130,7 @@ export default {
       this.plcTableName = data.plcTableName
       this.objName = data.objName
       this.getList()
-      if (title === 'view') {
+      if (title === 'detail') {
         this.showBtn = false
         this.tableBtn = []
       } else {
diff --git a/src/views/energy/base/energyPlcConnect/index.vue b/src/views/energy/base/energyPlcConnect/index.vue
index f7177ff0..f3f30916 100644
--- a/src/views/energy/base/energyPlcConnect/index.vue
+++ b/src/views/energy/base/energyPlcConnect/index.vue
@@ -113,22 +113,22 @@ export default {
       ],
       tableProps,
       tableBtn: [
+        this.$auth.hasPermi('base:energy-plc-connect:bind')
+          ? {
+              type: 'connect',
+              btnName: '绑定'
+            }
+          : undefined,
+        {
+          type: 'detail',
+          btnName: '详情'
+        },
         this.$auth.hasPermi('base:energy-plc-connect:update')
           ? {
               type: 'edit',
               btnName: '编辑'
             }
           : undefined,
-        {
-          type: 'view',
-          btnName: '查看'
-        },
-        this.$auth.hasPermi('base:energy-plc-connect:bind')
-        ? {
-            type: 'connect',
-            btnName: '绑定'
-          }
-        : undefined,
         this.$auth.hasPermi('base:energy-plc-connect:delete')
           ? {
               type: 'delete',
@@ -205,10 +205,10 @@ export default {
         case 'delete':
           this.handleDelete(val.data)
           break
-        case 'view':
+        case 'detail':
           this.paramVisible = true
           this.$nextTick(() => {
-            this.$refs.plcParam.init(val.data, 'view')
+            this.$refs.plcParam.init(val.data, 'detail')
           })
           break
         default:
diff --git a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
index cd63836d..d3bf793a 100644
--- a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
+++ b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
@@ -1,54 +1,72 @@
 <template>
   <el-form ref="form" :rules="rules" label-width="110px" :model="form">
-    <el-form-item label="监控对象" prop="objectId">
-      <el-cascader
-        style='width: 100%;'
-        v-model="objIds"
-        :options="objList"
-        :props="{ checkStrictly: true, value: 'id', label: 'name' }"
-        popper-class="cascaderParent"
-        @change="selectObj"
-        clearable></el-cascader>
-    </el-form-item>
-    <el-form-item label="能源类型" prop="energyTypeId">
-      <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" @change="toggleType">
-        <el-option
-          v-for="item in this.energyTypeList"
-          :key="item.id"
-          :label="item.name"
-          :value="item.id">
-        </el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="监控模式" prop="type">
-      <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" @change="typeChange">
-        <el-option label="合并" :value= "1" ></el-option>
-        <el-option label="详细" :value= "2" ></el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="监控详细参数" prop="type" v-if="form.type === 2">
-      <el-select v-model="form.plcParamId" placeholder="请选择" style="width: 100%;" @change="selectDetail">
-        <el-option
-          v-for="item in detailList"
-          :key="item.id"
-          :label="item.name"
-          :value="item.id">
-        </el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="指标类型" prop="limitType">
-      <el-select v-model="form.limitType" placeholder="请选择" style="width: 100%;">
-        <el-option
-          v-for="item in getDictDatas(DICT_TYPE.MONITOR_INDEX_TYPE)"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-        </el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="消耗量阈值" prop="limitValue">
-      <el-input-number v-model="form.limitValue" :min="0" :max="10000000000000000" style="width: 100%;"></el-input-number>
-    </el-form-item>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="监控对象" prop="objectId">
+          <el-cascader
+            style='width: 100%;'
+            v-model="objIds"
+            :options="objList"
+            :props="{ checkStrictly: true, value: 'id', label: 'name' }"
+            popper-class="cascaderParent"
+            @change="selectObj"
+            clearable></el-cascader>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="能源类型" prop="energyTypeId">
+          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" @change="toggleType">
+            <el-option
+              v-for="item in this.energyTypeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="监控模式" prop="type">
+          <el-select v-model="form.type" placeholder="请选择" style="width: 100%;" @change="typeChange">
+            <el-option label="合并" :value= "1" ></el-option>
+            <el-option label="详细" :value= "2" ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="监控详细参数" prop="type" v-if="form.type === 2">
+          <el-select v-model="form.plcParamId" placeholder="请选择" style="width: 100%;" @change="selectDetail">
+            <el-option
+              v-for="item in detailList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="指标类型" prop="limitType">
+          <el-select v-model="form.limitType" placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in getDictDatas(DICT_TYPE.MONITOR_INDEX_TYPE)"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="消耗量阈值" prop="limitValue">
+          <el-input-number v-model="form.limitValue" :min="0" :max="10000000000000000" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+    </el-row>
   </el-form>
 </template>
 <script>
diff --git a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue b/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue
index cd7fbcd8..0ab66918 100644
--- a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue
+++ b/src/views/energy/monitoring/energyStatistics/components/energyStatisticsDet.vue
@@ -124,7 +124,7 @@ export default {
       this.energyType = data.energyType
       this.energyTypeId = data.energyTypeId
       this.getList()
-      if (title === 'view') {
+      if (title === 'detail') {
         this.showBtn = false
         this.tableBtn = []
       } else {
diff --git a/src/views/energy/monitoring/energyStatistics/index.vue b/src/views/energy/monitoring/energyStatistics/index.vue
index b4abedbe..87f6aa54 100644
--- a/src/views/energy/monitoring/energyStatistics/index.vue
+++ b/src/views/energy/monitoring/energyStatistics/index.vue
@@ -111,22 +111,22 @@ export default {
       ],
       tableProps,
       tableBtn: [
-        this.$auth.hasPermi('monitoring:energy-statistics:update')
-          ? {
-              type: 'edit',
-              btnName: '编辑'
-            }
-          : undefined,
-        {
-          type: 'view',
-          btnName: '查看'
-        },
         this.$auth.hasPermi('monitoring:energy-statistics:bind')
         ? {
             type: 'connect',
             btnName: '绑定'
           }
         : undefined,
+        {
+          type: 'detail',
+          btnName: '详情'
+        },
+        this.$auth.hasPermi('monitoring:energy-statistics:update')
+          ? {
+              type: 'edit',
+              btnName: '编辑'
+            }
+          : undefined,
         this.$auth.hasPermi('monitoring:energy-statistics:delete')
           ? {
               type: 'delete',
@@ -199,9 +199,9 @@ export default {
         case 'delete':
           this.handleDelete(val.data)
           break
-        case 'view':
+        case 'detail':
           this.$nextTick(() => {
-            this.$refs.plcParam.init(val.data, 'view')
+            this.$refs.plcParam.init(val.data, 'detail')
           })
           break
         default:
diff --git a/src/views/group/base/groupClasses/index.vue b/src/views/group/base/groupClasses/index.vue
index 0e065e83..09a52985 100644
--- a/src/views/group/base/groupClasses/index.vue
+++ b/src/views/group/base/groupClasses/index.vue
@@ -37,7 +37,7 @@
       @cancel="handleCancel"
       @confirm="handleConfirm"
       :before-close="handleCancel"
-      width='70%'
+      width='50%'
     >
       <group-class-add ref="classList" @successSubmit="successSubmit" />
     </base-dialog>
@@ -108,12 +108,6 @@ export default {
       ],
       tableProps,
       tableBtn: [
-        this.$auth.hasPermi('base:group-classes:update')
-          ? {
-              type: 'edit',
-              btnName: '编辑'
-            }
-          : undefined,
           {
             type: 'cancel',
             btnName: '作废',
@@ -128,6 +122,12 @@ export default {
               ]
             }
           },
+        this.$auth.hasPermi('base:group-classes:update')
+          ? {
+              type: 'edit',
+              btnName: '编辑'
+            }
+          : undefined,
         this.$auth.hasPermi('base:group-classes:delete')
           ? {
               type: 'delete',
diff --git a/src/views/group/base/groupTeam/components/groupTeamAdd.vue b/src/views/group/base/groupTeam/components/groupTeamAdd.vue
index d1f7967b..aaffb276 100644
--- a/src/views/group/base/groupTeam/components/groupTeamAdd.vue
+++ b/src/views/group/base/groupTeam/components/groupTeamAdd.vue
@@ -1,17 +1,29 @@
 <template>
   <el-form ref="form" :rules="rules" label-width="80px" :model="form">
-    <el-form-item label="班组名称" prop="name">
-      <el-input v-model="form.name"></el-input>
-    </el-form-item>
-    <el-form-item label="班组编码" prop="code">
-      <el-input v-model="form.code" disabled></el-input>
-    </el-form-item>
-    <el-form-item label="班组人数" prop="num">
-      <el-input-number v-model="form.num" :min="1" :max="99999999" style="width: 100%;"></el-input-number>
-    </el-form-item>
-    <el-form-item label="班组组长" prop="leaderName">
-      <el-input v-model="form.leaderName"></el-input>
-    </el-form-item>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="班组名称" prop="name">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="班组编码" prop="code">
+          <el-input v-model="form.code" disabled></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="班组人数" prop="num">
+          <el-input-number v-model="form.num" :min="1" :max="99999999" style="width: 100%;"></el-input-number>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="班组组长" prop="leaderName">
+          <el-input v-model="form.leaderName"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
   </el-form>
 </template>
 <script>
diff --git a/src/views/group/base/groupTeamScheduling/index.vue b/src/views/group/base/groupTeamScheduling/index.vue
index c4511410..49cd5ccd 100644
--- a/src/views/group/base/groupTeamScheduling/index.vue
+++ b/src/views/group/base/groupTeamScheduling/index.vue
@@ -308,6 +308,16 @@ export default {
   }
 </script>
 <style lang='scss'>
+.demo-form-inline {
+  .el-date-editor .el-range__icon {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+  .el-input__prefix .el-icon-date {
+    font-size: 16px;
+    color: #0B58FF;
+  }
+}
 .groupTeamScheduling {
   background-color: #F2F4F9;
   .operationArea {
diff --git a/yarn.lock b/yarn.lock
index 8461c460..6c7da4e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -981,7 +981,7 @@
   "resolved" "https://registry.npmmirror.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz"
   "version" "0.8.0"
 
-"@babel/runtime@^7.11.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.11.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.8.4":
   "integrity" "sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ=="
   "resolved" "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.22.6.tgz"
   "version" "7.22.6"
@@ -1323,6 +1323,11 @@
   "resolved" "https://registry.npmmirror.com/@types/qs/-/qs-6.9.7.tgz"
   "version" "6.9.7"
 
+"@types/raf@^3.4.0":
+  "integrity" "sha512-1jJ3OO8FXHCcuVXCuO1EMC/MjDuT6/cxgsMw/UebkO9afnL99Y5QTpUjk7+flK4G5FzBVJEgDKL5eFtoxJs9MQ=="
+  "resolved" "https://registry.npmmirror.com/@types/raf/-/raf-3.4.1.tgz"
+  "version" "3.4.1"
+
 "@types/range-parser@*":
   "integrity" "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
   "resolved" "https://registry.npmmirror.com/@types/range-parser/-/range-parser-1.2.4.tgz"
@@ -1937,7 +1942,6 @@
   "resolved" "https://registry.npmmirror.com/acorn/-/acorn-8.10.0.tgz"
   "version" "8.10.0"
 
-<<<<<<< HEAD
 "acorn@^8.9.0":
   "integrity" "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
   "resolved" "https://registry.npmmirror.com/acorn/-/acorn-8.10.0.tgz"
@@ -1957,17 +1961,6 @@
   "integrity" "sha512-rsx8pfx7wJsn+ziYbpJ8XA5c93hKAtBCrfydxJqJCMT+qfjipd/B5wC2xHtBcoxyvlqJcpeAo3K55t0lXOn9yQ=="
   "resolved" "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-1.0.3.tgz"
   "version" "1.0.3"
-=======
-adler-32@~1.3.0:
-  version "1.3.1"
-  resolved "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz#1dbf0b36dda0012189a32b3679061932df1821e2"
-  integrity sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==
-
-aes-decrypter@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmmirror.com/aes-decrypter/-/aes-decrypter-1.0.3.tgz"
-  integrity sha512-rsx8pfx7wJsn+ziYbpJ8XA5c93hKAtBCrfydxJqJCMT+qfjipd/B5wC2xHtBcoxyvlqJcpeAo3K55t0lXOn9yQ==
->>>>>>> test
   dependencies:
     "pkcs7" "^0.2.3"
 
@@ -2418,6 +2411,11 @@ aes-decrypter@1.0.3:
     "mixin-deep" "^1.2.0"
     "pascalcase" "^0.1.1"
 
+"base64-arraybuffer@^1.0.2":
+  "integrity" "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ=="
+  "resolved" "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz"
+  "version" "1.0.2"
+
 "base64-js@^1.0.2":
   "integrity" "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
   "resolved" "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz"
@@ -2700,6 +2698,11 @@ aes-decrypter@1.0.3:
     "node-releases" "^2.0.12"
     "update-browserslist-db" "^1.0.11"
 
+"btoa@^1.2.1":
+  "integrity" "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g=="
+  "resolved" "https://registry.npmmirror.com/btoa/-/btoa-1.2.1.tgz"
+  "version" "1.2.1"
+
 "buffer-from@^1.0.0":
   "integrity" "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
   "resolved" "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz"
@@ -2891,6 +2894,20 @@ aes-decrypter@1.0.3:
   "resolved" "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz"
   "version" "1.0.30001517"
 
+"canvg@^3.0.6":
+  "integrity" "sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q=="
+  "resolved" "https://registry.npmmirror.com/canvg/-/canvg-3.0.10.tgz"
+  "version" "3.0.10"
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@types/raf" "^3.4.0"
+    "core-js" "^3.8.3"
+    "raf" "^3.4.1"
+    "regenerator-runtime" "^0.13.7"
+    "rgbcolor" "^1.0.1"
+    "stackblur-canvas" "^2.0.0"
+    "svg-pathdata" "^6.0.3"
+
 "case-sensitive-paths-webpack-plugin@^2.3.0":
   "integrity" "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw=="
   "resolved" "https://registry.npmmirror.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz"
@@ -2901,25 +2918,10 @@ aes-decrypter@1.0.3:
   "resolved" "https://registry.npmmirror.com/caseless/-/caseless-0.12.0.tgz"
   "version" "0.12.0"
 
-<<<<<<< HEAD
 "cfb@~1.2.1":
   "integrity" "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA=="
   "resolved" "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz"
   "version" "1.2.2"
-=======
-cfb@~1.2.1:
-  version "1.2.2"
-  resolved "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz#94e687628c700e5155436dac05f74e08df23bc44"
-  integrity sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==
-  dependencies:
-    adler-32 "~1.3.0"
-    crc-32 "~1.2.0"
-
-chalk@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.npmmirror.com/chalk/-/chalk-2.3.0.tgz"
-  integrity sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==
->>>>>>> test
   dependencies:
     "adler-32" "~1.3.0"
     "crc-32" "~1.2.0"
@@ -3211,7 +3213,6 @@ chalk@2.3.0:
   "resolved" "https://registry.npmmirror.com/code-brick-zj/-/code-brick-zj-1.0.2.tgz"
   "version" "1.0.2"
 
-<<<<<<< HEAD
 "codepage@~1.15.0":
   "integrity" "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA=="
   "resolved" "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz"
@@ -3221,17 +3222,6 @@ chalk@2.3.0:
   "integrity" "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw=="
   "resolved" "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz"
   "version" "1.0.0"
-=======
-codepage@~1.15.0:
-  version "1.15.0"
-  resolved "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz#2e00519024b39424ec66eeb3ec07227e692618ab"
-  integrity sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==
-
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz"
-  integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==
->>>>>>> test
   dependencies:
     "map-visit" "^1.0.0"
     "object-visit" "^1.0.0"
@@ -3528,7 +3518,7 @@ collection-visit@^1.0.0:
   "resolved" "https://registry.npmmirror.com/core-js/-/core-js-2.6.12.tgz"
   "version" "2.6.12"
 
-"core-js@^3.26.0", "core-js@^3.6.5":
+"core-js@^3.26.0", "core-js@^3.6.0", "core-js@^3.6.5", "core-js@^3.8.3":
   "integrity" "sha512-2sKLtfq1eFST7l7v62zaqXacPc7uG8ZAya8ogijLhTtaKNcpzpB4TMoTw2Si+8GYKRwFPMMtUT0263QFWFfqyQ=="
   "resolved" "https://registry.npmmirror.com/core-js/-/core-js-3.31.1.tgz"
   "version" "3.31.1"
@@ -3548,7 +3538,6 @@ collection-visit@^1.0.0:
     "js-yaml" "^3.13.1"
     "parse-json" "^4.0.0"
 
-<<<<<<< HEAD
 "crc-32@~1.2.0", "crc-32@~1.2.1":
   "integrity" "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="
   "resolved" "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz"
@@ -3558,17 +3547,6 @@ collection-visit@^1.0.0:
   "integrity" "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="
   "resolved" "https://registry.npmmirror.com/create-ecdh/-/create-ecdh-4.0.4.tgz"
   "version" "4.0.4"
-=======
-crc-32@~1.2.0, crc-32@~1.2.1:
-  version "1.2.2"
-  resolved "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"
-  integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==
-
-create-ecdh@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.npmmirror.com/create-ecdh/-/create-ecdh-4.0.4.tgz"
-  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
->>>>>>> test
   dependencies:
     "bn.js" "^4.1.0"
     "elliptic" "^6.5.3"
@@ -3678,6 +3656,13 @@ create-ecdh@^4.0.0:
     "postcss" "^7.0.1"
     "timsort" "^0.3.0"
 
+"css-line-break@^2.1.0":
+  "integrity" "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w=="
+  "resolved" "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz"
+  "version" "2.1.0"
+  dependencies:
+    "utrie" "^1.0.2"
+
 "css-loader@*", "css-loader@^3.5.3":
   "integrity" "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ=="
   "resolved" "https://registry.npmmirror.com/css-loader/-/css-loader-3.6.0.tgz"
@@ -4172,6 +4157,11 @@ create-ecdh@^4.0.0:
   "resolved" "https://registry.npmmirror.com/domify/-/domify-1.4.1.tgz"
   "version" "1.4.1"
 
+"dompurify@^2.2.0":
+  "integrity" "sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ=="
+  "resolved" "https://registry.npmmirror.com/dompurify/-/dompurify-2.4.7.tgz"
+  "version" "2.4.7"
+
 "domready@1.0.8":
   "integrity" "sha512-uIzsOJUNk+AdGE9a6VDeessoMCzF8RrZvJCX/W8QtyfgdR6Uofn/MvRonih3OtCO79b2VDzDOymuiABrQ4z3XA=="
   "resolved" "https://registry.npmmirror.com/domready/-/domready-1.0.8.tgz"
@@ -4970,6 +4960,11 @@ create-ecdh@^4.0.0:
   dependencies:
     "websocket-driver" ">=0.5.1"
 
+"fflate@^0.4.8":
+  "integrity" "sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA=="
+  "resolved" "https://registry.npmmirror.com/fflate/-/fflate-0.4.8.tgz"
+  "version" "0.4.8"
+
 "figgy-pudding@^3.5.1":
   "integrity" "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="
   "resolved" "https://registry.npmmirror.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"
@@ -5152,27 +5147,10 @@ create-ecdh@^4.0.0:
     "combined-stream" "^1.0.8"
     "mime-types" "^2.1.12"
 
-<<<<<<< HEAD
 "form-data@~2.3.2":
   "integrity" "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="
   "resolved" "https://registry.npmmirror.com/form-data/-/form-data-2.3.3.tgz"
   "version" "2.3.3"
-=======
-forwarded@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz"
-  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
-
-frac@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b"
-  integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==
-
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmmirror.com/fragment-cache/-/fragment-cache-0.2.1.tgz"
-  integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==
->>>>>>> test
   dependencies:
     "asynckit" "^0.4.0"
     "combined-stream" "^1.0.6"
@@ -5732,6 +5710,14 @@ fragment-cache@^0.2.1:
     "toposort" "^1.0.0"
     "util.promisify" "1.0.0"
 
+"html2canvas@^1.0.0-rc.5", "html2canvas@^1.4.1":
+  "integrity" "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA=="
+  "resolved" "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz"
+  "version" "1.4.1"
+  dependencies:
+    "css-line-break" "^2.1.0"
+    "text-segmentation" "^1.0.3"
+
 "htmlparser2@^3.8.3":
   "integrity" "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="
   "resolved" "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-3.10.1.tgz"
@@ -6591,6 +6577,21 @@ fragment-cache@^0.2.1:
   optionalDependencies:
     "graceful-fs" "^4.1.6"
 
+"jspdf@^2.5.1":
+  "integrity" "sha512-hXObxz7ZqoyhxET78+XR34Xu2qFGrJJ2I2bE5w4SM8eFaFEkW2xcGRVUss360fYelwRSid/jT078kbNvmoW0QA=="
+  "resolved" "https://registry.npmmirror.com/jspdf/-/jspdf-2.5.1.tgz"
+  "version" "2.5.1"
+  dependencies:
+    "@babel/runtime" "^7.14.0"
+    "atob" "^2.1.2"
+    "btoa" "^1.2.1"
+    "fflate" "^0.4.8"
+  optionalDependencies:
+    "canvg" "^3.0.6"
+    "core-js" "^3.6.0"
+    "dompurify" "^2.2.0"
+    "html2canvas" "^1.0.0-rc.5"
+
 "jsprim@^1.2.2":
   "integrity" "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw=="
   "resolved" "https://registry.npmmirror.com/jsprim/-/jsprim-1.4.2.tgz"
@@ -8798,6 +8799,13 @@ fragment-cache@^0.2.1:
     "parchment" "^1.1.4"
     "quill-delta" "^3.6.2"
 
+"raf@^3.4.1":
+  "integrity" "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA=="
+  "resolved" "https://registry.npmmirror.com/raf/-/raf-3.4.1.tgz"
+  "version" "3.4.1"
+  dependencies:
+    "performance-now" "^2.1.0"
+
 "randombytes@^2.0.0", "randombytes@^2.0.1", "randombytes@^2.0.5", "randombytes@^2.1.0":
   "integrity" "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="
   "resolved" "https://registry.npmmirror.com/randombytes/-/randombytes-2.1.0.tgz"
@@ -8911,7 +8919,7 @@ fragment-cache@^0.2.1:
   "resolved" "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"
   "version" "0.11.1"
 
-"regenerator-runtime@^0.13.11":
+"regenerator-runtime@^0.13.11", "regenerator-runtime@^0.13.7":
   "integrity" "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
   "resolved" "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"
   "version" "0.13.11"
@@ -9113,6 +9121,11 @@ fragment-cache@^0.2.1:
   "resolved" "https://registry.npmmirror.com/rgba-regex/-/rgba-regex-1.0.0.tgz"
   "version" "1.0.0"
 
+"rgbcolor@^1.0.1":
+  "integrity" "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw=="
+  "resolved" "https://registry.npmmirror.com/rgbcolor/-/rgbcolor-1.0.1.tgz"
+  "version" "1.0.1"
+
 "rimraf@^2.5.4", "rimraf@^2.6.1", "rimraf@^2.6.3":
   "integrity" "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="
   "resolved" "https://registry.npmmirror.com/rimraf/-/rimraf-2.7.1.tgz"
@@ -9718,24 +9731,10 @@ fragment-cache@^0.2.1:
   "resolved" "https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz"
   "version" "3.0.13"
 
-<<<<<<< HEAD
 "spdy-transport@^3.0.0":
   "integrity" "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw=="
   "resolved" "https://registry.npmmirror.com/spdy-transport/-/spdy-transport-3.0.0.tgz"
   "version" "3.0.0"
-=======
-ssf@~0.11.2:
-  version "0.11.2"
-  resolved "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz#0b99698b237548d088fc43cdf2b70c1a7512c06c"
-  integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==
-  dependencies:
-    frac "~1.1.2"
-
-sshpk@^1.7.0:
-  version "1.17.0"
-  resolved "https://registry.npmmirror.com/sshpk/-/sshpk-1.17.0.tgz"
-  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
->>>>>>> test
   dependencies:
     "debug" "^4.1.0"
     "detect-node" "^2.0.4"
@@ -9808,6 +9807,11 @@ sshpk@^1.7.0:
   "resolved" "https://registry.npmmirror.com/stable/-/stable-0.1.8.tgz"
   "version" "0.1.8"
 
+"stackblur-canvas@^2.0.0":
+  "integrity" "sha512-8S1aIA+UoF6erJYnglGPug6MaHYGo1Ot7h5fuXx4fUPvcvQfcdw2o/ppCse63+eZf8PPidSu4v1JnmEVtEDnpg=="
+  "resolved" "https://registry.npmmirror.com/stackblur-canvas/-/stackblur-canvas-2.6.0.tgz"
+  "version" "2.6.0"
+
 "stackframe@^1.3.4":
   "integrity" "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="
   "resolved" "https://registry.npmmirror.com/stackframe/-/stackframe-1.3.4.tgz"
@@ -10107,6 +10111,11 @@ sshpk@^1.7.0:
     "query-string" "^4.3.2"
     "traverse" "^0.6.6"
 
+"svg-pathdata@^6.0.3":
+  "integrity" "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw=="
+  "resolved" "https://registry.npmmirror.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz"
+  "version" "6.0.3"
+
 "svg-sprite-loader@5.1.1":
   "integrity" "sha512-oRjDBw3AtZOb+XTx7XE3HcVju9RdnfdXttT3ZJB/vmWGJ+SM+xfXzh3yuVPIpySO8FjGhH5BtU63lGMI9WgYzA=="
   "resolved" "https://registry.npmmirror.com/svg-sprite-loader/-/svg-sprite-loader-5.1.1.tgz"
@@ -10242,6 +10251,13 @@ sshpk@^1.7.0:
     "commander" "^2.20.0"
     "source-map-support" "~0.5.20"
 
+"text-segmentation@^1.0.3":
+  "integrity" "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw=="
+  "resolved" "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz"
+  "version" "1.0.3"
+  dependencies:
+    "utrie" "^1.0.2"
+
 "text-table@^0.2.0":
   "integrity" "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
   "resolved" "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz"
@@ -10740,6 +10756,13 @@ sshpk@^1.7.0:
   "resolved" "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz"
   "version" "1.0.1"
 
+"utrie@^1.0.2":
+  "integrity" "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw=="
+  "resolved" "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz"
+  "version" "1.0.2"
+  dependencies:
+    "base64-arraybuffer" "^1.0.2"
+
 "uuid@^3.3.2":
   "integrity" "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
   "resolved" "https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz"
@@ -11194,32 +11217,10 @@ sshpk@^1.7.0:
   dependencies:
     "isexe" "^2.0.0"
 
-<<<<<<< HEAD
 "which@^2.0.1":
   "integrity" "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="
   "resolved" "https://registry.npmmirror.com/which/-/which-2.0.2.tgz"
   "version" "2.0.2"
-=======
-wmf@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da"
-  integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==
-
-word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.3.tgz"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
-word@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.npmmirror.com/word/-/word-0.3.0.tgz#8542157e4f8e849f4a363a288992d47612db9961"
-  integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==
-
-worker-farm@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.npmmirror.com/worker-farm/-/worker-farm-1.7.0.tgz"
-  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
->>>>>>> test
   dependencies:
     "isexe" "^2.0.0"
 
@@ -11279,30 +11280,10 @@ worker-farm@^1.7.0:
   dependencies:
     "async-limiter" "~1.0.0"
 
-<<<<<<< HEAD
 "xhr@2.4.0":
   "integrity" "sha512-TUbBsdAuJbX8olk9hsDwGK8P1ri1XlV+PdEWkYw+HQQbpkiBR8PLgD1F3kQDPBs9l4Px34hP9rCYAZOCCAENbw=="
   "resolved" "https://registry.npmmirror.com/xhr/-/xhr-2.4.0.tgz"
   "version" "2.4.0"
-=======
-xlsx@^0.18.5:
-  version "0.18.5"
-  resolved "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz#16711b9113c848076b8a177022799ad356eba7d0"
-  integrity sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==
-  dependencies:
-    adler-32 "~1.3.0"
-    cfb "~1.2.1"
-    codepage "~1.15.0"
-    crc-32 "~1.2.1"
-    ssf "~0.11.2"
-    wmf "~1.0.1"
-    word "~0.3.0"
-
-xml-js@1.6.11:
-  version "1.6.11"
-  resolved "https://registry.npmmirror.com/xml-js/-/xml-js-1.6.11.tgz"
-  integrity sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==
->>>>>>> test
   dependencies:
     "global" "~4.3.0"
     "is-function" "^1.0.1"