瀏覽代碼

系统消息

YY 2 年之前
父節點
當前提交
be3ecea446
共有 4 個文件被更改,包括 58 次插入57 次删除
  1. 42 42
      src/router/index.ts
  2. 9 7
      src/views/center/other/message/add.vue
  3. 1 0
      src/views/center/other/message/index.vue
  4. 6 8
      tsconfig.json

+ 42 - 42
src/router/index.ts

@@ -40,48 +40,48 @@ router.beforeEach((to, from, next) => {
   if (token) {
     // let user = jwt.decode(token);
     const user = {
-      // _id: '63b3ed3e404c08bbd8539965',
-      // account: 'admin',
-      // name: '管理员',
-      // role: ['63b641cf35df6c6862df5d39', '63b628199bb09c9905def4cc', '63b64b1f35df6c6862e11bf2', '63b62cac9bb09c9905e14857'],
-      // is_super: false,
-      // role_type: '1',
-      // iat: 1679041521,
-      // exp: 1679214321,
-      _id: '640a8f0d9dfe6bbfaba9880a',
-      nick_name: '个人账号',
-      unit: '63b511fa2f41cd4838e478bb',
-      role: ['63b64ac735df6c6862e0eba3', '63b64b6335df6c6862e13f14', '63b62d2a9bb09c9905e19063'],
-      role_type: '2',
-      email: 'guhongwei0324@163.com',
-      phone: '13174420325',
-      unit_address: '长春市朝阳区前进大街1244号',
-      exam_status: '1',
-      card: '220182199603257019',
-      basic_id: '640aa44061ebe6235411e9db',
-      entrances: {
-        web: {
-          is_use: false,
-        },
-        project: {
-          is_use: true,
-          url: 'http://jcdtgl.waityou24.cn/project',
-        },
-        admin: {
-          is_use: true,
-          url: 'http://jcdtgl.waityou24.cn/admin',
-        },
-        basic: {
-          is_use: true,
-          url: 'http://jcdtgl.waityou24.cn/basic',
-        },
-        studio: {
-          is_use: true,
-          url: 'http://jcdtgl.waityou24.cn/studio',
-        },
-      },
-      iat: 1678686391,
-      exp: 1678859191,
+      _id: '63b3ed3e404c08bbd8539965',
+      account: 'admin',
+      name: '管理员',
+      role: ['63b641cf35df6c6862df5d39', '63b628199bb09c9905def4cc', '63b64b1f35df6c6862e11bf2', '63b62cac9bb09c9905e14857'],
+      is_super: false,
+      role_type: '1',
+      iat: 1679041521,
+      exp: 1679214321,
+      // _id: '640a8f0d9dfe6bbfaba9880a',
+      // nick_name: '个人账号',
+      // unit: '63b511fa2f41cd4838e478bb',
+      // role: ['63b64ac735df6c6862e0eba3', '63b64b6335df6c6862e13f14', '63b62d2a9bb09c9905e19063'],
+      // role_type: '2',
+      // email: 'guhongwei0324@163.com',
+      // phone: '13174420325',
+      // unit_address: '长春市朝阳区前进大街1244号',
+      // exam_status: '1',
+      // card: '220182199603257019',
+      // basic_id: '640aa44061ebe6235411e9db',
+      // entrances: {
+      //   web: {
+      //     is_use: false,
+      //   },
+      //   project: {
+      //     is_use: true,
+      //     url: 'http://jcdtgl.waityou24.cn/project',
+      //   },
+      //   admin: {
+      //     is_use: true,
+      //     url: 'http://jcdtgl.waityou24.cn/admin',
+      //   },
+      //   basic: {
+      //     is_use: true,
+      //     url: 'http://jcdtgl.waityou24.cn/basic',
+      //   },
+      //   studio: {
+      //     is_use: true,
+      //     url: 'http://jcdtgl.waityou24.cn/studio',
+      //   },
+      // },
+      // iat: 1678686391,
+      // exp: 1678859191,
     };
     store.commit('setUser', user, { root: true });
     next();

+ 9 - 7
src/views/center/other/message/add.vue

@@ -93,13 +93,14 @@ const onChange = (e: { model: string; value: Array<dataItem> }) => {
 };
 const dataChange = (e: { model: string; value: string }) => {
   const { model, value } = e;
+  // let info;
   if (model == 'type') {
     if (value == '3') {
       infoFields.value.splice(3, 0, { label: '接收人', model: 'user', custom: true });
       searchUser();
     } else {
-      let name = infoFields.value.filter((i: any) => i.model != 'user');
-      console.log(name);
+      let info = infoFields.value.filter((i: any) => i.model != 'user');
+      infoFields.value = info;
     }
   }
 };
@@ -108,17 +109,18 @@ const searchUser = async () => {
   // 接收人
   let user = [];
   // 企业用户
-  let company = await unitStudioApply.query({ status: '1' });
+  let company: IQueryResult = await unitStudioApply.query({ status: '1' });
+
   if (company.errcode == '0' && company.total > 0) {
     for (const val of company.data) {
-      user.push({ id: val.id, company: val.company, phone: val.phone });
+      user.push({ _id: val._id, company: val.company, phone: val.phone });
     }
   }
   // 科学家用户
-  let scientist = await userStudioApply.query({ status: '1' });
+  let scientist: IQueryResult = await userStudioApply.query({ status: '1' });
   if (scientist.errcode == '0' && scientist.total > 0) {
     for (const val of scientist.data) {
-      user.push({ id: val.id, name: val.name, phone: val.phone });
+      user.push({ _id: val._id, name: val.name, phone: val.phone.phone });
     }
   }
   userList.value = user;
@@ -127,7 +129,7 @@ const searchUser = async () => {
 const getUser = (e) => {
   let user = [];
   for (const val of e) {
-    let data = userList.value.find((i: any) => i.id == val);
+    let data = userList.value.find((i: any) => i._id == val);
     if (data) user.push(data);
   }
   return user;

+ 1 - 0
src/views/center/other/message/index.vue

@@ -135,6 +135,7 @@ const toSubmit = () => {
 };
 // 修改
 const toSee = (data) => {
+  console.log(data);
   for (const p1 of data.user) {
     if (!p1.name) p1.name = p1.company;
   }

+ 6 - 8
tsconfig.json

@@ -1,7 +1,7 @@
 {
   "extends": "@vue/tsconfig/tsconfig.web.json",
   // "include": ["env.d.ts", "src/**/*", "src/**/*.vue", "../common/src/stores/user", "../common/src/stores/user"],
-  "include":["src/**/*.ts","src/**/*.d.ts","src/**/*.tsx","src/**/*.vue","src/untils/baiduMap.js","src/untils/debuonce.js","**/*.ts","**/*.tsx"],
+  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue", "src/untils/baiduMap.js", "src/untils/debuonce.js", "**/*.ts", "**/*.tsx"],
   "compilerOptions": {
     "target": "esnext",
     "module": "esnext",
@@ -10,23 +10,21 @@
     "moduleResolution": "node",
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./src/*"]
+      "@/*": ["./src/*"],
+      "@common/*": ["../common/*"]
     },
     "isolatedModules": false,
     "suppressImplicitAnyIndexErrors": true,
     "sourceMap": true,
     "resolveJsonModule": true,
     "esModuleInterop": true,
-    "lib": ["esnext", "dom"],
-    "allowSyntheticDefaultImports": true,
+    "lib": ["es5", "es6", "dom", "dom.iterable"],
+    "allowSyntheticDefaultImports": true
   },
 
   "references": [
     {
       "path": "./tsconfig.node.json"
     }
-  ],
-
+  ]
 }
-
-