版本1.4.1 人员目录中间表

src/api/gas/networkRelation.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询庭院管网目录中间列表
+export function listNetworkRelation(query) {
+  return request({
+    url: '/gas/networkRelation/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询庭院管网目录中间详细
+export function getNetworkRelation(id) {
+  return request({
+    url: '/gas/networkRelation/' + id,
+    method: 'get'
+  })
+}
+
+// 新增庭院管网目录中间
+export function addNetworkRelation(data) {
+  return request({
+    url: '/gas/networkRelation',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改庭院管网目录中间
+export function updateNetworkRelation(data) {
+  return request({
+    url: '/gas/networkRelation',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除庭院管网目录中间
+export function delNetworkRelation(id) {
+  return request({
+    url: '/gas/networkRelation/' + id,
+    method: 'delete'
+  })
+}
+
+// 查询我的调压箱目录
+export function myListArea(query) {
+  return request({
+    url: '/gas/networkRelation/myList',
+    method: 'get',
+    params: query
+  })
+}

src/api/gas/valvewellRelation.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询阀井目录中间列表
+export function listValvewellRelation(query) {
+  return request({
+    url: '/gas/valvewellRelation/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询阀井目录中间详细
+export function getValvewellRelation(id) {
+  return request({
+    url: '/gas/valvewellRelation/' + id,
+    method: 'get'
+  })
+}
+
+// 新增阀井目录中间
+export function addValvewellRelation(data) {
+  return request({
+    url: '/gas/valvewellRelation',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改阀井目录中间
+export function updateValvewellRelation(data) {
+  return request({
+    url: '/gas/valvewellRelation',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除阀井目录中间
+export function delValvewellRelation(id) {
+  return request({
+    url: '/gas/valvewellRelation/' + id,
+    method: 'delete'
+  })
+}
+
+// 查询我的阀井目录
+export function myListValveWell(query) {
+  return request({
+    url: '/gas/valveWellPosition/myList',
+    method: 'get',
+    params: query
+  })
+}

src/views/gas/area/index.vue

@@ -127,11 +127,11 @@
         </template>
       </el-table-column>
       <el-table-column label="小区名" align="center" prop="name"/>
-      <el-table-column label="负责人" align="center" prop="userName">
+<!--      <el-table-column label="负责人" align="center" prop="userName">-->
         <!--        <template slot-scope="scope">-->
         <!--          {{ getUserName(scope.row.userId) }}-->
         <!--        </template>-->
-      </el-table-column>
+<!--      </el-table-column>-->
       <!--      <el-table-column label="是否释放" align="center" prop="releaseIs">-->
       <!--        <template slot-scope="scope">-->
       <!--          <dict-tag :options="dict.type.release_status" :value="scope.row.releaseIs"/>-->
@@ -236,14 +236,14 @@
         <el-form-item label="小区名" prop="name">
           <el-input v-model="form.name" placeholder="请输入小区名"/>
         </el-form-item>
-        <el-form-item label="负责人" prop="userIds">
-          <el-select v-model="userIds" multiple filterable placeholder="请选择负责人" style="width: 100%">
-            <el-option v-for="(item,index) in workerList"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"/>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="负责人" prop="userIds">-->
+<!--          <el-select v-model="userIds" multiple filterable placeholder="请选择负责人" style="width: 100%">-->
+<!--            <el-option v-for="(item,index) in workerList"-->
+<!--                       :key="index"-->
+<!--                       :label="item.name"-->
+<!--                       :value="item.id"/>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="行政区" prop="district">
           <el-select v-model="form.district" placeholder="请选择行政区" style="width: 100%">
             <el-option
@@ -287,7 +287,7 @@ import Cookies from "js-cookie";
 
 export default {
   name: "Area",
-  dicts: ['release_status', 'district', 'district','install_type'],
+  dicts: ['release_status', 'district','install_type'],
   data() {
     return {
       //进度条
@@ -352,9 +352,9 @@ export default {
         name: [
           {required: true, message: "小区名不能为空", trigger: "blur"}
         ],
-        userIds: [
-          {required: false, message: "负责人不能为空", trigger: "change"}
-        ],
+        // userIds: [
+        //   {required: false, message: "负责人不能为空", trigger: "change"}
+        // ],
         releaseIs: [
           {required: true, message: "是否释放不能为空", trigger: "change"}
         ],
@@ -544,7 +544,7 @@ export default {
       getArea(id).then(response => {
         this.loading = false;
         this.form = response.data;
-        this.userIds = response.data.userId == '' || response.data.userId == null ? [] : response.data.userId.split(",").map(Number);
+        // this.userIds = response.data.userId == '' || response.data.userId == null ? [] : response.data.userId.split(",").map(Number);
         this.form.userId = response.data.userId;
         this.open = true;
         this.title = "修改小区";
@@ -555,7 +555,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.buttonLoading = true;
-          this.form.userId = this.userIds.join(",")
+          // this.form.userId = this.userIds.join(",")
           if (this.form.releaseIs === 'Y') {
             this.form.releaseBy = this.$store.state.user.userId
           }

src/views/gas/user/index.vue

@@ -104,12 +104,26 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="selectYaBox(scope.row)"
+            @click="selectYaBox(scope.row,1)"
           >选择调压箱目录
           </el-button>
           <el-button
             size="mini"
             type="text"
+            icon="el-icon-edit"
+            @click="selectYaBox(scope.row,2)"
+          >选择庭院管网目录
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="selectYaBox(scope.row,3)"
+          >选择阀井目录
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['gas:user:remove']"
@@ -120,6 +134,8 @@
     </el-table>
 
     <tyx ref="tyx" v-if="tyxShow" @closeE="closeE"></tyx>
+    <areas ref="areas" v-if="areaShow" @closeF="closeF"></areas>
+    <vw ref="vw" v-if="vwShow" @closeF="closeG"></vw>
     <pagination
       v-show="total>0"
       :total="total"
@@ -201,8 +217,10 @@ import {listUser, getForPhone, getForJobnum, getUser, delUser, addUser, updateUs
 import {listPostAll} from "@/api/system/post";
 import Cookies from "js-cookie";
 import tyx from "@/views/gas/user/springIoc/tyx.vue";
+import areas from "@/views/gas/user/springIoc/area.vue";
+import vw from "@/views/gas/user/springIoc/vw.vue";
 export default {
-  components:{tyx},
+  components:{tyx,areas,vw},
   name: "User",
   dicts: ['user_type', 'engine_type', 'administrative_office'],
   data() {
@@ -248,6 +266,8 @@ export default {
     };
     return {
       tyxShow:false,
+      areaShow:false,
+      vwShow:false,
       // 按钮loading
       buttonLoading: false,
       // 遮罩层
@@ -313,15 +333,35 @@ export default {
     this.getList();
   },
   methods: {
-    selectYaBox(row){
-      this.tyxShow = true;
-      this.$nextTick(()=>{
-        this.$refs.tyx.init(row)
-      })
+    selectYaBox(row, index) {
+        if (index === 1) {
+          this.tyxShow = true;
+          this.$nextTick(() => {
+            this.$refs.tyx.init(row)
+          })
+        }
+        if (index === 2) {
+          this.areaShow = true;
+          this.$nextTick(() => {
+            this.$refs.areas.init(row)
+          })
+        }
+        if (index === 3) {
+          this.vwShow = true;
+          this.$nextTick(() => {
+            this.$refs.vw.init(row)
+          })
+        }
     },
     closeE(){
       this.tyxShow = false;
     },
+    closeF(){
+      this.areaShow = false;
+    },
+    closeG(){
+      this.vwShow = false;
+    },
     //获取岗位列
     getPostList(){
       listPostAll({remark:'ranks'}).then(response => {

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

@@ -0,0 +1,195 @@
+<template>
+    <el-dialog title="庭院管网目录" :visible.sync="show" width="1000px" append-to-body>
+      <el-tabs  v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="庭院管网" name="1">
+          <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+          <el-form-item label="行政区" prop="district">
+            <el-select v-model="queryParams.district" placeholder="请选择行政区" clearable size="small">
+              <el-option
+                v-for="dict in dict.type.district"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="小区名" prop="name">
+            <el-input
+              v-model="queryParams.name"
+              placeholder="请输入小区名"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+              <el-button @click="getData">选择</el-button>
+            </el-form-item>
+          </el-form>
+          <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center"/>
+            <el-table-column label="序列" width="70">
+              <template slot-scope="scope">
+                {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+              </template>
+            </el-table-column>
+            <el-table-column label="小区名" align="center" prop="name"/>
+            <el-table-column label="行政区" align="center" prop="district">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.district" :value="scope.row.district"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="小区规模" align="center" prop="areaSize"/>
+          </el-table>
+
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </el-tab-pane>
+        <el-tab-pane label="我的" name="2">
+          <el-table v-loading="loading1" :data="myList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center"/>
+            <el-table-column label="序列" width="70">
+              <template slot-scope="scope">
+                {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+              </template>
+            </el-table-column>
+            <el-table-column label="小区名" align="center" prop="name"/>
+            <el-table-column label="行政区" align="center" prop="district">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.district" :value="scope.row.district"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="小区规模" align="center" prop="areaSize"/>
+          </el-table>
+          <pagination
+            v-show="total1>0"
+            :total="total1"
+            :page.sync="queryParams1.pageNum"
+            :limit.sync="queryParams1.pageSize"
+            @pagination="getList"
+          />
+        </el-tab-pane>
+      </el-tabs>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="$emit('closeF')">关 闭</el-button>
+      </div>
+    </el-dialog>
+</template>
+
+
+<script>
+import {addNetworkRelation, listNetworkRelation, myListArea} from "@/api/gas/networkRelation";
+import Cookies from 'js-cookie'
+import {listArea} from "@/api/gas/area";
+export default {
+  name: "areas",
+  dicts: ['district'],
+  data() {
+    return {
+      activeName:'1',
+      show:false,
+      // 遮罩层
+      loading: false,
+      loading1: false,
+      total: 0,
+      total1: 0,
+      list: [],
+      myList: [],
+      title: "",
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: undefined,
+        userId: undefined,
+        jobNum: undefined,
+        district: undefined,
+        ranks: (Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
+      },
+      postName: Cookies.get("postName"),
+      queryParams1: {
+        pageNum: 1,
+        pageSize: 10,
+        name: undefined,
+        userId: undefined,
+        jobNum: undefined,
+        district: undefined,
+        ranks: (Cookies.get("postName").indexOf('xx') > -1 ? parseInt(Cookies.get("postId")) : undefined),
+      },
+      ids:[],
+      workerListSelect:[],
+      jobNum:undefined,
+    };
+  },
+  beforeDestroy() {
+    this.list = []
+    this.ids = []
+  },created() {
+  },
+  methods: {
+    handleClick(tab,event){
+      console.log(this.activeName)
+      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;
+      });
+    },
+    getData(){
+      this.loading1=true
+      let entity = {ids:[],jobNum:this.jobNum};
+      entity.ids = this.ids;
+      addNetworkRelation(entity).then(res=>{
+        if (res.code===200){
+          this.$msgbox.alert('添加成功')
+          this.loading1=false
+        }
+      })
+    },
+    init(user){
+      if (!user) return;
+      console.log(user)
+      this.show=true
+      this.jobNum = user.id
+      this.getList(user)
+      console.log(123)
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.createTimes = [];
+      this.handleQuery();
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      console.log(this.ids
+      )
+    },
+    /** 查询调压箱管理列表 */
+    getList(user) {
+      this.loading = true;
+      listArea(this.queryParams).then(response => {
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+  }
+};
+</script>

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

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog title="'调压箱目录'" :visible.sync="show" width="1000px" append-to-body>
+    <el-dialog title="调压箱目录" :visible.sync="show" width="1000px" append-to-body>
       <el-tabs  v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane label="调压箱目录" name="1">
           <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">

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

@@ -0,0 +1,253 @@
+<template>
+    <el-dialog title="庭院管网目录" :visible.sync="show" width="1000px" append-to-body>
+      <el-tabs  v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="庭院管网" name="1">
+          <el-form :model="queryParams" ref="queryForm" :inline="true">
+            <el-form-item label="阀井名称" prop="valveWellName">
+              <el-input
+                v-model="queryParams.valveWellName"
+                placeholder="请输入阀井名称"
+                clearable
+                size="small"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="位置" prop="position">
+              <el-input
+                v-model="queryParams.position"
+                placeholder="请输入位置"
+                clearable
+                size="small"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="时间范围" prop="createTimes">
+              <el-date-picker
+                v-model="queryParams.createTimes"
+                type="datetimerange"
+                :picker-options="pickerOptions"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                align="right">
+              </el-date-picker>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+              <el-button @click="getData">选择</el-button>
+            </el-form-item>
+          </el-form>
+          <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="序列" width="70">
+              <template slot-scope="scope">
+                {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+              </template>
+            </el-table-column>
+            <el-table-column label="阀井名称" align="center" prop="valveWellName" />
+            <el-table-column label="位置" align="center" prop="position" />
+            <el-table-column label="经度" align="center" prop="longitude" />
+            <el-table-column label="纬度" align="center" prop="latitude" />
+            <el-table-column label="控制区域" align="center" prop="remark" />
+            <el-table-column label="行政区" align="center" prop="district" >
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.district" :value="scope.row.district"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="队伍" align="center" prop="team" />
+            <el-table-column label="阀头形状" align="center" prop="valveHeadShape" />
+            <el-table-column label="阀井深度(米)" align="center" prop="valveWellDepth" />
+            <el-table-column label="井盖代别" align="center" prop="manholeCoverInstead" />
+            <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="remarks" show-overflow-tooltip/>
+          </el-table>
+
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </el-tab-pane>
+        <el-tab-pane label="我的" name="2">
+          <el-table v-loading="loading1" :data="myList">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="序列" width="70">
+              <template slot-scope="scope">
+                {{(queryParams.pageNum-1)*queryParams.pageSize+scope.$index+1}}
+              </template>
+            </el-table-column>
+            <el-table-column label="阀井名称" align="center" prop="valveWellName" />
+            <el-table-column label="位置" align="center" prop="position" />
+            <el-table-column label="经度" align="center" prop="longitude" />
+            <el-table-column label="纬度" align="center" prop="latitude" />
+            <el-table-column label="控制区域" align="center" prop="remark" />
+            <el-table-column label="行政区" align="center" prop="district" >
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.district" :value="scope.row.district"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="队伍" align="center" prop="team" />
+            <el-table-column label="阀头形状" align="center" prop="valveHeadShape" />
+            <el-table-column label="阀井深度(米)" align="center" prop="valveWellDepth" />
+            <el-table-column label="井盖代别" align="center" prop="manholeCoverInstead" />
+            <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="remarks" show-overflow-tooltip/>
+          </el-table>
+          <pagination
+            v-show="total1>0"
+            :total="total1"
+            :page.sync="queryParams1.pageNum"
+            :limit.sync="queryParams1.pageSize"
+            @pagination="getList"
+          />
+        </el-tab-pane>
+      </el-tabs>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="$emit('closeF')">关 闭</el-button>
+      </div>
+    </el-dialog>
+</template>
+
+
+<script>
+import {addNetworkRelation, listNetworkRelation, myListArea} from "@/api/gas/networkRelation";
+import Cookies from 'js-cookie'
+import {listArea} from "@/api/gas/area";
+import {addValvewellRelation, myListValveWell} from "@/api/gas/valvewellRelation";
+import {listValveWellPosition} from "@/api/gas/valveWellPosition";
+export default {
+  name: "vw",
+  dicts: ['district'],
+  data() {
+    return {
+      activeName:'1',
+      show:false,
+      // 遮罩层
+      loading: false,
+      loading1: false,
+      total: 0,
+      total1: 0,
+      list: [],
+      myList: [],
+      title: "",
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        valveWellName: undefined,
+        position: undefined,
+        longitude: undefined,
+        latitude: undefined,
+        createTimes:[]
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
+      queryParams1: {
+        pageNum: 1,
+        pageSize: 10,
+        valveWellName: undefined,
+        position: undefined,
+        longitude: undefined,
+        latitude: undefined,
+        createTimes:[]
+      },
+      ids:[],
+      workerListSelect:[],
+      jobNum:undefined,
+    };
+  },
+  beforeDestroy() {
+    this.list = []
+    this.ids = []
+  },created() {
+  },
+  methods: {
+    handleClick(tab,event){
+      console.log(this.activeName)
+      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;
+      });
+    },
+    getData(){
+      this.loading1=true
+      let entity = {ids:[],jobNum:this.jobNum};
+      entity.ids = this.ids;
+      addValvewellRelation(entity).then(res=>{
+        if (res.code===200){
+          this.$msgbox.alert('添加成功')
+          this.loading1=false
+        }
+      })
+    },
+    init(user){
+      if (!user) return;
+      console.log(user)
+      this.show=true
+      this.jobNum = user.id
+      this.getList(user)
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.createTimes = [];
+      this.handleQuery();
+    },
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      console.log(this.ids
+      )
+    },
+    /** 查询调压箱管理列表 */
+    getList(user) {
+      this.loading = true;
+      listValveWellPosition(this.queryParams).then(response => {
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+  }
+};
+</script>