Merge remote-tracking branch 'origin/power-home-hrj'

src/views/home-page/HomePage.vue

@@ -797,82 +797,8 @@ function loginIn_yyfnzt() {
           })
           return;
         }
-        let rows = result[0].Rows;
-        if (type == "1") {
-          //获取用户信息
-          var usercode = rows[0].USERID;
-          var unitcode = rows[0].UNIT;
-          var username = rows[0].USERNAME;
-          var truename = rows[0].NAME;
-          var password = rows[0].PASSWORD;
-          var unitname = rows[0].UNIT_NAME;
-          var contact = rows[0].CONTACT;
-          var sex = rows[0].SEX;
-          var telephone = rows[0].TELPHONE;
-          var email = rows[0].MAIL;
-          var identify = rows[0].IS_IDENTIFY;
-          var usertype = rows[0].TYPE;
-          var userkeycode = rows[0]["TEMPUSERKEYCODE"];
-          var change_time = rows[0].CHANGE_TIME;
-          debugger
-          //保存用户信息
-          const loginUserInfo = {
-            ywxt_usercode: usercode,
-            ywxt_username: username,
-            ywxt_unitcode: unitcode,
-            ywxt_unitname: unitname,
-            ywxt_contact: contact,
-            ywxt_telephone: telephone,
-            ywxt_email: email,
-            ywxt_identify: identify,
-            ywxt_userkeycode: userkeycode,
-            ptjk_changetime: change_time,
-            password: password
-          }
-          // 根据user_id获取角色
-          localStorage.setItem('loginUserInfoSpace', JSON.stringify(loginUserInfo))
-          loginKj_log(unitcode, usercode, "运维系统-登录", "登录系统成功", "系统登录");
-          //空间运维系统 登录成功后 需要缓存用户权限
-          selectUserRole(usercode, url);
-          return;
-        }
-        if (type == "2") {
-          //获取用户信息
-          var usercode = rows[0].USERID;
-          var username = rows[0].USERNAME;
-          var truename = rows[0].NAME;
-          var password = rows[0].PASSWORD;
-          var unitcode = rows[0].UNIT;
-          var unitname = rows[0].UNIT_NAME;
-          var contact = rows[0].CONTACT;
-          var sex = rows[0].SEX;
-          var telephone = rows[0].TELPHONE;
-          var email = rows[0].MAIL;
-          var identify = rows[0].IS_IDENTIFY;
-          var usertype = rows[0].TYPE;
-          var userkeycode = rows[0]["TEMPUSERKEYCODE"];
-          var changetime = rows[0]["CHANGE_TIME"];
-          //保存用户信息
-          const loginUserInfo = {
-            gxjh_usercode: usercode,
-            gxjh_username: username,
-            gxjh_unitcode: unitcode,
-            gxjh_unitname: unitname,
-            gxjh_contact: contact ? decode(contact) : '',
-            gxjh_telephone: telephone ? decode(telephone) : '',
-            gxjh_email: email ? decode(email) : '',
-            gxjh_identify: identify,
-            gxjh_userkeycode: userkeycode,
-            gxjh_changetime: changetime,
-          }
-          localStorage.setItem('exchangeUserInfo', JSON.stringify(loginUserInfo))
-          loginKj_log(unitcode, usercode, "浏览系统-登录", "登录系统成功", "系统登录");
-          //切换首页
-          window.open(url, url)
-          // window.location.href = url;
-          return;
-        }
-
+        let rows = result[0].Rows[0];
+        localStorage.setItem("yyfnzt_user", JSON.stringify(rows))
       })
       .catch((e) => {
         debugger

src/views/power-home/util/gis/gescene/biasMapAdd.vue

@@ -33,7 +33,7 @@
               </template>
             </el-table-column>
             <el-table-column
-                prop="RELEASE_TIME"
+                prop="RELEASE_TIMERELEASE_TIME"
                 label="发布时间">
             </el-table-column>
             <el-table-column
@@ -106,14 +106,14 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="申请人" prop="APPLY_USER_NAME">
-                <el-input v-model="formData.APPLY_USER_NAME" placeholder="请输入申请人" clearable
+                <el-input disabled v-model="applyData.APPLY_USER_NAME" placeholder="请输入申请人" clearable
                           :style="{width: '100%'}">
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="申请单位" prop="APPLY_UNIT_NAME">
-                <el-input v-model="formData.APPLY_UNIT_NAME" placeholder="请输入申请单位" clearable
+                <el-input disabled v-model="applyData.APPLY_UNIT_NAME" placeholder="请输入申请单位" clearable
                           :style="{width: '100%'}">
                 </el-input>
               </el-form-item>
@@ -293,10 +293,12 @@ export default {
         tableData.value.forEach(t => {
           ids.value.push(t.UUID)
         })
-        applyData.value.APPLY_UNIT = localStorage.getItem("zhfx_unitcode");
-        applyData.value.APPLY_UNIT_NAME = localStorage.getItem("zhfx_unitname");
-        applyData.value.APPLY_USER = localStorage.getItem("zhfx_usercode");
-        applyData.value.APPLY_USER_NAME = localStorage.getItem("zhfx_username");
+        let dataWatchLoginUserInfo = JSON.parse(localStorage.getItem("yyfnzt_user"))
+        applyData.value.APPLY_UNIT = dataWatchLoginUserInfo.UNIT;
+        applyData.value.APPLY_UNIT_NAME = dataWatchLoginUserInfo.UNIT_NAME;
+        applyData.value.APPLY_USER = dataWatchLoginUserInfo.USERID;
+        applyData.value.APPLY_USER_NAME = dataWatchLoginUserInfo.USERNAME;
+
       }
       // uuid.value = JSON.parse(localStorage.getItem("JSON_PARA"))["uuid"] || '1';
       // type.value = JSON.parse(localStorage.getItem("JSON_PARA"))["type"] || '1';