Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into xuxiaoming

* 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front:
  客户需求管理工作台拖拽优化
  降级vue
  test

package.json

@@ -20,7 +20,7 @@
     "element-china-area-data": "^5.0.2",
     "element-plus": "^1.0.2-beta.48",
     "moment": "^2.29.1",
-    "vue": "^3.2.26",
+    "vue": "^3.0.0",
     "vue-picture-cropper": "^0.1.11",
     "vue-router": "^4.0.0-0",
     "vuex": "^4.0.0-0"

src/views/factoryModel/basicUnit/index.vue

@@ -43,7 +43,8 @@
         size="mini"
         style="width: 100%"
         border
-        v-if="tableHeight" :height="tableHeight"
+        v-if="tableHeight"
+        :height="tableHeight"
       >
         <el-table-column
           v-for="(item, index) in headers"
@@ -118,7 +119,7 @@ export default {
         // "Uom-LastUser",
         // "Uom-CreateTime",
       ],
-      tableHeight:0
+      tableHeight: 0
     };
   },
   methods: {
@@ -152,8 +153,8 @@ export default {
       this.delHanle(keyName, deteleUrl);
     },
   },
-  mounted(){
-    this.$nextTick(()=>{
+  mounted() {
+    this.$nextTick(() => {
       this.tableHeight = this.calculationTableHeight(
         this.$refs.tableRef,
         120
@@ -163,8 +164,8 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-  .table-height-wrap{
-    height: 100%;
-    overflow: hidden;
-  }
+.table-height-wrap {
+  height: 100%;
+  overflow: hidden;
+}
 </style>

src/views/plan/workbench/homePage/index.vue

@@ -55,7 +55,7 @@ export default {
 	},
 	mounted () {
 		this.dragChangeSize((topHeight,bottomHeight) => {
-			this.calculateTableHeight(topHeight - 70)
+			this.calculateTableHeight(topHeight - 110)
 			this.calculateFormalTableHeight(bottomHeight - 70)
 		},{barHeight:50});
 	},