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

Release sy v1.0.0

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

src/views/dike/runManage/superVisionInspetion/methodsManage/details.vue

@@ -85,6 +85,10 @@ export default {
       });
     },
     handleSaveName() {
+      if (!this.detailsData.name) {
+        this.$message.warning("请输入名称");
+        return;
+      }
       postSuperviseWayData({
         id: this.$route.query.id || null,
         name: this.detailsData.name,

src/views/dike/runManage/superVisionInspetion/methodsManage/itemsDetails.vue

@@ -80,7 +80,11 @@
           </el-col>
           <el-col :span="9">
             <div class="item-row-content">
-              <el-input v-if="item.edit" v-model="item.content"></el-input>
+              <el-input
+                v-if="item.edit"
+                v-model="item.content"
+                :maxlength="500"
+              ></el-input>
               <div v-else>{{ item.content }}</div>
             </div>
           </el-col>
@@ -91,6 +95,7 @@
                   <el-input
                     v-if="item.edit"
                     v-model="item.sameGrade"
+                    :maxlength="100"
                   ></el-input>
                   <div v-else class="word-break">{{ item.sameGrade }}</div>
                 </div>
@@ -98,6 +103,7 @@
                   <el-input
                     v-if="item.edit"
                     v-model="item.heavyGrade"
+                    :maxlength="100"
                   ></el-input>
                   <div v-else class="word-break">{{ item.heavyGrade }}</div>
                 </div>
@@ -105,6 +111,7 @@
                   <el-input
                     v-if="item.edit"
                     v-model="item.seriousGrade"
+                    :maxlength="100"
                   ></el-input>
                   <div v-else class="word-break">{{ item.seriousGrade }}</div>
                 </div>
@@ -233,7 +240,7 @@ export default {
     // 删除问题项
     handleDelItem(item) {
       if (!item.id) {
-        this.questList = this.questList.filter((v) => v.id);
+        this.questList.splice(index, 1);
       } else {
         this.$confirm("是否删除该问题项", "提示", {
           confirmButtonText: "确定",
@@ -284,7 +291,7 @@ export default {
     margin-top: 20px;
     background-color: #fff;
     padding: 20px;
-    height: calc(100% - 56px);
+    height: calc(100% - 16px);
     .table-box {
       border: 1px solid #ccc;
       border-radius: 4px;

src/views/dike/runManage/superVisionInspetion/methodsManage/itemsList.vue

@@ -49,7 +49,7 @@
         class=""
       >
         <el-form-item label="名称" prop="name">
-          <el-input v-model="ruleForm.name"></el-input>
+          <el-input v-model="ruleForm.name" :maxlength="100"></el-input>
         </el-form-item>
       </el-form>
 

src/views/dike/runManage/superVisionInspetion/projectManage/projectReport.vue

@@ -332,6 +332,7 @@ export default {
           :disabled="isDisabled"
           class="ml-4"
           style="width: 240px"
+          :maxlength="100"
           v-model="formData.weather"
           placeholder="请输入"
         />
@@ -403,6 +404,7 @@ export default {
                     type="textarea"
                     v-model="item2.problemDescribe"
                     :rows="4"
+                    :maxlength="500"
                     :disabled="isDisabled"
                     placeholder="请输入内容"
                   />

src/views/dike/runManage/supervisionInspetion/methodsManage/details.vue

@@ -85,6 +85,10 @@ export default {
       });
     },
     handleSaveName() {
+      if (!this.detailsData.name) {
+        this.$message.warning("请输入名称");
+        return;
+      }
       postSuperviseWayData({
         id: this.$route.query.id || null,
         name: this.detailsData.name,

src/views/dike/runManage/supervisionInspetion/methodsManage/itemsDetails.vue

@@ -80,7 +80,11 @@
           </el-col>
           <el-col :span="9">
             <div class="item-row-content">
-              <el-input v-if="item.edit" v-model="item.content"></el-input>
+              <el-input
+                v-if="item.edit"
+                v-model="item.content"
+                :maxlength="500"
+              ></el-input>
               <div v-else>{{ item.content }}</div>
             </div>
           </el-col>
@@ -91,6 +95,7 @@
                   <el-input
                     v-if="item.edit"
                     v-model="item.sameGrade"
+                    :maxlength="100"
                   ></el-input>
                   <div v-else class="word-break">{{ item.sameGrade }}</div>
                 </div>
@@ -98,6 +103,7 @@
                   <el-input
                     v-if="item.edit"
                     v-model="item.heavyGrade"
+                    :maxlength="100"
                   ></el-input>
                   <div v-else class="word-break">{{ item.heavyGrade }}</div>
                 </div>
@@ -105,6 +111,7 @@
                   <el-input
                     v-if="item.edit"
                     v-model="item.seriousGrade"
+                    :maxlength="100"
                   ></el-input>
                   <div v-else class="word-break">{{ item.seriousGrade }}</div>
                 </div>
@@ -233,7 +240,7 @@ export default {
     // 删除问题项
     handleDelItem(item) {
       if (!item.id) {
-        this.questList = this.questList.filter((v) => v.id);
+        this.questList.splice(index, 1);
       } else {
         this.$confirm("是否删除该问题项", "提示", {
           confirmButtonText: "确定",
@@ -284,7 +291,7 @@ export default {
     margin-top: 20px;
     background-color: #fff;
     padding: 20px;
-    height: calc(100% - 56px);
+    height: calc(100% - 16px);
     .table-box {
       border: 1px solid #ccc;
       border-radius: 4px;

src/views/dike/runManage/supervisionInspetion/methodsManage/itemsList.vue

@@ -49,7 +49,7 @@
         class=""
       >
         <el-form-item label="名称" prop="name">
-          <el-input v-model="ruleForm.name"></el-input>
+          <el-input v-model="ruleForm.name" :maxlength="100"></el-input>
         </el-form-item>
       </el-form>
 

src/views/dike/runManage/supervisionInspetion/projectManage/projectReport.vue

@@ -332,6 +332,7 @@ export default {
           :disabled="isDisabled"
           class="ml-4"
           style="width: 240px"
+          :maxlength="100"
           v-model="formData.weather"
           placeholder="请输入"
         />
@@ -403,6 +404,7 @@ export default {
                     type="textarea"
                     v-model="item2.problemDescribe"
                     :rows="4"
+                    :maxlength="500"
                     :disabled="isDisabled"
                     placeholder="请输入内容"
                   />

src/views/sluice/runManage/supervisionInspetion/methodsManage/details.vue

@@ -85,6 +85,10 @@ export default {
       });
     },
     handleSaveName() {
+      if (!this.detailsData.name) {
+        this.$message.warning("请输入名称");
+        return;
+      }
       postSuperviseWayData({
         id: this.$route.query.id || null,
         name: this.detailsData.name,

src/views/sluice/runManage/supervisionInspetion/methodsManage/itemsDetails.vue

@@ -28,7 +28,13 @@
           v-model="searchVal"
           placeholder="请输入"
         />
-        <el-button type="primary" size="small" class="!ml-10">检索</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          class="!ml-10"
+          @click="handleSearch"
+          >检索</el-button
+        >
       </div>
       <div class="table-box">
         <el-row class="item-row">
@@ -74,7 +80,11 @@
           </el-col>
           <el-col :span="9">
             <div class="item-row-content">
-              <el-input v-if="item.edit" v-model="item.content"></el-input>
+              <el-input
+                v-if="item.edit"
+                v-model="item.content"
+                :maxlength="500"
+              ></el-input>
               <div v-else>{{ item.content }}</div>
             </div>
           </el-col>
@@ -85,6 +95,7 @@
                   <el-input
                     v-if="item.edit"
                     v-model="item.sameGrade"
+                    :maxlength="100"
                   ></el-input>
                   <div v-else class="word-break">{{ item.sameGrade }}</div>
                 </div>
@@ -92,6 +103,7 @@
                   <el-input
                     v-if="item.edit"
                     v-model="item.heavyGrade"
+                    :maxlength="100"
                   ></el-input>
                   <div v-else class="word-break">{{ item.heavyGrade }}</div>
                 </div>
@@ -99,6 +111,7 @@
                   <el-input
                     v-if="item.edit"
                     v-model="item.seriousGrade"
+                    :maxlength="100"
                   ></el-input>
                   <div v-else class="word-break">{{ item.seriousGrade }}</div>
                 </div>
@@ -225,9 +238,9 @@ export default {
       }
     },
     // 删除问题项
-    handleDelItem(item) {
+    handleDelItem(item, index) {
       if (!item.id) {
-        this.questList = this.questList.filter((v) => v.id);
+        this.questList.splice(index, 1);
       } else {
         this.$confirm("是否删除该问题项", "提示", {
           confirmButtonText: "确定",
@@ -278,7 +291,7 @@ export default {
     margin-top: 20px;
     background-color: #fff;
     padding: 20px;
-    height: calc(100% - 56px);
+    height: calc(100% - 16px);
     .table-box {
       border: 1px solid #ccc;
       border-radius: 4px;

src/views/sluice/runManage/supervisionInspetion/methodsManage/itemsList.vue

@@ -49,7 +49,7 @@
         class=""
       >
         <el-form-item label="名称" prop="name">
-          <el-input v-model="ruleForm.name"></el-input>
+          <el-input v-model="ruleForm.name" :maxlength="100"></el-input>
         </el-form-item>
       </el-form>
 

src/views/sluice/runManage/supervisionInspetion/projectManage/projectReport.vue

@@ -336,6 +336,7 @@ export default {
           :disabled="isDisabled"
           class="ml-4"
           style="width: 240px"
+          :maxlength="100"
           v-model="formData.weather"
           placeholder="请输入"
         />
@@ -407,6 +408,7 @@ export default {
                     type="textarea"
                     v-model="item2.problemDescribe"
                     :rows="4"
+                    :maxlength="500"
                     :disabled="isDisabled"
                     placeholder="请输入内容"
                   />