Merge branch 'release-sy-v1.0.0' into 'dev'

Release sy v1.0.0

See merge request project/water/shuili-vue!84

src/views/dike/runManage/dangerWeakProject/inspectItemsSetting/index.vue

@@ -12,7 +12,7 @@
           class="items-list-item"
           @click="handleToItemsSetting(item)"
         >
-          <div class="font-14 font-bold">{{ item.name }}</div>
+          <div class="font-14 font-bold text-overflow-2">{{ item.name }}</div>
           <div class="font-12 mt-18">创建时间：{{ item.createTime }}</div>
           <div class="font-12 mt-6">
             最后更新: {{ getCreator(item.updateUid) }}
@@ -212,5 +212,14 @@ export default {
       }
     }
   }
+
+  // 文案移除显示2行
+  .text-overflow-2 {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 2;
+  }
 }
 </style>

src/views/sluice/runManage/dangerWeakProject/inspectItemsSetting/index.vue

@@ -12,7 +12,7 @@
           class="items-list-item"
           @click="handleToItemsSetting(item)"
         >
-          <div class="font-14 font-bold">{{ item.name }}</div>
+          <div class="font-14 font-bold text-overflow-2">{{ item.name }}</div>
           <div class="font-12 mt-18">创建时间：{{ item.createTime }}</div>
           <div class="font-12 mt-6">
             最后更新: {{ getCreator(item.updateUid) }}
@@ -214,4 +214,12 @@ export default {
     }
   }
 }
+// 文案移除显示2行
+.text-overflow-2 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
 </style>

src/views/sluice/runManage/dispatch/plan/components/edit.vue

@@ -85,6 +85,7 @@ export default {
     handleUpload(e) {
       const {file} = e;
       let formData = new FormData();
+      console.log(file)
       formData.append("file", file);
       uploadFileData(formData)
           .then((res) => {
@@ -93,7 +94,7 @@ export default {
               url: res.url,
             })
             if (this.ruleForm.docs.length === 1) {
-              this.ruleForm.planName = res.fileName
+              this.ruleForm.planName = file.name.split('.')[0]
             }
             this.fileList = this.ruleForm.docs
           })
@@ -207,14 +208,13 @@ export default {
               :before-remove="beforeRemove"
               :before-upload="beforeUpload"
               :on-remove="handleOpinionRemove"
-              :on-success="submitOpinionUpload"
               multiple
               accept=".doc, .docx, .pdf, .png, .jpg"
               :limit="5"
               :on-exceed="handleExceed"
               :file-list="fileList">
             <el-button size="small" type="primary">点击上传</el-button>
-            <div slot="tip" class="el-upload__tip">只能上传doc/docx/pdf/png/JPG文件，且不能超过50m</div>
+            <div slot="tip" class="el-upload__tip">只能上传doc/docx/pdf/png/jpg且不能超过50m</div>
           </el-upload>
         </el-form-item>
       </el-col>