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

fix: 添加请求控制

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

src/views/dike/runManage/enginerring/inspectionRecords/components/RecordDetails.vue

@@ -232,6 +232,7 @@ export default {
       labelMapData: {},
       detailData: {},
       treeData: [],
+      xcClassfyOptions: [],
       entries: {},
     };
   },
@@ -246,7 +247,11 @@ export default {
       immediate: true,
     },
   },
-  created() {},
+  created() {
+    this.getDicts("xs_classfy").then((response) => {
+      this.xcClassfyOptions = response.data;
+    });
+  },
   methods: {
     handleChangeCollapse() {},
     initData() {

src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue

@@ -122,6 +122,7 @@
         <el-radio-group
           size="small"
           v-model="displayType"
+          :disabled="isLoading"
           @change="handleChangeDisplayType"
         >
           <el-radio-button label="2">平铺</el-radio-button>
@@ -153,178 +154,190 @@
         border
         @expand-change="handleTriggerRowExpand"
         @selection-change="handleSelectionChange"
+        v-loading="isLoading"
       >
-        <el-table-column type="expand" v-if="displayType === '1'" key="expand">
-          <template slot-scope="scope">
-            <div class="expand-box">
-              <el-row class="row row-header flex">
-                <el-col class="row-item row-checkbox">
-                  <el-checkbox
-                    v-model="scope.row.allChecked"
-                    @change="(e) => handleChangeRowAllChecked(e, scope.row)"
-                  ></el-checkbox>
-                </el-col>
-                <el-col class="row-item">路线名称</el-col>
-                <el-col class="row-item">巡查类型</el-col>
-                <el-col class="row-item">巡查人员类型</el-col>
-                <el-col class="row-item">巡查人员</el-col>
-                <el-col class="row-item">创建时间</el-col>
-                <el-col class="row-item row-operate">操作</el-col>
-              </el-row>
-              <el-row
-                class="row row-body flex"
-                v-for="(item, index) in scope.row.expendData"
-                :key="index"
-              >
-                <el-col class="row-item row-checkbox">
-                  <el-checkbox
-                    v-model="item.isChecked"
-                    @change="(e) => handleChangeRowChecked(e, scope.row, item)"
-                  ></el-checkbox>
-                </el-col>
-                <el-col class="row-item">{{ item.name }}</el-col>
-                <el-col class="row-item">{{
-                  getProTypeDictLabelName(item.dikeType)
-                }}</el-col>
-                <el-col class="row-item">{{
-                  getPersonTypeDictLabelName(item.dutyHolderType)
-                }}</el-col>
-                <el-col class="row-item">
-                  {{
-                    item.dutyHolders &&
-                    item.dutyHolders.find((v) => v.dutyHolderType === "0") &&
-                    item.dutyHolders.find((v) => v.dutyHolderType === "0").name
-                  }}
-                </el-col>
-                <el-col class="row-item">{{ item.updateTime }}</el-col>
-                <el-col class="row-item row-operate">
-                  <el-button
-                    class="custom-btn"
-                    type="text"
-                    @click="handleCheck(item)"
-                    >查看</el-button
-                  >
-                  <el-button
-                    class="custom-btn"
-                    type="text"
-                    @click="handleEdit(item)"
-                    >编辑</el-button
-                  >
-                  <el-button
-                    class="custom-btn"
-                    type="text"
-                    @click="handleDel(item)"
-                    >删除</el-button
-                  >
-                </el-col>
-              </el-row>
-              <el-row
-                v-if="!scope.row.expendData || !scope.row.expendData.length"
+        <template v-if="displayType === '1'">
+          <el-table-column type="expand" key="expand">
+            <template slot-scope="scope">
+              <div class="expand-box">
+                <el-row class="row row-header flex">
+                  <el-col class="row-item row-checkbox">
+                    <el-checkbox
+                      v-model="scope.row.allChecked"
+                      @change="(e) => handleChangeRowAllChecked(e, scope.row)"
+                    ></el-checkbox>
+                  </el-col>
+                  <el-col class="row-item">路线名称</el-col>
+                  <el-col class="row-item">巡查类型</el-col>
+                  <el-col class="row-item">巡查人员类型</el-col>
+                  <el-col class="row-item">巡查人员</el-col>
+                  <el-col class="row-item">创建时间</el-col>
+                  <el-col class="row-item row-operate">操作</el-col>
+                </el-row>
+                <el-row
+                  class="row row-body flex"
+                  v-for="(item, index) in scope.row.expendData"
+                  :key="index"
+                >
+                  <el-col class="row-item row-checkbox">
+                    <el-checkbox
+                      v-model="item.isChecked"
+                      @change="
+                        (e) => handleChangeRowChecked(e, scope.row, item)
+                      "
+                    ></el-checkbox>
+                  </el-col>
+                  <el-col class="row-item">{{ item.name }}</el-col>
+                  <el-col class="row-item">{{
+                    getProTypeDictLabelName(item.dikeType)
+                  }}</el-col>
+                  <el-col class="row-item">{{
+                    getPersonTypeDictLabelName(item.dutyHolderType)
+                  }}</el-col>
+                  <el-col class="row-item">
+                    {{
+                      item.dutyHolders &&
+                      item.dutyHolders.find((v) => v.dutyHolderType === "0") &&
+                      item.dutyHolders.find((v) => v.dutyHolderType === "0")
+                        .name
+                    }}
+                  </el-col>
+                  <el-col class="row-item">{{ item.updateTime }}</el-col>
+                  <el-col class="row-item row-operate">
+                    <el-button
+                      class="custom-btn"
+                      type="text"
+                      @click="handleCheck(item)"
+                      >查看</el-button
+                    >
+                    <el-button
+                      class="custom-btn"
+                      type="text"
+                      @click="handleEdit(item)"
+                      >编辑</el-button
+                    >
+                    <el-button
+                      class="custom-btn"
+                      type="text"
+                      @click="handleDel(item)"
+                      >删除</el-button
+                    >
+                  </el-col>
+                </el-row>
+                <el-row
+                  v-if="!scope.row.expendData || !scope.row.expendData.length"
+                >
+                  <div>暂无数据</div>
+                </el-row>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="dikeName" align="center" label="堤防名称" />
+          <el-table-column prop="dikeType" align="center" label="堤防类型">
+            <template #default="{ row }">
+              {{
+                projectTypeOptions.find((v) => v.dictValue == row.dikeType) &&
+                projectTypeOptions.find((v) => v.dictValue == row.dikeType)
+                  .dictLabel
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="operatorName"
+            align="center"
+            label="行政责任人"
+          >
+            <template #default="{ row }">
+              {{
+                row.dutyHolders &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "2") &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "2").name
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="operatorName"
+            align="center"
+            label="巡查责任人"
+          >
+            <template #default="{ row }">
+              {{
+                row.dutyHolders &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "0") &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "0").name
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="operatorName"
+            align="center"
+            label="技术责任人"
+          >
+            <template #default="{ row }">
+              {{
+                row.dutyHolders &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "1") &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "1").name
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="operate"
+            align="center"
+            label="操作"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="small"
+                @click="handleCheckDetail(scope.row)"
+                >查看</el-button
               >
-                <div>暂无数据</div>
-              </el-row>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          type="selection"
-          v-if="displayType === '2'"
-          key="selection"
-        ></el-table-column>
-        <el-table-column
-          prop="dikeName"
-          align="center"
-          label="堤防名称"
-          key="dikeName"
-        />
-        <el-table-column
-          key="dikeType"
-          prop="dikeType"
-          align="center"
-          label="堤防类型"
-        >
-          <template #default="{ row }">
-            {{
-              projectTypeOptions.find((v) => v.dictValue == row.dikeType) &&
-              projectTypeOptions.find((v) => v.dictValue == row.dikeType)
-                .dictLabel
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          key="name"
-          prop="name"
-          align="center"
-          label="巡查路线名称"
-          v-if="displayType === '2'"
-        />
-        <el-table-column
-          key="type"
-          prop="type"
-          align="center"
-          label="巡查类型"
-          v-if="displayType === '2'"
-        >
-          <template #default="{ row }">
-            {{
-              lineTypeOptions.find((v) => v.dictValue == row.type) &&
-              lineTypeOptions.find((v) => v.dictValue == row.type).dictLabel
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="operatorName"
-          key="operatorName2"
-          align="center"
-          label="行政责任人"
-          v-if="displayType === '1'"
-        >
-          <template #default="{ row }">
-            {{
-              row.dutyHolders &&
-              row.dutyHolders.find((v) => v.dutyHolderType == "2") &&
-              row.dutyHolders.find((v) => v.dutyHolderType == "2").name
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          key="operatorName0"
-          prop="operatorName"
-          align="center"
-          label="巡查责任人"
-        >
-          <template #default="{ row }">
-            {{
-              row.dutyHolders &&
-              row.dutyHolders.find((v) => v.dutyHolderType == "0") &&
-              row.dutyHolders.find((v) => v.dutyHolderType == "0").name
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          key="operatorName1"
-          prop="operatorName"
-          align="center"
-          label="技术责任人"
-          v-if="displayType === '1'"
-        >
-          <template #default="{ row }">
-            {{
-              row.dutyHolders &&
-              row.dutyHolders.find((v) => v.dutyHolderType == "1") &&
-              row.dutyHolders.find((v) => v.dutyHolderType == "1").name
-            }}
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="operate"
-          align="center"
-          label="操作"
-          fixed="right"
-        >
-          <template slot-scope="scope">
-            <template v-if="displayType === '2'">
+            </template>
+          </el-table-column>
+        </template>
+        <template v-else-if="displayType === '2'">
+          <el-table-column key="selection" type="selection"></el-table-column>
+          <el-table-column prop="dikeName" align="center" label="堤防名称" />
+          <el-table-column prop="dikeType" align="center" label="堤防类型">
+            <template #default="{ row }">
+              {{
+                projectTypeOptions.find((v) => v.dictValue == row.dikeType) &&
+                projectTypeOptions.find((v) => v.dictValue == row.dikeType)
+                  .dictLabel
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="name" align="center" label="巡查路线名称" />
+          <el-table-column prop="type" align="center" label="巡查类型">
+            <template #default="{ row }">
+              {{
+                lineTypeOptions.find((v) => v.dictValue == row.type) &&
+                lineTypeOptions.find((v) => v.dictValue == row.type).dictLabel
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="operatorName"
+            align="center"
+            label="巡查责任人"
+          >
+            <template #default="{ row }">
+              {{
+                row.dutyHolders &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "0") &&
+                row.dutyHolders.find((v) => v.dutyHolderType == "0").name
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="operate"
+            align="center"
+            label="操作"
+            fixed="right"
+          >
+            <template slot-scope="scope">
               <el-button
                 class="custom-btn"
                 type="text"
@@ -346,15 +359,8 @@
                 >删除</el-button
               >
             </template>
-            <el-button
-              v-else
-              type="text"
-              size="small"
-              @click="handleCheckDetail(scope.row)"
-              >查看</el-button
-            >
-          </template>
-        </el-table-column>
+          </el-table-column>
+        </template>
       </el-table>
       <el-pagination
         background
@@ -439,6 +445,7 @@ export default {
   data() {
     return {
       displayType: "1", // 1: 按堤防 2: 平铺
+      isLoading: false,
       showBaseDetailDialog: false,
       showRouteDetailDialog: false,
       areasOptionProps: {
@@ -483,6 +490,7 @@ export default {
   },
   methods: {
     getTableData() {
+      this.isLoading = true;
       this.tableCheckData = [];
       if (this.displayType === "2") {
         getProjectCheckingLineRoute({
@@ -491,10 +499,14 @@ export default {
           data: {
             ...this.paramsData,
           },
-        }).then((response) => {
-          this.tableData = response.records;
-          this.pageData.total = response.total;
-        });
+        })
+          .then((response) => {
+            this.tableData = response.records;
+            this.pageData.total = response.total;
+          })
+          .finally(() => {
+            this.isLoading = false;
+          });
       } else {
         getProjectCheckingLine({
           pageNum: this.pageData.pageNum,
@@ -502,16 +514,20 @@ export default {
           data: {
             ...this.paramsData,
           },
-        }).then((response) => {
-          this.tableData = response.records.map((v) => {
-            return {
-              ...v,
-              allChecked: false,
-              expendData: [],
-            };
+        })
+          .then((response) => {
+            this.tableData = response.records.map((v) => {
+              return {
+                ...v,
+                allChecked: false,
+                expendData: [],
+              };
+            });
+            this.pageData.total = response.total;
+          })
+          .finally(() => {
+            this.isLoading = false;
           });
-          this.pageData.total = response.total;
-        });
       }
     },
     getTreeData() {
@@ -664,7 +680,11 @@ export default {
         });
     },
     handleChangeDisplayType() {
+      this.tableData = [];
       this.getTableData();
+      setTimeout(() => {
+        this.$forceUpdate();
+      }, 30);
     },
     handleAdd() {
       this.$router.push("createRoutePage");