From 19b758ca30852eede63391bf094b94f5951a468b Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 15 Apr 2022 14:55:56 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/pages/loginWork.scss |  45 ++--
 src/views/pages/login copy.vue       | 155 --------------
 src/views/pages/login.vue            | 301 ++++++++++++++-------------
 3 files changed, 176 insertions(+), 325 deletions(-)
 delete mode 100644 src/views/pages/login copy.vue

diff --git a/src/assets/scss/pages/loginWork.scss b/src/assets/scss/pages/loginWork.scss
index ad12fc67..534cccba 100644
--- a/src/assets/scss/pages/loginWork.scss
+++ b/src/assets/scss/pages/loginWork.scss
@@ -166,29 +166,30 @@
   }
 }
 
-.div_row {
-  height: 50px;
-  text-align: center;
-  line-height: 50px;
-
-  /* width: 100px; */
-  /* background-color: rgb(241, 241, 241); */
+.m-pop {
+  height: auto;
+  
+  .div_row {
+    height: 50px;
+    text-align: center;
+    line-height: 50px;
 
-  &:hover {
-    color: rgb(2, 119, 173);
-    font-weight: bold;
-    text-decoration: underline;
-  }
+    &:hover {
+      color: rgb(2, 119, 173);
+      font-weight: bold;
+      text-decoration: underline;
+    }
 
-  .i_icon {
-    width: 15px;
-    height: 15px;
-    margin-right: 10px;
-    float: left;
-  }
-  .span_name {
-    font-size: 18px;
-    cursor: pointer;
-    /* color: rgb(37, 156, 235); */
+    .i_icon {
+      width: 15px;
+      height: 15px;
+      margin-right: 10px;
+      float: left;
+    }
+    .span_name {
+      font-size: 18px;
+      cursor: pointer;
+      /* color: rgb(37, 156, 235); */
+    }
   }
 }
diff --git a/src/views/pages/login copy.vue b/src/views/pages/login copy.vue
deleted file mode 100644
index ee220351..00000000
--- a/src/views/pages/login copy.vue	
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <div class="aui-wrapper aui-page__login">
-    <div class="aui-content__wrapper">
-      <main class="aui-content">
-        <div class="login-header">
-          <h2 class="login-brand">{{ $t('brand.lg') }}</h2>
-        </div>
-        <div class="login-body">
-          <h3 class="login-title">{{ $t('login.title') }}</h3>
-          <el-form :model="dataForm"
-                   :rules="dataRule"
-                   ref="dataForm"
-                   @keyup.enter.native="dataFormSubmitHandle()"
-                   status-icon>
-            <!-- <el-form-item>
-              <el-select v-model="$i18n.locale"
-                         class="w-percent-100">
-                <el-option v-for="(val, key) in i18nMessages"
-                           :key="key"
-                           :label="val._lang"
-                           :value="key"></el-option>
-              </el-select>
-            </el-form-item> -->
-            <el-form-item prop="phone">
-              <el-input v-model="dataForm.phone"
-                        placeholder="手机号">
-                <span slot="prefix"
-                      class="el-input__icon">
-                  <svg class="icon-svg"
-                       aria-hidden="true">
-                    <use xlink:href="#icon-user"></use>
-                  </svg>
-                </span>
-              </el-input>
-            </el-form-item>
-            <el-form-item prop="password">
-              <el-input v-model="dataForm.password"
-                        type="password"
-                        :placeholder="$t('login.password')">
-                <span slot="prefix"
-                      class="el-input__icon">
-                  <svg class="icon-svg"
-                       aria-hidden="true">
-                    <use xlink:href="#icon-lock"></use>
-                  </svg>
-                </span>
-              </el-input>
-            </el-form-item>
-            <el-form-item prop="captcha">
-              <el-row :gutter="20">
-                <el-col :span="14">
-                  <el-input v-model="dataForm.captcha"
-                            :placeholder="$t('login.captcha')">
-                    <span slot="prefix"
-                          class="el-input__icon">
-                      <svg class="icon-svg"
-                           aria-hidden="true">
-                        <use xlink:href="#icon-safetycertificate"></use>
-                      </svg>
-                    </span>
-                  </el-input>
-                </el-col>
-                <el-col :span="10"
-                        class="login-captcha">
-                  <img :src="captchaPath"
-                       @click="getCaptcha()">
-                </el-col>
-              </el-row>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary"
-                         @click="dataFormSubmitHandle()"
-                         class="w-percent-100">{{ $t('login.title') }}</el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div class="login-footer">
-          <p>
-            <a href="https://demo.cloud.renren.io/renren-cloud"
-               target="_blank">{{ $t('login.demo') }}</a>
-          </p>
-          <!-- 2020 © renren.io -->
-          <p><a href="https://www.renren.io/"
-               target="_blank">{{ $t('login.copyright') }}</a></p>
-        </div>
-      </main>
-    </div>
-  </div>
-</template>
-
-<script>
-import Cookies from 'js-cookie'
-import debounce from 'lodash/debounce'
-import { messages } from '@/i18n'
-import { getUUID } from '@/utils'
-export default {
-  data () {
-    return {
-      i18nMessages: messages,
-      captchaPath: '',
-      dataForm: {
-        app: 'oper',
-        client: 'web',
-        username: '',
-        phone: '',
-        password: '',
-        uuid: '',
-        captcha: ''
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        phone: [
-          { required: true, message: '手机号不能为空', trigger: 'blur' }
-        ],
-        password: [
-          { required: true, message: '密码不能为空', trigger: 'blur' }
-        ],
-        captcha: [
-          { required: true, message: '验证码不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created () {
-    this.getCaptcha()
-  },
-  methods: {
-    // 获取验证码
-    getCaptcha () {
-      this.dataForm.uuid = getUUID()
-      this.captchaPath = `${window.SITE_CONFIG['apiURL']}/auth/login/captcha?uuid=${this.dataForm.uuid}`
-    },
-    // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid, messageObj) => {
-        if (!valid) {
-          app.util.validateRule(messageObj)
-        }
-        this.$http.post('/auth/login/operweb/loginbypassword', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
-            this.getCaptcha()
-            return this.$message.error(res.msg)
-          }
-          localStorage.setItem('userType', 'oper')
-          localStorage.setItem('token', res.data.token)
-          this.$router.replace({ name: 'home' }).catch(() => { })
-        }).catch(() => { })
-      })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
-}
-</script>
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index dc3e7111..099b694e 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -1,55 +1,58 @@
 <template>
   <div class="g-app">
-    <div class="g-bd"
-         v-if="isShowLogin || true">
+    <div class="g-bd" v-if="isShowLogin || true">
       <div class="m-fm">
         <div class="wrap">
-          <h2 class="title">{{ $t('brand.work') }}</h2>
+          <h2 class="title">{{ $t("brand.work") }}</h2>
           <div class="fm">
-            <el-form :model="dataForm"
-                     :rules="dataRule"
-                     ref="dataForm"
-                     @keyup.enter.native="dataFormSubmitHandle()"
-                     status-icon>
+            <el-form
+              :model="dataForm"
+              :rules="dataRule"
+              ref="dataForm"
+              @keyup.enter.native="dataFormSubmitHandle()"
+              status-icon
+            >
               <div class="fm-item">
                 <div class="ico">
-                  <img src="@/assets/img/login/zhanghao.png"
-                       alt="" />
+                  <img src="@/assets/img/login/zhanghao.png" alt="" />
                 </div>
                 <div class="input">
-                  <input type="text"
-                         v-model="dataForm.phone"
-                         placeholder="账号" />
+                  <input
+                    type="text"
+                    v-model="dataForm.phone"
+                    placeholder="账号"
+                  />
                 </div>
               </div>
               <div class="fm-item">
                 <div class="ico">
-                  <img src="@/assets/img/login/mima.png"
-                       alt="" />
+                  <img src="@/assets/img/login/mima.png" alt="" />
                 </div>
                 <div class="input">
-                  <input type="password"
-                         v-model="dataForm.password"
-                         :placeholder="$t('login.password')" />
+                  <input
+                    type="password"
+                    v-model="dataForm.password"
+                    :placeholder="$t('login.password')"
+                  />
                 </div>
               </div>
               <div class="fm-captcha">
                 <div class="fm-item">
                   <div class="input">
-                    <input type="text"
-                           v-model="dataForm.captcha"
-                           placeholder="验证码" />
+                    <input
+                      type="text"
+                      v-model="dataForm.captcha"
+                      placeholder="验证码"
+                    />
                   </div>
                 </div>
                 <div class="captcha">
-                  <img :src="captchaPath"
-                       @click="getCaptcha()" />
+                  <img :src="captchaPath" @click="getCaptcha()" />
                 </div>
               </div>
 
-              <div class="fm-btn"
-                   @click="dataFormSubmitHandle()">
-                {{ $t('login.title') }}
+              <div class="fm-btn" @click="dataFormSubmitHandle()">
+                {{ $t("login.title") }}
               </div>
               <div class="hint">请使用小程序端的账号密码登录</div>
             </el-form>
@@ -60,128 +63,128 @@
       <div class="m-footer">
         <div class="login-footer">
           <p>
-            <a href=""
-               target="_blank">{{ $t('login.copyright') }}</a>
+            <a href="" target="_blank">{{ $t("login.copyright") }}</a>
           </p>
         </div>
       </div>
     </div>
 
-    <c-dialog :showFooter="false"
-              :title="'选择客户'"
-              :isNest="false"
-              :visible="diaVisible"
-              :dialogHeight="0.8"
-              :width="30"
-              :top="'120px'"
-              @cancel="diaCancel">
-      <div v-for="(item, index) in tableData"
-           :key="index"
-           class="div_row">
-        <span @click="selectCustomer(item)"
-              class="span_name">{{
-          item.customerName
-        }}</span>
+    <c-dialog
+      :showFooter="false"
+      :title="'选择客户'"
+      :isNest="false"
+      :visible="diaVisible"
+      :dialogHeight="0.8"
+      :width="30"
+      :top="'120px'"
+      @cancel="diaCancel"
+    >
+      <div class="m-pop">
+        <div v-for="(item, index) in tableData" :key="index" class="div_row">
+          <span @click="selectCustomer(item)" class="span_name">{{
+            item.customerName
+          }}</span>
+        </div>
       </div>
     </c-dialog>
   </div>
 </template>
 
 <script>
-import Cookies from 'js-cookie'
-import CDialog from '@c/CDialog'
-import debounce from 'lodash/debounce'
-import { messages } from '@/i18n'
-import { getUUID } from '@/utils'
-import { Loading } from 'element-ui' // 引入Loading服务
-import JSEncrypt from 'jsencrypt' //引入加密
+import Cookies from "js-cookie";
+import CDialog from "@c/CDialog";
+import debounce from "lodash/debounce";
+import { messages } from "@/i18n";
+import { getUUID } from "@/utils";
+import { Loading } from "element-ui"; // 引入Loading服务
+import JSEncrypt from "jsencrypt"; //引入加密
 
-let loading // 加载动画
+let loading; // 加载动画
 export default {
-  data () {
+  data() {
     return {
       pubKey: null, // 获取到公钥
       isShowLogin: true,
       i18nMessages: messages,
-      captchaPath: '',
+      captchaPath: "",
       dataForm: {
-        customerId: '',
-        app: 'gov',
-        client: 'web',
-        username: '',
-        phone: '',
-        password: '',
-        uuid: '',
-        captcha: ''
+        customerId: "",
+        app: "gov",
+        client: "web",
+        username: "",
+        phone: "",
+        password: "",
+        uuid: "",
+        captcha: "",
       },
       // 客户列表相关
       diaVisible: false,
       tableLoading: false,
-      tableData: []
-    }
+      tableData: [],
+    };
   },
   components: {
-    CDialog
+    CDialog,
   },
   computed: {
-    dataRule () {
+    dataRule() {
       return {
-        phone: [{ required: true, message: '手机号不能为空', trigger: 'blur' }],
+        phone: [{ required: true, message: "手机号不能为空", trigger: "blur" }],
         password: [
-          { required: true, message: '密码不能为空', trigger: 'blur' }
+          { required: true, message: "密码不能为空", trigger: "blur" },
         ],
         captcha: [
-          { required: true, message: '验证码不能为空', trigger: 'blur' }
-        ]
-      }
-    }
+          { required: true, message: "验证码不能为空", trigger: "blur" },
+        ],
+      };
+    },
   },
-  created () {
+  created() {
     //平阴联动平台 登陆
     if (this.$route.query.platformToken) {
-      this.isShowLogin = false
-      this.getAutoLogin(this.$route.query.platformToken)
+      this.isShowLogin = false;
+      this.getAutoLogin(this.$route.query.platformToken);
     } else {
-      this.getCaptcha()
+      this.getCaptcha();
       //获取公钥
-      this.getPubKey()
+      this.getPubKey();
     }
   },
-  mounted () {
-    localStorage.removeItem('showHeader')
+  mounted() {
+    localStorage.removeItem("showHeader");
   },
 
   methods: {
     // 获取公钥
-    getPubKey () {
+    getPubKey() {
       this.$http
-        .post('/auth/govweb/getKey')
+        .post("/auth/govweb/getKey")
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           }
 
-          this.pubKey = res.data // 获取到公钥;
+          this.pubKey = res.data; // 获取到公钥;
         })
-        .catch(() => { })
+        .catch(() => {});
     },
     // 获取验证码
-    getCaptcha () {
-      this.dataForm.uuid = getUUID()
-      this.captchaPath = `${window.SITE_CONFIG['apiURL']}/auth/login/captcha?uuid=${this.dataForm.uuid}`
+    getCaptcha() {
+      this.dataForm.uuid = getUUID();
+      this.captchaPath = `${window.SITE_CONFIG["apiURL"]}/auth/login/captcha?uuid=${this.dataForm.uuid}`;
     },
     // 表单提交
-    dataFormSubmitHandle () {
-      this.$refs['dataForm'].validate((valid, messageObj) => {
+    dataFormSubmitHandle() {
+      this.$refs["dataForm"].validate((valid, messageObj) => {
         if (!valid) {
-          app.util.validateRule(messageObj)
+          app.util.validateRule(messageObj);
         }
-        this.startLoading()
+        this.startLoading();
         // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/epmetuser/customerstaff/customerlist'
-        const url = '/epmetuser/customerstaff/customerlist'
+        const url = "/epmetuser/customerstaff/customerlist";
         const params = {
-          phone: this.dataForm.phone
-        }
+          phone: this.dataForm.phone,
+        };
         // this.$http
         // .post(url, params).then(({ data })=> {
         //   console.log('res--comll', data)
@@ -208,105 +211,107 @@ export default {
           (data, rspMsg) => {
             if (data.length === 0) {
               //没有客户，提示无法登录
-              this.$message.error('账号不存在')
-              this.endLoading()
-            } else if (data.length === 1) {
-              this.selectCustomer(data[0])
+              this.$message.error("账号不存在");
+              this.endLoading();
+            } else if (data.length === 10) {
+              this.selectCustomer(data[0]);
             } else {
-              this.endLoading()
-              this.diaVisible = true
+              this.endLoading();
+              this.diaVisible = true;
               this.$nextTick(() => {
-                this.tableData = data
-              })
+                this.tableData = data;
+              });
             }
           },
           (rspMsg, data) => {
-            this.endLoading()
-            this.$message.error(rspMsg)
+            this.endLoading();
+            this.$message.error(rspMsg);
           }
-        )
-      })
+        );
+      });
     },
     // 平阴联动 自动登录接口
-    getAutoLogin (platformToken) {
-      this.dataForm.thirdToken = platformToken
-      this.dataForm.platform = 'pyld'
+    getAutoLogin(platformToken) {
+      this.dataForm.thirdToken = platformToken;
+      this.dataForm.platform = "pyld";
       this.$http
         .post(`/auth/sso/oper/third/login`, this.dataForm)
         .then(({ data: res }) => {
           if (res.code !== 0) {
             if (res.code == 8302) {
-              return this.$message.error(res.msg)
+              return this.$message.error(res.msg);
             }
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           }
-          localStorage.setItem('customerId', res.data.customerId)
-          localStorage.setItem('userType', 'work')
-          localStorage.setItem('showHeader', '0')
-          localStorage.setItem('token', res.data.token)
-          this.$router.replace({ name: 'home' })
+          localStorage.setItem("customerId", res.data.customerId);
+          localStorage.setItem("userType", "work");
+          localStorage.setItem("showHeader", "0");
+          localStorage.setItem("token", res.data.token);
+          this.$router.replace({ name: "home" });
         })
-        .catch(() => { })
+        .catch(() => {});
       // epmet-ext9.elinkservice.cn/platform-admin
     },
     //选择客户
-    selectCustomer (row) {
-      localStorage.setItem('customerId', row.customerId)
-      localStorage.setItem('customerName', row.customerName)
-      this.startLoading()
+    selectCustomer(row) {
+      localStorage.setItem("customerId", row.customerId);
+      localStorage.setItem("customerName", row.customerName);
+      this.startLoading();
       // const url = 'https://nei.netease.com/api/apimock-v2/e3b1d0eb88e905f6c7ee559b2d6bb7ad/auth/govweb/login'
-      const url = '/auth/govweb/login'
-      this.dataForm.customerId = row.customerId
-      let param = {}
-      Object.assign(param, this.dataForm)
-      param.password = this.encryptedData(this.pubKey, this.dataForm.password)
+      const url = "/auth/govweb/login";
+      this.dataForm.customerId = row.customerId;
+      let param = {};
+      Object.assign(param, this.dataForm);
+      param.password = this.encryptedData(this.pubKey, this.dataForm.password);
       this.$http
         .post(url, param)
         .then(({ data: res }) => {
+          this.endLoading();
           if (res.code !== 0) {
-            this.getCaptcha()
-            return this.$message.error(res.msg)
+            this.getCaptcha();
+            return this.$message.error(res.msg);
           }
-          this.diaVisible = false
+          this.diaVisible = false;
 
-          localStorage.setItem('userType', 'work')
+          localStorage.setItem("userType", "work");
 
-          localStorage.setItem('token', res.data.token)
-          this.$router.replace({ name: 'indexWork' }).catch(() => { })
+          localStorage.setItem("token", res.data.token);
+          this.$router.replace({ name: "index" });
         })
-        .catch(() => { })
-      this.endLoading()
+        .catch(() => {
+          this.endLoading();
+        });
     },
     // 取消
-    diaCancel () {
-      this.diaVisible = false
+    diaCancel() {
+      this.diaVisible = false;
     },
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
-        loading.close()
+        loading.close();
       }
     },
     // 加密
-    encryptedData (key, data) {
+    encryptedData(key, data) {
       // 新建JSEncrypt对象
-      let encryptor = new JSEncrypt()
+      let encryptor = new JSEncrypt();
       // 设置公钥
-      encryptor.setPublicKey(key)
+      encryptor.setPublicKey(key);
       // 加密数据
-      return encryptor.encrypt(data)
-    }
-  }
-}
+      return encryptor.encrypt(data);
+    },
+  },
+};
 </script>
 
 <style lang="scss" src="@/assets/scss/pages/loginWork.scss" scoped></style>

From 80266a45964ec642186be0ed7bc09698f643b9f8 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 15 Apr 2022 14:59:53 +0800
Subject: [PATCH 2/6] dd

---
 src/views/modules/base/resi.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 41b029a9..575ecace 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -497,7 +497,7 @@ export default {
         item.options.forEach((n) => {
           if (n.value === row[item.columnName]) _val = n.label
         })
-        if (row[item.columnName] == '0') _val = '--'
+        if (row[item.columnName] == '0') return _val = ''
       }
       
       return _val || row[item.columnName]

From 3c60dd4745fe26e4812eff8f6fd37665d535817e Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 15 Apr 2022 15:24:58 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequ/cpts/people-more.vue            | 2 +-
 src/views/modules/visual/basicinfo/cpts/people-more.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue
index c2d9a6d1..00f8f915 100644
--- a/src/views/modules/shequ/cpts/people-more.vue
+++ b/src/views/modules/shequ/cpts/people-more.vue
@@ -23,7 +23,7 @@
               <span>{{ xiaoquName }}</span>
             </div>
             <div class="item" v-if="index == 0">
-              <span class="item-field">所属楼宇：</span>
+              <span class="item-field">所属楼栋：</span>
               <span>{{ louName }}-{{ danyuanName }}</span>
             </div>
             <div class="item" v-if="index == 0">
diff --git a/src/views/modules/visual/basicinfo/cpts/people-more.vue b/src/views/modules/visual/basicinfo/cpts/people-more.vue
index b5a1ca9a..bd8bb9f0 100644
--- a/src/views/modules/visual/basicinfo/cpts/people-more.vue
+++ b/src/views/modules/visual/basicinfo/cpts/people-more.vue
@@ -27,7 +27,7 @@
             </div>
             <div class="item"
                  v-if="index == 0">
-              <span class="item-field">所属楼宇：</span>
+              <span class="item-field">所属楼栋：</span>
               <span>{{ louName }}-{{ danyuanName }}</span>
             </div>
             <div class="item"

From 8dca2f19906400e37d541587cfc1ea48342eefdf Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 15 Apr 2022 15:37:41 +0800
Subject: [PATCH 4/6] dd

---
 src/views/components/editResi.vue |  4 ++--
 src/views/components/resiForm.vue |  4 ++--
 src/views/modules/base/resi.vue   | 25 ++++++++++++++++++++-----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index eb57496a..8459e87c 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -803,7 +803,7 @@ export default {
   }
 }
 .resi-cell-value .resi-cell-input {
-    max-width: 180px;
+    max-width: 190px;
 }
 
 </style>
@@ -841,7 +841,7 @@ export default {
     }
   }
   .resi-cell-select {
-    width: 180px;
+    width: 190px;
     box-sizing: border-box;
     margin-right: 10px;
     &-middle {
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index a6a4df46..9ebcf9c7 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -759,7 +759,7 @@ export default {
   }
 }
 .resi-cell-value .resi-cell-input {
-    max-width: 180px;
+    max-width: 190px;
 }
 .resi-cell-value {
   :deep .el-col {
@@ -787,7 +787,7 @@ export default {
     }
   }
   .resi-cell-select {
-    width: 180px;
+    width: 190px;
     box-sizing: border-box;
     margin-right: 10px;
     &-middle {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 575ecace..29c48f3c 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -259,6 +259,10 @@
                @closed="diaClose">
       <resi-change-record ref="ref_changerecord"></resi-change-record>
     </el-dialog>
+    <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
+                 :userId="lookInfo.userId"
+                 :gridName="lookInfo.gridName"
+                 @close="showedPeopleMoreInfo = false" />
 
   </div>
 </template>
@@ -272,6 +276,7 @@ import axios from 'axios'
 import { mapGetters } from 'vuex'
 import resiTransfer from '../../components/resiTransfer.vue'
 import resiChangeRecord from '../../components/resiChangeRecord.vue'
+import peopleMore from "@/views/modules/shequ/cpts/people-more";
 
 export default {
   components: {
@@ -279,7 +284,8 @@ export default {
     resiForm,
     editResi,
     resiTransfer,
-    resiChangeRecord
+    resiChangeRecord,
+    peopleMore
   },
   data () {
     return {
@@ -297,6 +303,8 @@ export default {
       isIndeterminate: false,
       dialogEditVisible: false,
       dialogVisible: false,
+      // 显示人员详情
+      showedPeopleMoreInfo: false,
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
       currentPage: 1,
       pageSize: 20,
@@ -324,6 +332,10 @@ export default {
 
       tranferShow: false,
       changeRecordShow: false,
+      lookInfo: {
+        userId: '',
+        gridName: ''
+      }
     }
   },
   props: {
@@ -696,10 +708,13 @@ export default {
       console.log(tab, event)
     },
     async handleLook (row) {
-      this.disabled = true
-      this.editAgencyId = row.ORG_ID
-      await this.getFormList('edit')
-      this.getrowInfo(row.icResiUserId)
+      this.lookInfo.userId = row.icResiUserId
+      this.lookInfo.gridName = row.GRID_ID
+      this.showedPeopleMoreInfo = true;
+      // this.disabled = true
+      // this.editAgencyId = row.ORG_ID
+      // await this.getFormList('edit')
+      // this.getrowInfo(row.icResiUserId)
     },
     async handleEdit (row) {
       this.disabled = false

From 1d3692917f53cc39e15906fd3ca5450561c851ab Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 15 Apr 2022 15:39:09 +0800
Subject: [PATCH 5/6] dd

---
 src/views/modules/base/resi.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 29c48f3c..979d2997 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -262,7 +262,7 @@
     <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
                  :userId="lookInfo.userId"
                  :gridName="lookInfo.gridName"
-                 @close="showedPeopleMoreInfo = false" />
+                 @close="handleCancleLook" />
 
   </div>
 </template>
@@ -716,6 +716,11 @@ export default {
       // await this.getFormList('edit')
       // this.getrowInfo(row.icResiUserId)
     },
+    handleCancleLook() {
+      this.lookInfo.userId = ''
+      this.lookInfo.gridName = ''
+      this.showedPeopleMoreInfo = false;
+    },
     async handleEdit (row) {
       this.disabled = false
       this.editAgencyId = row.ORG_ID

From 828286966eacc3ea1ef3dfa72498971497a28232 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 15 Apr 2022 15:54:42 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E4=BD=93=E9=AA=8C3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/visual/people.scss | 18 +++++++++---------
 src/assets/scss/people-info.scss           | 10 +++++++---
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/assets/scss/modules/visual/people.scss b/src/assets/scss/modules/visual/people.scss
index aac6c66a..b18adc62 100644
--- a/src/assets/scss/modules/visual/people.scss
+++ b/src/assets/scss/modules/visual/people.scss
@@ -1,6 +1,6 @@
-@import '../../c/config';
-@import '../../c/function';
-@import './c/common';
+@import "../../c/config";
+@import "../../c/function";
+@import "./c/common";
 
 .g-cpt {
   display: flex;
@@ -227,13 +227,13 @@
         font-weight: 400;
         color: #ffffff;
         line-height: 24px;
-        margin: 20px 0;
+        margin: 15px 0;
 
         &::before {
           position: absolute;
           left: 0;
           top: 9px;
-          content: '';
+          content: "";
           display: block;
           width: 7px;
           height: 7px;
@@ -264,7 +264,7 @@
 
       .tab {
         margin: 0 5px;
-        min-width: 76px;
+        min-width: 80px;
         padding: 0 10px;
         height: 36px;
         background: rgba(255, 255, 255, 0);
@@ -272,7 +272,7 @@
         box-shadow: 0 0 10px 0 inset #1257c9;
         border-radius: 2px;
         text-align: center;
-        font-size: 18px;
+        font-size: 17px;
         font-family: PingFang SC;
         font-weight: 400;
         color: #ffffff;
@@ -548,7 +548,7 @@
 
             &:hover {
               &::before {
-                content: '';
+                content: "";
                 position: absolute;
                 display: block;
                 left: 0;
@@ -560,7 +560,7 @@
               }
 
               &::after {
-                content: '';
+                content: "";
                 position: absolute;
                 display: block;
                 left: 15px;
diff --git a/src/assets/scss/people-info.scss b/src/assets/scss/people-info.scss
index c2c80ef6..12bfae15 100644
--- a/src/assets/scss/people-info.scss
+++ b/src/assets/scss/people-info.scss
@@ -64,7 +64,7 @@
                 font-weight: 400;
                 color: #333;
                 line-height: 24px;
-                margin: 20px 0;
+                margin: 15px 0;
 
                 &::before {
                     position: absolute;
@@ -94,14 +94,18 @@
             padding-left: 20px;
 
             .tab-btn {
+                margin: 0 5px;
                 width: 30px;
                 text-align: center;
                 cursor: pointer;
+                padding: 10px 0;
+                border-radius: 3px;
+                background-color: rgba(#000, 0.3);
             }
 
             .tab {
                 margin: 0 5px;
-                min-width: 76px;
+                min-width: 80px;
                 padding: 0 10px;
                 height: 36px;
                 background: #fff;
@@ -109,7 +113,7 @@
                 box-shadow: 0 0 10px 0 inset #ddd;
                 border-radius: 2px;
                 text-align: center;
-                font-size: 18px;
+                font-size: 17px;
                 font-family: PingFang SC;
                 font-weight: 400;
                 color: #333;