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

src/components/ObsImageUpload/index.vue

@@ -160,7 +160,7 @@ export default {
       }
 
       if (!isImg) {
-        this.$message.error(
+        this.$message.warning(
           `文件格式不正确, 请上传${this.fileType.join("/")}图片格式文件!`
         );
         return false;
@@ -168,7 +168,7 @@ export default {
       if (this.fileSize) {
         const isLt = file.size / 1024 / 1024 < this.fileSize;
         if (!isLt) {
-          this.$message.error(`上传头像图片大小不能超过 ${this.fileSize} MB!`);
+          this.$message.warning(`上传头像图片大小不能超过 ${this.fileSize} MB!`);
           return false;
         }
       }
@@ -180,7 +180,7 @@ export default {
     },
     // 文件个数超出
     handleExceed() {
-      this.$message.error(`上传文件数量不能超过 ${this.limit} 个!`);
+      this.$message.warning(`上传文件数量不能超过 ${this.limit} 个!`);
     },
     // 上传失败
     handleUploadError(res) {

src/components/ObsImageUpload/indexFile.vue

@@ -125,7 +125,9 @@ export default {
           // 然后将数组转为对象数组
           return list.map(item => {
             if (typeof item == "object") {
-              item = { name: item.fileName, url: item.picUrl };
+              if (item.hasOwnProperty('fileName')&&item.hasOwnProperty('picUrl')) {
+                item = {name: item.fileName, url: item.picUrl};
+              }
             }
             return item;
           });

src/views/zdsz/enginSpecifications/index.vue

@@ -61,17 +61,17 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['zdsz:enginSpecifications:export']"
-        >导出
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['zdsz:enginSpecifications:export']"-->
+<!--        >导出-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

src/views/zdsz/engineeringIndustry/index.vue

@@ -204,7 +204,7 @@
         </el-form-item>
         <el-row :gutter="20">
           <el-col :span="24">
-            <el-form-item label="附件" prop="files" v-if="form.id" style="width: 100%">
+            <el-form-item label="附件" v-if="form.id" style="width: 100%">
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
                              :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']"
                              :limit="9999"
@@ -212,7 +212,7 @@
                              @input="filesUpload"
               ></ObsFileUpload>
             </el-form-item>
-            <el-form-item label="附件" prop="files" v-else style="width: 100%">
+            <el-form-item label="附件" v-else style="width: 100%">
               <ObsFileUpload ref="obsFileUpload" :file-size="100"
                              :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']"
                              :limit="9999"

src/views/zdsz/house/index.vue

@@ -346,8 +346,8 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      this.builds = []
-      this.units = []
+      // this.builds = []
+      // this.units = []
       this.getList();
     },
     /** 重置按钮操作 */