bug修改

src/api/sys/user.ts

@@ -15,6 +15,7 @@ import tool from "/@/utils/Tool.js";
 import { getJwtToken } from '/@/utils/auth';
 import moment from 'moment';
 import { resolve } from 'path';
+import { message } from 'ant-design-vue';
 
 enum Api {
   // Login = '/auth/login',
@@ -69,7 +70,7 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal')
         resolve(r);
         allSys();
         // loginCallProvider();
-      }).catch((err) =>{
+      }).catch((err) => {
         resolve(err)
       })
   })
@@ -108,49 +109,56 @@ export function getMyInfo() {
       params: formData,
       ...interfaceType,
     }, { joinPrefix: false }).then(async (i) => {
-      var u = JSON.parse(i.result);
-      console.log(u);
-      
-      //插入登录日志记录
-      let addRecordParam = {
-        systemLog: {
-          cjrq: moment().format('YYYY-MM-DD HH:mm:ss'),
-          czsm: "登录操作",
-          opt: "login",
-          sfcg: u.hasOwnProperty('tokenV2') ? 1 : 0,
-          userid: u.EMPLOYEE_MIS.EMPLOYEE_ID,
-          username: u.EMPLOYEE.NAME
-        }
-      }
-      defHttp.post({ url: Api.AddLoginRecord, params: addRecordParam })
+      if (i.status == 0) {
+        var u = JSON.parse(i.result);
+        console.log(u);
 
-      var a = {
-        info: u,
-        "userId": "80808080-8080-8080-8080-808080808080",
-        "realName": u.EMPLOYEE.NAME,
-        "username": u.EMPLOYEE.NAME,
-        "LOGIN_NAME": u.EMPLOYEE.LOGIN_NAME,
-        "phoneNumber": "17313039356",
-        "email": "1419750663@qq.com",
-        "avatar": "",
-        "tenantId": "13814000-1dd2-11b2-8080-808080808080",
-        "needSetPwd": false,
-        "roles": [
-          "SYS_ADMIN"
-        ],
-        "nameroles": u.ROLES && u.ROLES.map(i => i.NAME).join(","),
-        "plainRoles": [
-          {
-            "roleId": "81818181-8181-8181-8181-818181818181",
-            "roleName": "超级管理员"
+        //插入登录日志记录
+        let addRecordParam = {
+          systemLog: {
+            cjrq: moment().format('YYYY-MM-DD HH:mm:ss'),
+            czsm: "登录操作",
+            opt: "login",
+            sfcg: u.hasOwnProperty('tokenV2') ? 1 : 0,
+            userid: u.EMPLOYEE_MIS.EMPLOYEE_ID,
+            username: u.EMPLOYEE.NAME
           }
-        ]
+        }
+        defHttp.post({ url: Api.AddLoginRecord, params: addRecordParam })
+
+        var a = {
+          info: u,
+          "userId": "80808080-8080-8080-8080-808080808080",
+          "realName": u.EMPLOYEE.NAME,
+          "username": u.EMPLOYEE.NAME,
+          "LOGIN_NAME": u.EMPLOYEE.LOGIN_NAME,
+          "phoneNumber": "17313039356",
+          "email": "1419750663@qq.com",
+          "avatar": "",
+          "tenantId": "13814000-1dd2-11b2-8080-808080808080",
+          "needSetPwd": false,
+          "roles": [
+            "SYS_ADMIN"
+          ],
+          "nameroles": u.ROLES && u.ROLES.map(i => i.NAME).join(","),
+          "plainRoles": [
+            {
+              "roleId": "81818181-8181-8181-8181-818181818181",
+              "roleName": "超级管理员"
+            }
+          ]
+        }
+        await getUserIdInfo(u.EMPLOYEE_MIS.EMPLOYEE_ID);
+        resolve(a);
+        session.setItem("userInfo", u);
+        session.setItem('tokenV2', u.tokenV2);
+        session.setItem('userId', u.EMPLOYEE_MIS.EMPLOYEE_ID);
+      } else {
+        window.localStorage.clear();
+        window.sessionStorage.clear();
+        message.error("用户名或密码错误");
+        resolve([]);
       }
-      await getUserIdInfo(u.EMPLOYEE_MIS.EMPLOYEE_ID);
-      resolve(a);
-      session.setItem("userInfo", u);
-      session.setItem('tokenV2', u.tokenV2);
-      session.setItem('userId', u.EMPLOYEE_MIS.EMPLOYEE_ID);
     })
   })
 }
@@ -159,7 +167,7 @@ export function getMyInfo() {
  * @description: 根据用户id获取详细信息
  */
 export const getUserIdInfo = (id) => {
-  return new Promise((resolve)=>{
+  return new Promise((resolve) => {
     defHttp.post<Array<string>>({
       url: Api.GetUserDetailInfo, params: {
         userId: id,

src/enums/cacheEnum.ts

@@ -14,7 +14,7 @@ export const USER_INFO_KEY = 'USER__INFO__';
 export const ROLES_KEY = 'ROLES__KEY';
 
 // project config key
-export const PROJ_CFG_KEY = 'PROJ__CFG__KEY__';
+export const PROJ_CFG_KEY = 'PROJ__CFG__KEY__NEW';
 
 // lock info
 export const LOCK_INFO_KEY = 'LOCK__INFO__KEY__';

src/layouts/default/header/components/user-dropdown/PersonInfoModal.vue

@@ -35,13 +35,17 @@
                     <a-form-item label="用户名称" name="userName">
                         <a-input v-model:value="form.userName" style="width: 100%" placeholder="请输入" />
                     </a-form-item>
+                    <!-- 登录名称 -->
+                    <a-form-item label="登录名称" name="loginName">
+                        <a-input v-model:value="form.loginName" style="width: 100%" placeholder="请输入" />
+                    </a-form-item>
                     <!-- 职责 -->
                     <a-form-item label="手机号码" name="mobile">
                         <a-input v-model:value="form.mobile" style="width: 100%" placeholder="请输入" />
                     </a-form-item>
                     <!-- 排序 -->
                     <a-form-item label="用户密码" name="pwd">
-                        <a-input v-model:value="form.pwd" style="width: 100%" placeholder="请输入" />
+                        <a-input v-model:value="form.pwd" type="password" style="width: 100%" placeholder="请输入" />
                     </a-form-item>
                 </a-form>
             </div>
@@ -67,6 +71,8 @@ import headerImg from "/@/assets/images/header-icon.png";
 import { ChineseRegexp, EmailRegexp, phoneRegexp } from '/@/utils/rules';
 import { getUserInfoByLoginCode } from '/@/api/system/system';
 import { SaveOrUpdateUserInfo } from '/@/api/system/system';
+import md5 from 'js-md5';
+
 
 const props = {
     formData: {
@@ -84,9 +90,11 @@ export default defineComponent({
             wrapClassName: 'modal-wrap',
         })
         const form = reactive({
-            userid:"",
+            userid: "",
             userName: "",
+            loginName: "",
             mobile: "",
+            userid: '',
             pwd: ""
         });
         const baseForm = reactive({
@@ -113,6 +121,11 @@ export default defineComponent({
                 message: '请输入姓名',
                 trigger: 'blur'
             }],
+            loginName: [{
+                required: true,
+                message: '请输入登录名',
+                trigger: 'blur'
+            }],
             pwd: [
                 { required: true, message: '密码不能为空' },
                 { pattern: /^(?=.*[A-Z])(?=.*[a-z])(?=.*\d)(?=.*\W)[\S]{8,30}$/, message: '密码中必须包含大小写字母、数字、特殊字符，至少8个字符，最多30个字符' }
@@ -139,9 +152,14 @@ export default defineComponent({
                     baseForm.loginName = res.user.loginName;
                     baseForm.mobile = res.user.mobile;
                     form.userid = res.user.userid;
+                    form.sex = res.user.sex;
+                    form.sszw = res.user.sszw;
+                    form.ssgw = res.user.ssgw;
+                    form.userjs = res.user.userjs;
                     form.userName = res.user.userName;
+                    form.loginName = res.user.loginName;
                     form.mobile = res.user.mobile;
-                    form.pwd = res.user.pwd;
+                    form.pwd = "KJSJ@888!";//res.user.pwd;
                 } else {
                     message.error('用户信息查询失败')
                 }
@@ -153,13 +171,24 @@ export default defineComponent({
             resetForm()
         };
         const onSubmit = () => {
-            formRef.value.validate().then(() => {
+            formRef.value.validate().then((e) => {
+                if (e.pwd == "KJSJ@888!") {
+                    e.pwd = "";
+                } else {
+                    e.pwd = md5(e.pwd);
+                }
+                e.userid = form.userid;
+                e.sex = form.sex;
+                e.sszw = form.sszw;
+                e.ssgw = form.ssgw;
+                e.userjs = form.userjs;
+                console.log("此处调用修改:", e)
                 //此处调用修改
-                SaveOrUpdateUserInfo(form).then(res => {
+                SaveOrUpdateUserInfo(e).then(res => {
                     if (res) {
-                        message.success('操作成功')
+                        message.success('修改用户信息成功')
                     } else {
-                        message.success('操作失败')
+                        message.success('修改用户信息失败')
                     }
                     onClose()
                 })

src/settings/designSetting copy.ts

@@ -1,49 +0,0 @@
-import { ThemeEnum } from '../enums/appEnum';
-
-export const prefixCls = 'vben';
-
-export const darkMode = ThemeEnum.LIGHT;
-
-// app theme preset color
-export const APP_PRESET_COLOR_LIST: string[] = [
-  '#0960bd',
-  '#0084f4',
-  '#009688',
-  '#536dfe',
-  '#ff5c93',
-  '#ee4f12',
-  '#0096c7',
-  '#9c27b0',
-  '#ff9800',
-];
-
-// header preset color
-export const HEADER_PRESET_BG_COLOR_LIST: string[] = [
-  '#0671DD',//ffffff
-  '#151515',
-  '#009688',
-  '#5172DC',
-  '#018ffb',
-  '#409eff',
-  '#e74c3c',
-  '#24292e',
-  '#394664',
-  '#001529',
-  '#383f45',
-  '#0671DD',
-];
-
-// sider preset color
-export const SIDE_BAR_BG_COLOR_LIST: string[] = [
-  '#001529',
-  '#212121',
-  '#41567c',//273352
-  '#41567c',//ffffff//324166
-  '#191b24',
-  '#191a23',
-  '#304156',
-  '#001628',
-  '#28333E',
-  '#344058',
-  '#383f45',
-];

src/settings/designSetting.ts

@@ -19,31 +19,31 @@ export const APP_PRESET_COLOR_LIST: string[] = [
 
 // header preset color
 export const HEADER_PRESET_BG_COLOR_LIST: string[] = [
-  '#0671DD',//ffffff
-  '#0671DD',
-  '#0671DD',
-  '#0671DD',
-  '#0671DD',
-  '#0671DD',
-  '#0671DD',
-  '#0671DD',
-  '#0671DD',
-  '#0671DD',
-  '#0671DD',
+  '#0671DD',//ffffff//当前使用的这个
+  '#151515',
+  '#009688',
+  '#5172DC',
+  '#018ffb',
+  '#409eff',
+  '#e74c3c',
+  '#24292e',
+  '#394664',
+  '#001529',
+  '#383f45',
   '#0671DD',
 ];
 
 // sider preset color
 export const SIDE_BAR_BG_COLOR_LIST: string[] = [
-  '#41567c',
-  '#41567c',
-  '#41567c',//273352
+  '#001529',
+  '#212121',
+  '#41567c',//273352//当前使用的这个
   '#41567c',//ffffff//324166
-  '#41567c',
-  '#41567c',
-  '#41567c',
-  '#41567c',
-  '#41567c',
-  '#41567c',
-  '#41567c',
+  '#191b24',
+  '#191a23',
+  '#304156',
+  '#001628',
+  '#28333E',
+  '#344058',
+  '#383f45',
 ];

src/views/assembly/item/AssemblyData.vue

@@ -13,7 +13,7 @@
               <span><a :href="[`./mapview.html?onlineIde_${i.servicealiasname}`]" target="_blank"
                   rel="noopener noreferrer">浏览</a></span>
               <span @click="showDrawer(i)">详细</span>
-              <span @click="applyWay(i)" v-if="i.SFJRSQK == '未加入'">{{ i.SFJRSQK }}申请库</span>
+              <span @click="applyWay(i)" v-if="i.SFJRSQK == '未加入'">{{ i.SFJRSQK == '未加入' ? '加入' : '已加入' }}申请库</span>
               <span v-else style="cursor: not-allowed;background: rgb(232, 232, 232) !important;">{{
                 i.SFJRSQK }}申请库</span>
             </p>

src/views/dataAdmin/assembly/SourceDetail.vue

@@ -174,11 +174,11 @@ export default defineComponent({
       servicetype: [{ required: true, message: '请选择资源类型', trigger: 'change' }],
 
       servicename: [
-        { required: true, message: '请填写资源名称', trigger: 'blur' },
+        { required: true, message: '请填写组件名称', trigger: 'blur' },
         { min: 1, max: 20, message: '长度必须在3到20个字符', trigger: 'blur' },
       ],
       servicealiasname: [
-        { required: true, message: '请输入资源别名', trigger: 'blur' },
+        { required: true, message: '请输入组件别名', trigger: 'blur' },
         { min: 1, max: 20, message: '长度必须在3到20个字符', trigger: 'blur' },
       ],
       systag: [{ required: true, message: '请选择系统标签', trigger: 'change' }],
@@ -231,17 +231,17 @@ export default defineComponent({
                 if (!params.metadata.mapingurl) params.metadata.mapingurl = data.detail.mapingurl;
                 const res = await updateService(params);
                 if (res && res?.status !== '-1') {
-                  createMessage.success('修改地图资源成功！');
+                  createMessage.success('修改组件资源成功！');
                   resetForm();
                   emit('RtnMain', true);
-                } else createMessage.error('修改地图资源失败！,失败原因：' + res?.message, 1);
+                } else createMessage.error('修改组件资源失败！,失败原因：' + res?.message, 1);
               } else {
                 const res = await insertService(params);
                 if (res && res?.status !== '-1') {
-                  createMessage.success('新增地图资源成功！');
+                  createMessage.success('新增组件资源成功！');
                   resetForm();
                   emit('RtnMain', true);
-                } else createMessage.error('新增地图资源失败！,失败原因：' + res?.message, 1);
+                } else createMessage.error('新增组件资源失败！,失败原因：' + res?.message, 1);
               }
             }
           })

src/views/dataAdmin/dataAdmin/flowStep/index.vue

@@ -116,7 +116,6 @@ export default defineComponent({
           data.sysUserInfo[item['EMPLOYEE_ID']] = item['NAME'];
         });
       }
-      console.log('人员信息', data.sysUserInfo)
     };
     const queryData = async () => {
       const res = await getFlowConfigByBusinessName(data.flowName);
@@ -149,6 +148,10 @@ export default defineComponent({
         },
       ];
       const step = getFlowNodes(flow.flowNode, flow.flowNodePerson);
+      // step.map(i => {
+      //   i.status = "1";
+      //   i.handlers.map(j => j.status = "1");
+      // })
       console.log('步骤', step)
       if (step) data.steps.push(...step)
       const length = step.length
@@ -319,7 +322,7 @@ export default defineComponent({
                   float: left;
                   height: 36px;
                   line-height: 36px;
-                  width: 44px;
+                  min-width: 44px;
                   margin-right: 3px;
                   justify-content: center;
                   color: #fff;

src/views/dataAdmin/dataAdmin/mapUpload/SourceDetail.vue

@@ -41,7 +41,7 @@
 
           <a-col :span="24" class="form-col">
             <a-form-item ref="description" label="资源描述" name="description" class="label-form-item" :disabled="isView">
-              <a-textarea v-model:value="formState.description" :rows="2" />
+              <a-textarea v-model:value="formState.description" :rows="2" :disabled="isView"  />
             </a-form-item>
           </a-col>