Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-pc-vue

src/views/addFarm/index.vue

@@ -271,14 +271,13 @@ const getAreaList = async (callback) => {
         callback && callback();
     });
 };
-
+const id = route.query?.id
 function getList() {
-    VE_API.farm.fetchFarmWorkList({ farmId, libId }).then(({data}) => {
+    VE_API.farm.fetchFarmWorkList({ farmId, libId ,id}).then(({data}) => {
         workItemData.value = data[0]
         Object.assign(dynamicValidateForm, workItemData.value)
         dynamicValidateForm.name = workItemData.value.farmWorkName
         dynamicValidateForm.conditionRate = workItemData.value.condition
-        console.log('workItemData.value', dynamicValidateForm);
 
         farmMap.initData(workItemData.value.farmId, workItemData.value.regionId)
         farmMap.getBlueRegion({gardenId:  workItemData.value.farmId, regionId: workItemData.value.regionId}, (e) => {
@@ -349,7 +348,6 @@ const handleOk = () => {
     if (active.value) {
         formRef.value.validate((valid) => {
             if (valid) {
-                console.log("123", dynamicValidateForm);
                 submitForm();
                 // const res = tableData.value.getItem
                 // console.log('res', res);