社保/搜索中心加参保/森茂楼层加是否可查看

.env.development

@@ -8,6 +8,8 @@ ENV = 'development'
 VUE_APP_BASE_API_HTML = "http://122.193.93.182:19002"
 VUE_APP_BASE_API = 'http://122.193.93.182:19002'
 
+VUE_APP_BASE_API_SB = '/outApiData'
+
 # 测试/开发环境
 # VUE_APP_BASE_API_HTML = "http://192.168.0.120:19002"
 # VUE_APP_BASE_API = "http://192.168.0.120:19002"

src/assets/styles/isTable.scss

@@ -35,7 +35,7 @@
 
     .option-list {
       position: relative;
-      top: 2px;
+      top: 1px;
       left: 0;
       display: flex;
       align-items: center;

src/components/DictTag/index.vue

@@ -3,11 +3,14 @@
     <template v-for="(item, index) in options">
       <template v-if="values.includes(item.value)">
         <span
-          v-if="(item.raw.listClass == 'default' || item.raw.listClass == '') && (item.raw.cssClass == '' || item.raw.cssClass == null)"
+          v-if="
+            (item.raw.listClass == 'default' || item.raw.listClass == '') &&
+            (item.raw.cssClass == '' || item.raw.cssClass == null)
+          "
           :key="item.value"
           :index="index"
           :class="item.raw.cssClass"
-          >{{ item.label + ' ' }}</span
+          >{{ item.label + " " }}</span
         >
         <el-tag
           v-else
@@ -17,7 +20,7 @@
           :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
           :class="item.raw.cssClass"
         >
-          {{ item.label + ' ' }}
+          {{ item.label + " " }}
         </el-tag>
       </template>
     </template>
@@ -43,43 +46,55 @@ export default {
     },
     separator: {
       type: String,
-      default: ","
-    }
+      default: ",",
+    },
   },
   data() {
     return {
       unmatchArray: [], // 记录未匹配的项
-    }
+    };
   },
   computed: {
     values() {
-      if (this.value === null || typeof this.value === 'undefined' || this.value === '') return []
-      return Array.isArray(this.value) ? this.value.map(item => '' + item) : String(this.value).split(this.separator)
+      if (
+        this.value === null ||
+        typeof this.value === "undefined" ||
+        this.value === ""
+      )
+        return [];
+      return Array.isArray(this.value)
+        ? this.value.map((item) => "" + item)
+        : String(this.value).split(this.separator);
     },
     unmatch() {
-      this.unmatchArray = []
+      this.unmatchArray = [];
       // 没有value不显示
-      if (this.value === null || typeof this.value === 'undefined' || this.value === '' || this.options.length === 0) return false
+      if (
+        this.value === null ||
+        typeof this.value === "undefined" ||
+        this.value === "" ||
+        this.options.length === 0
+      )
+        return false;
       // 传入值为数组
-      let unmatch = false // 添加一个标志来判断是否有未匹配项
-      this.values.forEach(item => {
-        if (!this.options.some(v => v.value === item)) {
-          this.unmatchArray.push(item)
-          unmatch = true // 如果有未匹配项，将标志设置为true
+      let unmatch = false; // 添加一个标志来判断是否有未匹配项
+      this.values.forEach((item) => {
+        if (!this.options.some((v) => v.value === item)) {
+          this.unmatchArray.push(item);
+          unmatch = true; // 如果有未匹配项，将标志设置为true
         }
-      })
-      return unmatch // 返回标志的值
+      });
+      return unmatch; // 返回标志的值
     },
-
   },
   filters: {
     handleArray(array) {
-      if (array.length === 0) return '';
+      if (array.length === 0) return "";
       return array.reduce((pre, cur) => {
-        return pre + ' ' + cur;
-      })
+        return pre + " " + cur;
+      });
     },
-  }
+  },
 };
 </script>
 <style scoped>

src/components/NavigationBar/logCentre.vue

@@ -251,17 +251,16 @@
           </div>
           <div>住户名称</div>
           <div>{{ infoData.housename }}</div>
-          <div class="no-left">社保缴纳单位</div>
-          <div>{{ "/" }}</div>
-          <div>实际工作单位</div>
+
+          <div class="no-left">实际工作单位</div>
           <div>{{ infoData.workunit || "/" }}</div>
-          <div class="no-left">操作人</div>
+          <div>操作人</div>
           <div>{{ infoData.operateUserName || "/" }}</div>
-          <div>操作时间</div>
+          <div class="no-left">操作时间</div>
           <div>{{ infoData.operateTime || "/" }}</div>
-          <div class="no-left">操作类型</div>
+          <div>操作类型</div>
           <div>{{ infoData.type | filterType }}</div>
-          <div>备注</div>
+          <div class="no-left">备注</div>
           <div style="flex: 1">{{ infoData.remark || "/" }}</div>
         </div>
       </div>

src/components/NavigationBar/peopleCentre.vue

@@ -252,8 +252,26 @@
               >查看详情</el-link
             >
           </div>
-          <div class="no-left">社保缴纳单位</div>
-          <div>{{ "/" }}</div>
+          <div class="no-left">参保单位</div>
+          <div>{{ infoData.qymc || "/" }}</div>
+          <div>社保联系电话</div>
+          <div>{{ infoData.lxdh || "/" }}</div>
+          <div class="no-left">社保联系地址</div>
+          <div>{{ infoData.lxdzDzmc || "/" }}</div>
+          <div>民族</div>
+          <div>
+            <dict-tag
+              :options="dict.type.sys_nationality"
+              :value="infoData.mzcgf || '/'"
+            />
+          </div>
+          <div class="no-left">参保类型</div>
+          <div>
+            <dict-tag
+              :options="dict.type.sys_sb_type"
+              :value="infoData.eacaabbff || '/'"
+            />
+          </div>
           <div>实际工作单位</div>
           <div>{{ infoData.workunit || "/" }}</div>
           <div class="no-left">数据更新人员</div>
@@ -281,7 +299,8 @@ import { listHouse } from "@/api/taicangpop/house"; //户
 import { handleColor } from "@/utils/myFuntion.js";
 
 export default {
-  dicts: ["b_color_type"],
+  dicts: ["b_color_type", "sys_nationality", "sys_sb_type"],
+
   components: { ColorCell },
   computed: {
     ...mapGetters(["leftColor", "rightTopColor", "queryParamsXiaoqu", "dept"]),
@@ -300,6 +319,7 @@ export default {
         { name: "身份证", value: 0 },
         { name: "手机号", value: 1 },
         { name: "姓名", value: 2 },
+        { name: "参保单位", value: 3 },
       ],
       optionList: [
         { name: "完整身份证号", value: 0 },
@@ -336,6 +356,7 @@ export default {
         name: undefined,
         color: undefined,
         type: undefined,
+        qymc: undefined,
         pageNum: 1,
         pageSize: 20,
       },
@@ -453,7 +474,7 @@ export default {
       }
       if (this.currentIndex == 1) this.queryParams.phone = this.keyWord;
       if (this.currentIndex == 2) this.queryParams.name = this.keyWord;
-
+      if (this.currentIndex == 3) this.queryParams.qymc = this.keyWord;
       this.load();
     },
 
@@ -505,8 +526,7 @@ export default {
       this.queryParams.yuanid = undefined;
       this.queryParams.buildingId = undefined;
       this.queryParams.houseid = undefined;
-
-      this.colorList = [];
+      (this.queryParams.qymc = undefined), (this.colorList = []);
       this.isCheck = [];
       this.reset();
       this.load();

src/components/NavigationBar/recycleCentre.vue

@@ -247,19 +247,18 @@
           </div>
           <div>住户名称</div>
           <div>{{ infoData.housename }}</div>
-          <div class="no-left">社保缴纳单位</div>
-          <div>{{ "/" }}</div>
-          <div>实际工作单位</div>
+
+          <div class="no-left">实际工作单位</div>
           <div>{{ infoData.workunit || "/" }}</div>
-          <div class="no-left">删除人</div>
+          <div>删除人</div>
           <div>{{ infoData.deleteUserName || "/" }}</div>
-          <div>删除时间</div>
+          <div class="no-left">删除时间</div>
           <div>{{ infoData.deleteTime || "/" }}</div>
-          <div class="no-left">恢复操作</div>
+          <div>恢复操作</div>
           <div>
             <el-link type="success" @click="addClcik(infoData)">恢复</el-link>
           </div>
-          <div>备注</div>
+          <div class="no-left">备注</div>
           <div style="flex: 1">{{ infoData.remark || "/" }}</div>
         </div>
       </div>

src/components/NavigationBar/userModel.vue

@@ -7,10 +7,8 @@
       </div>
     </div>
     <el-dropdown-menu slot="dropdown">
-      <el-dropdown-item>修改密码</el-dropdown-item>
-      <el-dropdown-item divided @click.native="logout"
-        >退出登录</el-dropdown-item
-      >
+      <!-- <el-dropdown-item divided>修改密码</el-dropdown-item> -->
+      <el-dropdown-item @click.native="logout">退出登录</el-dropdown-item>
     </el-dropdown-menu>
   </el-dropdown>
 </template>

src/components/NavigationBar/warningCentre.vue

@@ -255,17 +255,16 @@
               >查看详情</el-link
             >
           </div>
-          <div class="no-left">社保缴纳单位</div>
-          <div>{{ "/" }}</div>
-          <div>实际工作单位</div>
+
+          <div class="no-left">实际工作单位</div>
           <div>{{ infoData.workunit || "/" }}</div>
-          <div class="no-left">数据更新人员</div>
+          <div>数据更新人员</div>
           <div>{{ infoData.updateBy || "/" }}</div>
-          <div>数据更新时间</div>
+          <div class="no-left">数据更新时间</div>
           <div>{{ infoData.updateTime || "/" }}</div>
-          <div class="no-left">未更新天数</div>
+          <div>未更新天数</div>
           <div>{{ infoData.daycount || "/" }} 天</div>
-          <div>备注</div>
+          <div class="no-left">备注</div>
           <div style="flex: 1">{{ infoData.remark || "/" }}</div>
         </div>
       </div>

src/main.js

@@ -5,6 +5,8 @@ import Cookies from "js-cookie";
 import Element from "element-ui";
 import "./assets/styles/element-variables.scss";
 
+Element.Dialog.props.closeOnClickModal.default = false;
+
 import "@/assets/styles/index.scss"; // global css
 import "@/assets/styles/ruoyi.scss"; // ruoyi css
 import App from "./App";

src/utils/myFuntion.js

@@ -1,5 +1,6 @@
 import postcss from "../../postcss.config";
 import store from "@/store";
+import axios from "axios";
 
 export function pxToVw(size) {
   return (
@@ -102,3 +103,19 @@ export function validateAndParseIDCard(idCard, type) {
       return "无效的type参数";
   }
 }
+
+export async function getSb(data) {
+  let res = await axios.post(
+    process.env.VUE_APP_BASE_API_SB + "/outApiData/tcjczhapi/rsjsfzhqymc",
+    data,
+    {
+      params: {
+        sign: "5A98834ED9E4D1CED2E4007DC5A8AE2B",
+        resourceName: "rsjsfzhqymc",
+        userName: "loudjd",
+      },
+    }
+  );
+  console.log(res, "社保");
+}
+// 查询社保

src/views/components/xiaoqu/bottomList.vue

@@ -115,7 +115,12 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(["queryParamsXiaoqu", "leftColor", "rightTopColor"]),
+    ...mapGetters([
+      "queryParamsXiaoqu",
+      "leftColor",
+      "rightTopColor",
+      "houseItem",
+    ]),
   },
   components: { introduceTitle, ColorCell },
   watch: {
@@ -149,12 +154,29 @@ export default {
   },
   methods: {
     handlerClcick(item) {
-      this.$store.commit("SET_CLICK_RESULT", {
-        id: item.houseId,
-        buildingId: item.buildingId,
-        name: item.housename,
-        keyId: item.houseId,
-      });
+      console.log(item);
+      if (item.xiaoquId == 267) {
+        this.$store.commit("SET_BUILDING_WIDTH", {
+          id: item.houseId,
+          buildingId: item.buildingId,
+          deptId: item.deptId,
+          buildingWidth:
+            this.houseItem.buildingWidth > 0
+              ? this.houseItem.buildingWidth
+              : window.innerWidth,
+          name: item.housename,
+          keyId: item.houseId,
+          sm: true,
+        });
+      } else {
+        this.$store.commit("SET_CLICK_RESULT", {
+          id: item.houseId,
+          buildingId: item.buildingId,
+          name: item.housename,
+          keyId: item.houseId,
+        });
+      }
+
       this.$store.commit("CHANGE_QUERY", { buildingId: item.buildingId });
     },
     handleChange(newValue) {

src/views/components/xiaoqu/bottomListHeader.vue

@@ -7,7 +7,11 @@
       :visible-arrow="false"
     >
       <div slot="content" class="legend-img"></div>
-      <imageButton size="medium" v-show="queryParamsXiaoqu.buildingId"
+      <imageButton
+        size="medium"
+        v-show="
+          queryParamsXiaoqu.buildingId && queryParamsXiaoqu.xiaoquId != 267
+        "
         >查看图例</imageButton
       >
     </el-tooltip>

src/views/components/xiaoqu/house.vue

@@ -530,12 +530,43 @@
           </div>
           <div>住户名称</div>
           <div>{{ infoData.housename }}</div>
-          <div class="no-left">社保缴纳单位</div>
-          <div>{{ "/" }}</div>
-          <div>实际工作单位</div>
+
+          <div class="no-left">实际工作单位</div>
           <div>{{ infoData.workunit || "/" }}</div>
-          <div class="no-left">备注</div>
-          <div>{{ infoData.remark || "/" }}</div>
+          <div>备注</div>
+          <div style="flex: 1">{{ infoData.remark || "/" }}</div>
+        </div>
+      </div>
+    </el-dialog>
+
+    <el-dialog
+      :visible.sync="sbInfo"
+      append-to-body
+      custom-class="taicang-dialog-small"
+    >
+      <div class="dialog-main">
+        <div class="dialog-title"><span></span> 社保详情</div>
+        <div class="info-container">
+          <div class="border-top">参保单位</div>
+          <div class="border-top">{{ infoData.qymc || "/" }}</div>
+          <div class="no-left border-top">社保联系电话</div>
+          <div class="border-top">{{ infoData.lxdh || "/" }}</div>
+          <div>社保联系地址</div>
+          <div>{{ infoData.lxdzDzmc || "/" }}</div>
+          <div class="no-left">民族</div>
+          <div>
+            <dict-tag
+              :options="dict.type.sys_nationality"
+              :value="infoData.mzcgf || '/'"
+            />
+          </div>
+          <div>参保类型</div>
+          <div style="flex: 1">
+            <dict-tag
+              :options="dict.type.sys_sb_type"
+              :value="infoData.eacaabbff || '/'"
+            />
+          </div>
         </div>
       </div>
     </el-dialog>
@@ -552,7 +583,7 @@ import {
   delPerson,
   getPerson,
 } from "@/api/taicangpop/person.js";
-import { pxToVw, handleColor } from "@/utils/myFuntion.js";
+import { pxToVw, handleColor, getSb } from "@/utils/myFuntion.js";
 import ColorCell from "@/components/ColorCell";
 import { validateAndParseIDCard } from "@/utils/myFuntion.js";
 const moment = require("moment");
@@ -565,6 +596,8 @@ export default {
     "bm_czfw_zjlx",
     "bm_fwlx",
     "bm_czfw_zzlx",
+    "sys_nationality",
+    "sys_sb_type",
   ],
   data() {
     var validateNumber = (rule, value, callback) => {
@@ -641,6 +674,7 @@ export default {
       openGather: false,
       open: false,
       openInfo: false,
+      sbInfo: false,
       infoData: {},
       show: false,
       total: 0,
@@ -723,11 +757,17 @@ export default {
       this.multiple = [];
     },
     async handlerInfo(id) {
-      let res = await getPerson(id);
-      this.infoData = handleColor([res.data])[0];
+      this.infoData = await this.getInfo(id);
       this.openInfo = true;
     },
-    lookSocialSecurity() {},
+    async getInfo(id) {
+      let res = await getPerson(id);
+      return handleColor([res.data])[0];
+    },
+    async lookSocialSecurity(id) {
+      this.infoData = await this.getInfo(id);
+      this.sbInfo = true;
+    },
     handlerhousEempty() {
       let id = this.houseData.id;
       this.$modal

src/views/components/xiaoqu/map/buildjson/8_5.json

@@ -1610,34 +1610,6 @@
           ]
         ]
       }
-    },
-
-    {
-      "type": "Feature",
-      "properties": {
-        "OBJECTID": 66,
-        "TextString": "349B",
-        "Shape_Leng": 33.363972093000001,
-        "Shape_Area": 69.411054540400002,
-        "楼号": "八号楼",
-        "层次": "5"
-      },
-      "geometry": {
-        "type": "MultiPolygon",
-        "coordinates": [
-          [
-            [
-              [121.090355480186815, 31.477738453368364],
-              [121.090277785458866, 31.477696251135313],
-              [121.090255424042937, 31.477726488841235],
-              [121.090233060056818, 31.477756727666041],
-              [121.090310754809977, 31.477798929374799],
-              [121.090333118138133, 31.477768690542419],
-              [121.090355480186815, 31.477738453368364]
-            ]
-          ]
-        ]
-      }
     }
   ]
 }

src/views/components/xiaoqu/map/buildjson/buildjson.js

@@ -113,6 +113,7 @@ let buildjson = {
     {
       name: "10层",
       json: require("./9_10.json"),
+      disable: true,
     },
     {
       name: "11层",

src/views/components/xiaoqu/map/smBuild.vue

@@ -5,7 +5,7 @@
         :class="currentIndex == index ? 'active-foolt' : ''"
         v-for="(item, index) in list"
         :key="index"
-        @click="clickFloor(index)"
+        @click="clickFloor(index, item)"
       >
         {{ item.name }}
       </div>
@@ -104,7 +104,15 @@ export default {
       this.buildData = handleColor(res.data);
       this.clickFloor(index ? index : 0);
     },
-    clickFloor(index) {
+    clickFloor(index, item) {
+      if (item && item.disable) {
+        this.$notify({
+          title: "警告",
+          message: "该楼层功能正在开发中！",
+          type: "warning",
+        });
+        return;
+      }
       this.currentIndex = index;
       this.mapLayer.geoJsonLayer.clearLayers();
       this.mapLayer.marker.clearLayers();

src/views/components/xiaoqu/rightData/realTimeList.vue

@@ -105,10 +105,6 @@ export default {
 
       if (process.env.NODE_ENV === "development") return;
       this.timer = setInterval(() => {
-        // if (this.items.length > 1000) {
-        //   //考虑dom太多影响到性能,每十秒删除后面100条数据,最后保留一千条
-        //   this.items.splice(-100);
-        // }
         this.getList(true);
       }, 10000);
     },

vue.config.js

@@ -42,6 +42,13 @@ module.exports = {
           ["^" + process.env.VUE_APP_BASE_API]: "",
         },
       },
+      [process.env.VUE_APP_BASE_API_SB]: {
+        target: `http://2.35.109.131:9193`,
+        changeOrigin: true,
+        pathRewrite: {
+          ["^" + process.env.VUE_APP_BASE_API]: "",
+        },
+      },
     },
     disableHostCheck: true,
   },