uniapp历史分页修改

src/views/gas/courtyardNetworkManagement/index.vue

@@ -32,8 +32,8 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建人" prop="createBy">
-        <el-select v-model="queryParams.createBy" filterable placeholder="请选择创建人" clearable size="small">
+      <el-form-item label="上传人" prop="createBy">
+        <el-select v-model="queryParams.createBy" filterable placeholder="请选择上传人" clearable size="small">
           <el-option v-for="item in workerListSelect"
                      :key="item.id"
                      :label="item.name"
@@ -163,7 +163,7 @@
           <span v-else>未审核</span>
         </template>
       </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createName"/>
+      <el-table-column label="上传人" align="center" prop="createName"/>
       <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="照片" align="center">
         <template slot-scope="scope">

src/views/gas/pressureRegulatingBox/index.vue

@@ -132,6 +132,11 @@
       <el-table-column label="经度" align="center" prop="longitude"/>
       <el-table-column label="纬度" align="center" prop="latitude"/>
       <el-table-column label="巡检次数" align="center" prop="inspectionFrequency"/>
+      <el-table-column label="上传时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -259,16 +264,16 @@
               <el-input v-model="form.latitude" placeholder="请输入纬度"/>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="巡检人" >
-              <el-select v-model="form.inspector" filterable placeholder="请选择巡检人" multiple clearable size="small">
-                <el-option v-for="item in workerList"
-                           :key="item.id"
-                           :label="item.name"
-                           :value="item.id"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="巡检人" >-->
+<!--              <el-select v-model="form.inspector" filterable placeholder="请选择巡检人" multiple clearable size="small">-->
+<!--                <el-option v-for="item in workerList"-->
+<!--                           :key="item.id"-->
+<!--                           :label="item.name"-->
+<!--                           :value="item.id"/>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -627,7 +632,7 @@ export default {
         updateBy: undefined,
         pressureRegulatingBoxDetailsBo: undefined,
         updateTime: undefined,
-        inspector:undefined,
+        // inspector:undefined,
       };
       this.resetForm("form");
     },
@@ -662,7 +667,7 @@ export default {
       getPressureRegulatingBox(id).then(response => {
         this.loading = false;
         this.form = response.data;
-        this.form.inspector = response.data.inspector != null ? response.data.inspector.split(",").map(Number):undefined;
+        // this.form.inspector = response.data.inspector != null ? response.data.inspector.split(",").map(Number):undefined;
         this.pressureRegulatingBoxDetailsBo = response.data.pressureRegulatingBoxDetailsVo[0];
         this.open = true;
         this.title = "修改调压箱管理";
@@ -675,7 +680,7 @@ export default {
           this.buttonLoading = true;
           this.form.pressureRegulatingBoxDetailsBo = this.pressureRegulatingBoxDetailsBo
           if (this.form.id != null) {
-            this.form.inspector = this.form.inspector.join(',')
+            // this.form.inspector = this.form.inspector.join(',')
             updatePressureRegulatingBox(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -684,7 +689,7 @@ export default {
               this.buttonLoading = false;
             });
           } else {
-            this.form.inspector = this.form.inspector.join(',')
+            // this.form.inspector = this.form.inspector.join(',')
             addPressureRegulatingBox(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

src/views/gas/regulatingBoxMaintenance/index.vue

@@ -38,7 +38,7 @@
         />
       </el-form-item>
       <el-form-item label="管理所" prop="administrativeOffice">
-        <el-select v-model="queryParams.administrativeOffice" placeholder="请选择维护项目" clearable size="small"
+        <el-select v-model="queryParams.administrativeOffice" placeholder="请选择管理所" clearable size="small"
                    @keyup.enter.native="handleQuery">
           <el-option
             v-for="dict in dict.type.administrative_office"

src/views/gas/regulatorBox/index.vue

@@ -5,13 +5,15 @@
         <el-input v-model="queryParams.name" placeholder="请输入调压箱名称" clearable size="small" @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="管理所" prop="administrativeOffice">
-        <el-input
-          v-model="queryParams.administrativeOffice"
-          placeholder="请输入管理所"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.administrativeOffice" placeholder="请选择管理所" clearable size="small"
+                   @keyup.enter.native="handleQuery">
+          <el-option
+            v-for="dict in dict.type.administrative_office"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="编号" prop="number">
         <el-input
@@ -32,8 +34,8 @@
           ></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建人" prop="createBy">
-        <el-select v-model="queryParams.createBy" filterable placeholder="请选择创建人" clearable size="small">
+      <el-form-item label="上传人" prop="createBy">
+        <el-select v-model="queryParams.createBy" filterable placeholder="请选择上传人" clearable size="small">
           <el-option v-for="item in workerListSelect"
                      :key="item.id"
                      :label="item.name"
@@ -147,7 +149,7 @@
         </template>
       </el-table-column>
       <el-table-column label="编号" align="center" prop="number"/>
-      <el-table-column label="创建人" align="center" prop="createByName"/>
+      <el-table-column label="上传人" align="center" prop="createByName"/>
       <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">

src/views/gas/user/springIoc/area.vue

@@ -84,7 +84,7 @@
             :total="total1"
             :page.sync="queryParams1.pageNum"
             :limit.sync="queryParams1.pageSize"
-            @pagination="getList"
+            @pagination="getlist"
           />
         </el-tab-pane>
       </el-tabs>
@@ -153,24 +153,31 @@ export default {
         return delNetworkRelation(ids,this.jobNum);
       }).then(() => {
         this.loading1 = false;
-        this.handleClick();
+        this.getlist();
         this.$modal.msgSuccess("删除成功");
       }).finally(() => {
         this.loading1 = false;
       });
     },
-    handleClick(tab,event){
-      console.log(this.activeName)
+    getlist(){
       this.loading1 = true;
-      this.queryParams1.jobNum=this.jobNum
-      this.queryParams1.pageNum=1
-      this.myList=[]
       myListArea(this.queryParams1).then(response => {
         this.myList = response.rows;
         this.total1 = response.total;
         this.loading1 = false;
       });
     },
+    handleClick(tab,event){
+      if (this.activeName=='2'){
+        this.queryParams1.pageNum=1
+        this.queryParams1.jobNum=this.jobNum
+        this.getlist()
+      }else {
+        this.queryParams.pageNum=1;
+        this.queryParams.jobNum=this.jobNum
+        this.getList();
+      }
+    },
     getData(){
       this.loading1=true
       let entity = {ids:[],jobNum:this.jobNum};

src/views/gas/user/springIoc/tyx.vue

@@ -125,7 +125,7 @@
             :total="total1"
             :page.sync="queryParams1.pageNum"
             :limit.sync="queryParams1.pageSize"
-            @pagination="getList"
+            @pagination="getlist"
           />
         </el-tab-pane>
       </el-tabs>
@@ -222,24 +222,31 @@ export default {
         return delRegulatorBoxRelation(ids,this.jobNum);
       }).then(() => {
         this.loading1 = false;
-        this.handleClick();
+        this.getlist();
         this.$modal.msgSuccess("删除成功");
       }).finally(() => {
         this.loading1 = false;
       });
     },
-    handleClick(tab,event){
-      console.log(this.activeName)
-      this.loading1 = true;
-      this.queryParams1.jobNum=this.jobNum
-      this.queryParams1.pageNum=1
-      this.myList=[]
+    getlist(){
+      this.loading1=true
       myListRegulatorBox(this.queryParams1).then(response => {
         this.myList = response.rows;
         this.total1 = response.total;
         this.loading1 = false;
       });
     },
+    handleClick(tab,event){
+      if (this.activeName=='2'){
+        this.queryParams1.pageNum=1
+        this.queryParams1.jobNum=this.jobNum
+        this.getlist()
+      }else {
+        this.queryParams.pageNum=1;
+        this.queryParams.jobNum=this.jobNum
+        this.getList();
+      }
+    },
     getData(){
       this.loading1=true
       let entity = {ids:[],jobNum:this.jobNum};

src/views/gas/user/springIoc/vw.vue

@@ -116,7 +116,7 @@
             :total="total1"
             :page.sync="queryParams1.pageNum"
             :limit.sync="queryParams1.pageSize"
-            @pagination="getList"
+            @pagination="getlist"
           />
         </el-tab-pane>
       </el-tabs>
@@ -214,24 +214,31 @@ export default {
         return delValvewellRelation(ids,this.jobNum);
       }).then(() => {
         this.loading1 = false;
-        this.handleClick();
+        this.getlist();
         this.$modal.msgSuccess("删除成功");
       }).finally(() => {
         this.loading1 = false;
       });
     },
-    handleClick(tab,event){
-      console.log(this.activeName)
+    getlist(){
       this.loading1 = true;
-      this.queryParams1.jobNum=this.jobNum
-      this.queryParams1.pageNum=1
-      this.myList=[]
       myListValveWell(this.queryParams1).then(response => {
         this.myList = response.rows;
         this.total1 = response.total;
         this.loading1 = false;
       });
     },
+    handleClick(tab,event){
+      if (this.activeName=='2'){
+        this.queryParams1.pageNum=1
+        this.queryParams1.jobNum=this.jobNum
+        this.getlist()
+      }else {
+        this.queryParams.pageNum=1;
+        this.queryParams.jobNum=this.jobNum
+        this.getList();
+      }
+    },
     getData(){
       this.loading1=true
       let entity = {ids:[],jobNum:this.jobNum};

src/views/gas/valveWellPosition/index.vue

@@ -119,6 +119,11 @@
       <el-table-column label="积水情况" align="center" prop="waterCondition" />
       <el-table-column label="压力等级" align="center" prop="pressureRating" />
       <el-table-column label="是否需要下井才能开关阀门" align="center" prop="isXyxjcnkg" />
+      <el-table-column label="上传时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">