`fix`

src/utils/request.js

@@ -18,7 +18,7 @@ const service = axios.create({
     // axios中请求配置有baseURL选项，表示请求URL公共部分
     baseURL: import.meta.env.VITE_APP_BASE_API,
     // 超时
-    timeout: 10000
+    timeout: 10000000
 })
 console.log(
     import.meta.env.VITE_APP_BASE_API);
@@ -156,4 +156,4 @@ export function download(url, params, filename) {
     })
 }
 
-export default service
+export default service

src/views/detection/list/index.vue

@@ -78,6 +78,10 @@
             <el-button type="primary" @click="getList">查询</el-button>
           </el-form-item>
           <el-form-item>
+                <el-button type="primary" @click="export1">导出</el-button>
+              </el-form-item>
+
+          <el-form-item>
             <el-button type="success" @click="adddetection">新增</el-button>
           </el-form-item>
         </div>
@@ -805,6 +809,45 @@ const getList = () => {
   });
 };
 
+
+const export1 = () => {
+
+  if (currentstatus.value != 1) {
+    if (currentstatus.value == 2) {
+      queryparameters.value.params["status"] = "1,2,3";
+    } else {
+      queryparameters.value.params["status"] = "4,6";
+    }
+    // delete queryparameters.value.status;
+  } else {
+    // queryparameters.value.status = "";
+  }
+
+  var cq = cloneDeep(queryparameters.value);
+  var query = proxy.addDateRange(cq, qdate.value);
+  if (query.status == "0") {
+    delete query.status;
+  }
+  if (query.searchkey != undefined && query.searchkey !== "") {
+    query.params["searchkey"] = query.searchkey;
+  }
+  if (query.area != undefined && query.area !== "") {
+    query.params["area"] = query.area;
+  }
+  if (query.taskDeptRange != undefined) {
+    query.taskDeptRange = query.taskDeptRange.join(",");
+  }
+
+  proxy.download(
+    "system/detection/export1",
+    {
+      ...query,
+    },
+    `【设施检测】南宁北排检测计划、根据、成果上报.xlsx`
+  );
+
+}
+
 const getyears = () => {
   var years = [];
   for (var i = 0; i <= 100; i++) {

src/views/maintain/list/index.vue

@@ -58,6 +58,9 @@
             <el-button type="primary" @click="getList">查询</el-button>
           </el-form-item>
           <el-form-item>
+              <el-button type="primary" @click="export1">导出</el-button>
+            </el-form-item>
+          <el-form-item>
             <el-button type="success" @click="addmaintain">新增</el-button>
           </el-form-item>
         </div>
@@ -615,6 +618,40 @@ const onadd = () => {
   }
 };
 
+const export1 = () => {
+
+  if (currentstatus.value != 1) {
+    if (currentstatus.value == 2) {
+      queryparameters.value.params["status"] = "1,2,3,4";
+    } else {
+      queryparameters.value.status = currentstatus.value;
+    }
+  } else {
+    // queryparameters.value.status = "";
+  }
+  // console.error(queryparameters.value.status)
+
+  var cq = cloneDeep(queryparameters.value);
+  var query = proxy.addDateRange(cq, qdate.value);
+  if (query.status == "0") {
+    delete query.status;
+  }
+  if (query.searchkey != undefined && query.searchkey !== "") {
+    query.params["searchkey"] = query.searchkey;
+  }
+  if (query.taskDeptRange != undefined) {
+    query.taskDeptRange = query.taskDeptRange.join(",");
+  }
+  proxy.download(
+    "system/maintain/export1",
+    {
+      ...query,
+    },
+    `【设施养护】计划、跟进、成果上报.xlsx`
+  );
+
+}
+
 const getList = () => {
   localStorage.setItem("maintainlist", JSON.stringify(queryparameters.value));
   if (currentstatus.value != 1) {

src/views/system/facilities/index.vue

@@ -3,7 +3,6 @@
     <el-form
       :model="queryParams"
       ref="queryForm"
-      size="small"
       :inline="true"
       v-show="showSearch"
       label-width="68px"
@@ -76,16 +75,27 @@
 
       </el-form-item>
 
-      <el-form-item>
+
+      <!-- <el-form-item>
         <el-button type="primary" icon="search" size="mini" @click="handleQuery"
           >搜索</el-button
         >
         <el-button icon="refresh" type="primary" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
 
     <el-row :gutter="10" class="mb8">
 
+       <el-col :span="1.5">
+          <el-button type="primary" icon="search" size="mini" @click="handleQuery"
+            >搜索</el-button
+          >
+        </el-col>
+
+         <el-col :span="1.5">
+           <el-button icon="refresh" type="primary" size="mini" @click="resetQuery">重置</el-button>
+        </el-col>
+
       <el-col :span="1.5">
         <el-button type="danger" icon="Delete" size="mini" :disabled="multiple" @click.stop="handleDelete"
           v-hasPermi="['system:facilities:remove']">删除</el-button>
@@ -135,7 +145,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="序号" align="center" prop="id" /> -->
       <el-table-column label="台账编号" align="center" prop="ext1.tz_id" />
-      <el-table-column label="行政区属" align="center" prop="ext1.tz_area_new">
+      <el-table-column label="设施名称" align="center" prop="ext1.tz_ss_name" />
+      <el-table-column label="行政区" align="center" prop="ext1.tz_area_new">
         <template #default="scope">
           {{
             (sys_area ?? []).filter((i) => i.value === scope.row.ext1.tz_area_new + "")[0]
@@ -144,7 +155,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="设施名称" align="center" prop="ext1.tz_ss_name" />
+
       <el-table-column label="排水体制" align="center" prop="ext1.tz_ss_pstz">
         <template #default="scope">
           {{
@@ -175,6 +186,12 @@
           }}
         </template>
       </el-table-column>
+      <el-table-column label="检查井(座)" align="center" prop="ext1.tz_ss_data_jing" />
+      <el-table-column label="雨水口(座)" align="center" prop="ext1.tz_ss_data_ysk" />
+      <el-table-column label="排河口(座)" align="center" prop="ext1.tz_pfk" />
+      <el-table-column label="流域名称" align="center" prop="ext1.tz_ss_dn" />
+      <el-table-column label="备注" align="center" prop="ext1.tz_ss_more" />
+
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -693,11 +710,12 @@ const submitForm = () => {
 };
 /** 删除按钮操作 */
 const handleDelete = (row) => {
-  const ids = row.id || ids.value;
+  debugger
+  const ids1 = row.id || ids.value;
   proxy.$modal
-    .confirm('是否确认删除设施编号为"' + ids + '"的数据项？')
+    .confirm('是否确认删除设施编号为"' + ids1 + '"的数据项？')
     .then(function () {
-      return delFacilities(ids);
+      return delFacilities(ids1);
     })
     .then(() => {
       getList();

src/views/task/list/index.vue

@@ -103,6 +103,14 @@
               <el-form-item>
                 <el-button type="primary" @click="reset()">重置</el-button>
               </el-form-item>
+
+              <el-form-item>
+                <el-button
+                  type="primary"
+                    @click.stop="exportexcel3()"
+                    >导出
+                  </el-button>
+             </el-form-item>
               <el-form-item v-if="route.params.status == 6">
                 <el-button type="primary" @click="exportexcel2(queryparameters)"
                   >导出成本记录
@@ -514,6 +522,41 @@ const exportexcel2 = (row) => {
     `成本记录.xlsx`
   );
 };
+const exportexcel3 = () => {
+  if (
+    currentstatus.value !== "1" &&
+    currentstatus.value !== 1 &&
+    (queryparameters.value.status === "" || queryparameters.value.status == 0)
+  ) {
+
+    if (currentstatus.value == "2" || currentstatus.value == 2) {
+      queryparameters.value.status = 1;
+    } else {
+      queryparameters.value.status = currentstatus.value;
+    }
+  } else {
+    // queryparameters.value.status = "";
+  }
+  var cq = cloneDeep(queryparameters.value);
+
+  var query = proxy.addDateRange(cq, qdate.value);
+  if (query.status == "0") {
+    delete query.status;
+  }
+  if (query.searchkey != undefined && query.searchkey !== "") {
+    query.params["searchkey"] = query.searchkey;
+  }
+  if (query.taskDeptRange != undefined) {
+    query.taskDeptRange = query.taskDeptRange.join(",");
+  }
+  proxy.download(
+    "system/task/export3",
+    {
+      ...query,
+    },
+    `【热线调度】计划、跟进、成果上报.xlsx`
+  );
+};
 
 const tableRowClassName = ({ row, rowIndex }) => {
   if (