Merge branch 'zdsz3.0' of http://192.168.10.18:3000/sunwei/zdsz_vue into zdsz3.0

src/components/ObsImageUpload/indexFile.vue

@@ -144,15 +144,6 @@ export default {
       link.download = file.name ? file.name : '文件'; // 可以指定下载后的文件名
       link.click();
     },
-    // 删除文件
-    handleDelete(index) {
-
-      const obj = this.fileList[index];
-      if (obj != null) {
-        this.fileList.splice(index, 1);
-      }
-      this.$emit("input", this.fileList);
-    },
     // 删除图片
     handleRemove(file, fileList) {
       const findex = this.fileList.map(f => f.url).indexOf(file.url);
@@ -160,7 +151,7 @@ export default {
         this.fileList.splice(findex, 1);
       }
 
-      this.$emit("removeFile", this.fileList);
+      this.$emit("input", this.fileList);
     },
     // 上传成功回调
     handleUploadSuccess(res) {

src/views/zdsz/engineeringDangerous/index.vue

@@ -403,14 +403,12 @@
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
                              :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"
                              :value="form.pics"
-                             @input="filesUpload"
               ></ObsFileUpload>
             </el-form-item>
             <el-form-item label="附件" prop="files" v-else>
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
                              :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"
                              :value="form.files"
-                             @input="filesUpload"
               ></ObsFileUpload>
             </el-form-item>
           </el-col>
@@ -712,6 +710,8 @@ export default {
     },
     // 表单重置
     reset() {
+      this.form.pics = []
+      this.form.files = []
       this.form = {
         id: undefined,
         basicInformation: undefined,