新增指标录入功能

.env.development

@@ -0,0 +1 @@
+VUE_APP_API=http://10.81.3.153:6060

.env.eapi

@@ -0,0 +1,2 @@
+NODE_ENV=eapi
+VUE_APP_API=http://192.168.1.117:7020

.env.production

@@ -0,0 +1 @@
+VUE_APP_API=http://10.81.3.153:6060

.github/FUNDING.yml

@@ -1,13 +0,0 @@
-# These are supported funding model platforms
-
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: # Replace with a single Patreon username
-open_collective: chuzhixin
-#open_collective: vue-admin-plus
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: https://opencollective.com/vue-admin-plus # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.vscode/settings.json

@@ -1,54 +0,0 @@
-{
-  "[vue]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "editor.quickSuggestions": {
-    "strings": true
-  },
-  "workbench.colorTheme": "One Monokai",
-  "editor.tabSize": 2,
-  "editor.detectIndentation": false,
-  "emmet.triggerExpansionOnTab": true,
-  "editor.formatOnSave": true,
-  "javascript.format.enable": true,
-  "git.enableSmartCommit": true,
-  "git.autofetch": true,
-  "git.confirmSync": false,
-  "[json]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "liveServer.settings.donotShowInfoMsg": true,
-  "explorer.confirmDelete": false,
-  "javascript.updateImportsOnFileMove.enabled": "always",
-  "typescript.updateImportsOnFileMove.enabled": "always",
-  "files.exclude": {
-    "**/.idea": true
-  },
-  "editor.codeActionsOnSave": {
-    "source.fixAll.stylelint": true,
-    "source.fixAll.eslint": true
-  },
-  "[javascript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[jsonc]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[html]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "editor.suggest.snippetsPreventQuickSuggestions": false,
-  "prettier.htmlWhitespaceSensitivity": "ignore",
-  "prettier.vueIndentScriptAndStyle": true,
-  "docthis.authorName": "https://vue-admin-beautiful.com",
-  "docthis.includeAuthorTag": true,
-  "docthis.includeDescriptionTag": true,
-  "docthis.enableHungarianNotationEvaluation": true,
-  "docthis.inferTypesFromNames": true,
-  "vetur.format.defaultFormatter.html": "prettier",
-  "files.autoSave": "onFocusChange",
-  "path-intellisense.mappings": {
-    "@": "${workspaceRoot}/src"
-  },
-  "files.eol": "\n"
-}

mock/controller/user.js

@@ -1,7 +1,10 @@
-const accessTokens = {
+//用户信息列表
+
+let accessTokens = {
   admin: 'admin-accessToken',
   editor: 'editor-accessToken',
   test: 'test-accessToken',
+  zhangsan: 'zhangsan-accessToken',
 }
 
 module.exports = [
@@ -35,7 +38,7 @@ module.exports = [
       return {
         code: 200,
         msg: 'success',
-        data: { accessToken },
+        data: { accessToken, username },
       }
     },
   },
@@ -56,17 +59,11 @@ module.exports = [
       const { accessToken } = config.body
       let permissions = ['admin']
       let username = 'admin'
-      if ('admin-accessToken' === accessToken) {
-        permissions = ['admin']
-        username = 'admin'
-      }
-      if ('editor-accessToken' === accessToken) {
-        permissions = ['editor']
-        username = 'editor'
-      }
-      if ('test-accessToken' === accessToken) {
-        permissions = ['admin', 'editor']
-        username = 'test'
+      for (var key in accessTokens) {
+        if (accessTokens[key] == accessToken) {
+          username = key
+          permissions = ['admin']
+        }
       }
       return {
         code: 200,

mock/utils/index.js

@@ -1,7 +1,12 @@
 const { Random } = require('mockjs')
 const { join } = require('path')
 const fs = require('fs')
-
+const accessTokens = {
+  admin: 'admin-accessToken',
+  editor: 'editor-accessToken',
+  test: 'test-accessToken',
+  zhangsan: 'zhangsan-accessToken',
+}
 /**
  * @author https://vue-admin-beautiful.com （不想保留author可删除）
  * @description 随机生成图片url。
@@ -37,7 +42,13 @@ function handleMockArray() {
   getFiles('mock/controller')
   return mockArray
 }
+
+function handleToken(accessToken) {
+  let arr = Object.keys(accessTokens)
+}
+
 module.exports = {
   handleRandomImage,
   handleMockArray,
+  handleToken,
 }

prettier.config.js

@@ -16,5 +16,5 @@ module.exports = {
   arrowParens: 'always',
   htmlWhitespaceSensitivity: 'ignore',
   vueIndentScriptAndStyle: true,
-  endOfLine: 'lf',
+  //   endOfLine: 'auto',
 }

src/api/user.js

@@ -12,6 +12,16 @@ export async function login(data) {
     data,
   })
 }
+export function getWpid(data) {
+  //   if (loginRSA) {
+  //     data = await encryptedData(data)
+  //   }
+  return request({
+    url: '/enter',
+    method: 'post',
+    data,
+  })
+}
 
 export function getUserInfo(accessToken) {
   return request({

src/api/zhibiao.js

@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+export function getList(data) {
+  return request({
+    url: `/enter/target?date=${data.date}&wpid=${data.wpid}`,
+    method: 'get',
+  })
+}
+
+export function doEdit(data) {
+  return request({
+    url: '/enter/target',
+    method: 'post',
+    data,
+  })
+}
+
+export function doDelete(data) {
+  return request({
+    url: `/enter/target/${data.id}`,
+    method: 'delete',
+  })
+}
+export function doPut(data) {
+  return request({
+    url: '/enter/target',
+    method: 'put',
+    data,
+  })
+}
+export function getWplist(data) {
+  return request({
+    url: `/enter/wpls?wpid=${data.wpid}`,
+    method: 'get',
+  })
+}

src/config/setting.config.js

@@ -9,15 +9,15 @@ const setting = {
   // 放置生成的静态资源 (js、css、img、fonts) 的 (相对于 outputDir 的) 目录。
   assetsDir: 'static',
   // 开发环境每次保存时是否输出为eslint编译警告
-  lintOnSave: true,
+  lintOnSave: false,
   // 进行编译的依赖
   transpileDependencies: [],
   //标题 （包括初次加载雪花屏的标题 页面的标题 浏览器的标题）
-  title: 'vue-admin-better',
+  title: '后台管理',
   //简写
   abbreviation: 'vab',
   //开发环境端口号
-  devPort: '81',
+  devPort: '8080',
   //版本号
   version: process.env.VUE_APP_VERSION,
   //这一项非常重要！请务必保留MIT协议下package.json及copyright作者信息 即可免费商用，不遵守此项约定你将无法使用该框架，如需自定义版权信息请联系QQ1204505056

src/config/theme.config.js

@@ -7,7 +7,7 @@ const theme = {
   //横纵布局 horizontal vertical
   layout: 'vertical',
   //是否开启主题配置按钮
-  themeBar: true,
+  themeBar: false,
   //是否显示多标签页
   tabsBar: true,
 }

src/layouts/components/VabAppMain/index.vue

@@ -1,16 +1,10 @@
 <template>
   <div v-if="routerView" class="app-main-container">
-    <vab-github-corner />
     <transition mode="out-in" name="fade-transform">
       <keep-alive :include="cachedRoutes" :max="keepAliveMaxNum">
         <router-view :key="key" class="app-main-height" />
       </keep-alive>
     </transition>
-    <footer v-show="footerCopyright" class="footer-copyright">
-      Copyright
-      <vab-icon :icon="['fas', 'copyright']"></vab-icon>
-      vue-admin-better 开源免费版 {{ fullYear }}
-    </footer>
   </div>
 </template>
 

src/layouts/components/VabAvatar/index.vue

@@ -10,11 +10,7 @@
     </span>
 
     <el-dropdown-menu slot="dropdown">
-      <el-dropdown-item command="github">github地址</el-dropdown-item>
-      <el-dropdown-item command="gitee" divided>码云地址</el-dropdown-item>
-      <el-dropdown-item command="pro" divided>pro付费版地址</el-dropdown-item>
-      <el-dropdown-item command="plus" divided>plus付费版地址</el-dropdown-item>
-      <el-dropdown-item command="logout" divided>退出登录</el-dropdown-item>
+      <el-dropdown-item command="logout">退出登录</el-dropdown-item>
     </el-dropdown-menu>
   </el-dropdown>
 </template>
@@ -37,24 +33,6 @@
           case 'logout':
             this.logout()
             break
-          case 'personalCenter':
-            this.personalCenter()
-            break
-          case 'github':
-            window.open('https://github.com/chuzhixin/vue-admin-beautiful')
-            break
-          case 'gitee':
-            window.open('https://gitee.com/chu1204505056/vue-admin-beautiful')
-            break
-          case 'pro':
-            window.open(
-              'https://vue-admin-beautiful.com/admin-pro/?hmsr=homeAd&hmpl=&hmcu=&hmkw=&hmci='
-            )
-            break
-          case 'plus':
-            window.open(
-              'https://vue-admin-beautiful.com/admin-plus/?hmsr=homeAd&hmpl=&hmcu=&hmkw=&hmci='
-            )
         }
       },
       personalCenter() {

src/layouts/index.vue

@@ -10,17 +10,16 @@
     >
       <div :class="header === 'fixed' ? 'fixed-header' : ''">
         <vab-top-bar />
-        <div
+        <!-- <div
           v-if="tabsBar === 'true' || tabsBar === true"
           :class="{ 'tag-view-show': tabsBar }"
         >
           <div class="vab-main">
             <vab-tabs-bar />
           </div>
-        </div>
+        </div> -->
       </div>
       <div class="vab-main main-padding">
-        <vab-ad />
         <vab-app-main />
       </div>
     </div>
@@ -41,9 +40,9 @@
       <div class="vab-main" :class="collapse ? 'is-collapse-main' : ''">
         <div :class="header === 'fixed' ? 'fixed-header' : ''">
           <vab-nav-bar />
-          <vab-tabs-bar v-if="tabsBar === 'true' || tabsBar === true" />
+          <!-- <vab-tabs-bar v-if="tabsBar === 'true' || tabsBar === true" /> -->
         </div>
-        <vab-ad />
+
         <vab-app-main />
       </div>
     </div>
@@ -161,7 +160,7 @@
       position: relative;
 
       &.fixed {
-        padding-top: calc(#{$base-top-bar-height} + #{$base-tabs-bar-height});
+        padding-top: calc(#{$base-top-bar-height});
       }
 
       &.fixed.no-tabs-bar {
@@ -217,7 +216,7 @@
       }
 
       &.fixed {
-        padding-top: calc(#{$base-nav-bar-height} + #{$base-tabs-bar-height});
+        padding-top: calc(#{$base-nav-bar-height});
       }
 
       &.fixed.no-tabs-bar {
@@ -251,6 +250,7 @@
           }
 
           .app-main-container {
+            height: calc(100vh - 20px - 60px - 20px);
             width: calc(100% - #{$base-padding} - #{$base-padding});
             margin: $base-padding auto;
             background: $base-color-white;

src/router/index.js

@@ -36,18 +36,35 @@ export const constantRoutes = [
 ]
 
 export const asyncRoutes = [
+  // {
+  //   path: '/',
+  //   component: Layout,
+  //   redirect: '/index',
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       name: 'Index',
+  //       component: () => import('@/views/index/index'),
+  //       meta: {
+  //         title: '首页',
+  //         icon: 'home',
+  //         affix: true,
+  //       },
+  //     },
+  //   ],
+  // },
   {
     path: '/',
     component: Layout,
-    redirect: '/index',
+    redirect: '/target',
     children: [
       {
-        path: 'index',
-        name: 'Index',
-        component: () => import('@/views/index/index'),
+        path: 'target',
+        name: 'Target',
+        component: () => import('@/views/target/index.vue'),
         meta: {
-          title: '首页',
-          icon: 'home',
+          title: '指标录入',
+          icon: 'marker',
           affix: true,
         },
       },
@@ -71,257 +88,257 @@ export const asyncRoutes = [
     ],
   }, */
 
-  {
-    path: '/vab',
-    component: Layout,
-    redirect: 'noRedirect',
-    name: 'Vab',
-    alwaysShow: true,
-    meta: { title: '组件', icon: 'box-open' },
-    children: [
-      {
-        path: 'permissions',
-        name: 'Permission',
-        component: () => import('@/views/vab/permissions/index'),
-        meta: {
-          title: '角色权限',
-          permissions: ['admin', 'editor'],
-        },
-      },
-      {
-        path: 'icon',
-        component: EmptyLayout,
-        redirect: 'noRedirect',
-        name: 'Icon',
-        meta: {
-          title: '图标',
-          permissions: ['admin'],
-        },
-        children: [
-          {
-            path: 'awesomeIcon',
-            name: 'AwesomeIcon',
-            component: () => import('@/views/vab/icon/index'),
-            meta: { title: '常规图标' },
-          },
-          {
-            path: 'colorfulIcon',
-            name: 'ColorfulIcon',
-            component: () => import('@/views/vab/icon/colorfulIcon'),
-            meta: { title: '多彩图标' },
-          },
-        ],
-      },
-      {
-        path: 'table',
-        component: () => import('@/views/vab/table/index'),
-        name: 'Table',
-        meta: {
-          title: '表格',
-          permissions: ['admin'],
-        },
-      },
-      {
-        path: 'map',
-        component: () => import('@/views/vab/map/index'),
-        name: 'Map',
-        meta: {
-          title: '地图',
-          permissions: ['admin'],
-        },
-      },
+  //   {
+  //     path: '/vab',
+  //     component: Layout,
+  //     redirect: 'noRedirect',
+  //     name: 'Vab',
+  //     alwaysShow: true,
+  //     meta: { title: '组件', icon: 'box-open' },
+  //     children: [
+  //       {
+  //         path: 'permissions',
+  //         name: 'Permission',
+  //         component: () => import('@/views/vab/permissions/index'),
+  //         meta: {
+  //           title: '角色权限',
+  //           permissions: ['admin', 'editor'],
+  //         },
+  //       },
+  //       {
+  //         path: 'icon',
+  //         component: EmptyLayout,
+  //         redirect: 'noRedirect',
+  //         name: 'Icon',
+  //         meta: {
+  //           title: '图标',
+  //           permissions: ['admin'],
+  //         },
+  //         children: [
+  //           {
+  //             path: 'awesomeIcon',
+  //             name: 'AwesomeIcon',
+  //             component: () => import('@/views/vab/icon/index'),
+  //             meta: { title: '常规图标' },
+  //           },
+  //           {
+  //             path: 'colorfulIcon',
+  //             name: 'ColorfulIcon',
+  //             component: () => import('@/views/vab/icon/colorfulIcon'),
+  //             meta: { title: '多彩图标' },
+  //           },
+  //         ],
+  //       },
+  //       {
+  //         path: 'table',
+  //         component: () => import('@/views/vab/table/index'),
+  //         name: 'Table',
+  //         meta: {
+  //           title: '表格',
+  //           permissions: ['admin'],
+  //         },
+  //       },
+  //       {
+  //         path: 'map',
+  //         component: () => import('@/views/vab/map/index'),
+  //         name: 'Map',
+  //         meta: {
+  //           title: '地图',
+  //           permissions: ['admin'],
+  //         },
+  //       },
 
-      {
-        path: 'webSocket',
-        name: 'WebSocket',
-        component: () => import('@/views/vab/webSocket/index'),
-        meta: { title: 'webSocket', permissions: ['admin'] },
-      },
-      {
-        path: 'form',
-        name: 'Form',
-        component: () => import('@/views/vab/form/index'),
-        meta: { title: '表单', permissions: ['admin'] },
-      },
-      {
-        path: 'element',
-        name: 'Element',
-        component: () => import('@/views/vab/element/index'),
-        meta: { title: '常用组件', permissions: ['admin'] },
-      },
-      {
-        path: 'tree',
-        name: 'Tree',
-        component: () => import('@/views/vab/tree/index'),
-        meta: { title: '树', permissions: ['admin'] },
-      },
-      {
-        path: 'menu1',
-        component: () => import('@/views/vab/nested/menu1/index'),
-        name: 'Menu1',
-        alwaysShow: true,
-        meta: {
-          title: '嵌套路由 1',
-          permissions: ['admin'],
-        },
-        children: [
-          {
-            path: 'menu1-1',
-            name: 'Menu1-1',
-            alwaysShow: true,
-            meta: { title: '嵌套路由 1-1' },
-            component: () => import('@/views/vab/nested/menu1/menu1-1/index'),
+  //       {
+  //         path: 'webSocket',
+  //         name: 'WebSocket',
+  //         component: () => import('@/views/vab/webSocket/index'),
+  //         meta: { title: 'webSocket', permissions: ['admin'] },
+  //       },
+  //       {
+  //         path: 'form',
+  //         name: 'Form',
+  //         component: () => import('@/views/vab/form/index'),
+  //         meta: { title: '表单', permissions: ['admin'] },
+  //       },
+  //       {
+  //         path: 'element',
+  //         name: 'Element',
+  //         component: () => import('@/views/vab/element/index'),
+  //         meta: { title: '常用组件', permissions: ['admin'] },
+  //       },
+  //       {
+  //         path: 'tree',
+  //         name: 'Tree',
+  //         component: () => import('@/views/vab/tree/index'),
+  //         meta: { title: '树', permissions: ['admin'] },
+  //       },
+  //       {
+  //         path: 'menu1',
+  //         component: () => import('@/views/vab/nested/menu1/index'),
+  //         name: 'Menu1',
+  //         alwaysShow: true,
+  //         meta: {
+  //           title: '嵌套路由 1',
+  //           permissions: ['admin'],
+  //         },
+  //         children: [
+  //           {
+  //             path: 'menu1-1',
+  //             name: 'Menu1-1',
+  //             alwaysShow: true,
+  //             meta: { title: '嵌套路由 1-1' },
+  //             component: () => import('@/views/vab/nested/menu1/menu1-1/index'),
 
-            children: [
-              {
-                path: 'menu1-1-1',
-                name: 'Menu1-1-1',
-                meta: { title: '嵌套路由 1-1-1' },
-                component: () =>
-                  import('@/views/vab/nested/menu1/menu1-1/menu1-1-1/index'),
-              },
-            ],
-          },
-        ],
-      },
-      {
-        path: 'loading',
-        name: 'Loading',
-        component: () => import('@/views/vab/loading/index'),
-        meta: { title: 'loading', permissions: ['admin'] },
-      },
-      {
-        path: 'backToTop',
-        name: 'BackToTop',
-        component: () => import('@/views/vab/backToTop/index'),
-        meta: { title: '返回顶部', permissions: ['admin'] },
-      },
-      {
-        path: 'lodash',
-        name: 'Lodash',
-        component: () => import('@/views/vab/lodash/index'),
-        meta: { title: 'lodash', permissions: ['admin'] },
-      },
-      {
-        path: 'smallComponents',
-        name: 'SmallComponents',
-        component: () => import('@/views/vab/smallComponents/index'),
-        meta: { title: '小组件', permissions: ['admin'] },
-      },
+  //             children: [
+  //               {
+  //                 path: 'menu1-1-1',
+  //                 name: 'Menu1-1-1',
+  //                 meta: { title: '嵌套路由 1-1-1' },
+  //                 component: () =>
+  //                   import('@/views/vab/nested/menu1/menu1-1/menu1-1-1/index'),
+  //               },
+  //             ],
+  //           },
+  //         ],
+  //       },
+  //       {
+  //         path: 'loading',
+  //         name: 'Loading',
+  //         component: () => import('@/views/vab/loading/index'),
+  //         meta: { title: 'loading', permissions: ['admin'] },
+  //       },
+  //       {
+  //         path: 'backToTop',
+  //         name: 'BackToTop',
+  //         component: () => import('@/views/vab/backToTop/index'),
+  //         meta: { title: '返回顶部', permissions: ['admin'] },
+  //       },
+  //       {
+  //         path: 'lodash',
+  //         name: 'Lodash',
+  //         component: () => import('@/views/vab/lodash/index'),
+  //         meta: { title: 'lodash', permissions: ['admin'] },
+  //       },
+  //       {
+  //         path: 'smallComponents',
+  //         name: 'SmallComponents',
+  //         component: () => import('@/views/vab/smallComponents/index'),
+  //         meta: { title: '小组件', permissions: ['admin'] },
+  //       },
 
-      {
-        path: 'upload',
-        name: 'Upload',
-        component: () => import('@/views/vab/upload/index'),
-        meta: { title: '上传', permissions: ['admin'] },
-      },
-      {
-        path: 'log',
-        name: 'Log',
-        component: () => import('@/views/vab/errorLog/index'),
-        meta: { title: '错误日志模拟', permissions: ['admin'] },
-      },
-      {
-        path: 'https://github.com/chuzhixin/vue-admin-beautiful?utm_source=gold_browser_extension',
-        name: 'ExternalLink',
-        meta: {
-          title: '外链',
-          target: '_blank',
-          permissions: ['admin', 'editor'],
-          badge: 'New',
-        },
-      },
-      {
-        path: 'more',
-        name: 'More',
-        component: () => import('@/views/vab/more/index'),
-        meta: { title: '关于', permissions: ['admin'] },
-      },
-    ],
-  },
-  {
-    path: '/personnelManagement',
-    component: Layout,
-    redirect: 'noRedirect',
-    name: 'PersonnelManagement',
-    meta: { title: '配置', icon: 'users-cog', permissions: ['admin'] },
-    children: [
-      {
-        path: 'userManagement',
-        name: 'UserManagement',
-        component: () =>
-          import('@/views/personnelManagement/userManagement/index'),
-        meta: { title: '用户管理' },
-      },
-      {
-        path: 'roleManagement',
-        name: 'RoleManagement',
-        component: () =>
-          import('@/views/personnelManagement/roleManagement/index'),
-        meta: { title: '角色管理' },
-      },
-      {
-        path: 'menuManagement',
-        name: 'MenuManagement',
-        component: () =>
-          import('@/views/personnelManagement/menuManagement/index'),
-        meta: { title: '菜单管理', badge: 'New' },
-      },
-    ],
-  },
-  {
-    path: '/mall',
-    component: Layout,
-    redirect: 'noRedirect',
-    name: 'Mall',
-    meta: {
-      title: '商城',
-      icon: 'shopping-cart',
-      permissions: ['admin'],
-    },
+  //       {
+  //         path: 'upload',
+  //         name: 'Upload',
+  //         component: () => import('@/views/vab/upload/index'),
+  //         meta: { title: '上传', permissions: ['admin'] },
+  //       },
+  //       {
+  //         path: 'log',
+  //         name: 'Log',
+  //         component: () => import('@/views/vab/errorLog/index'),
+  //         meta: { title: '错误日志模拟', permissions: ['admin'] },
+  //       },
+  //       {
+  //         path: 'https://github.com/chuzhixin/vue-admin-beautiful?utm_source=gold_browser_extension',
+  //         name: 'ExternalLink',
+  //         meta: {
+  //           title: '外链',
+  //           target: '_blank',
+  //           permissions: ['admin', 'editor'],
+  //           badge: 'New',
+  //         },
+  //       },
+  //       {
+  //         path: 'more',
+  //         name: 'More',
+  //         component: () => import('@/views/vab/more/index'),
+  //         meta: { title: '关于', permissions: ['admin'] },
+  //       },
+  //     ],
+  //   },
+  // {
+  //   path: '/personnelManagement',
+  //   component: Layout,
+  //   redirect: 'noRedirect',
+  //   name: 'PersonnelManagement',
+  //   meta: { title: '配置', icon: 'users-cog', permissions: ['admin'] },
+  //   children: [
+  //     {
+  //       path: 'userManagement',
+  //       name: 'UserManagement',
+  //       component: () =>
+  //         import('@/views/personnelManagement/userManagement/index'),
+  //       meta: { title: '用户管理' },
+  //     },
+  //     {
+  //       path: 'roleManagement',
+  //       name: 'RoleManagement',
+  //       component: () =>
+  //         import('@/views/personnelManagement/roleManagement/index'),
+  //       meta: { title: '角色管理' },
+  //     },
+  //     {
+  //       path: 'menuManagement',
+  //       name: 'MenuManagement',
+  //       component: () =>
+  //         import('@/views/personnelManagement/menuManagement/index'),
+  //       meta: { title: '菜单管理', badge: 'New' },
+  //     },
+  //   ],
+  // },
+  // {
+  //   path: '/mall',
+  //   component: Layout,
+  //   redirect: 'noRedirect',
+  //   name: 'Mall',
+  //   meta: {
+  //     title: '商城',
+  //     icon: 'shopping-cart',
+  //     permissions: ['admin'],
+  //   },
 
-    children: [
-      {
-        path: 'pay',
-        name: 'Pay',
-        component: () => import('@/views/mall/pay/index'),
-        meta: {
-          title: '支付',
-          noKeepAlive: true,
-        },
-        children: null,
-      },
-      {
-        path: 'goodsList',
-        name: 'GoodsList',
-        component: () => import('@/views/mall/goodsList/index'),
-        meta: {
-          title: '商品列表',
-        },
-      },
-    ],
-  },
-  {
-    path: '/error',
-    component: EmptyLayout,
-    redirect: 'noRedirect',
-    name: 'Error',
-    meta: { title: '错误页', icon: 'bug' },
-    children: [
-      {
-        path: '401',
-        name: 'Error401',
-        component: () => import('@/views/401'),
-        meta: { title: '401' },
-      },
-      {
-        path: '404',
-        name: 'Error404',
-        component: () => import('@/views/404'),
-        meta: { title: '404' },
-      },
-    ],
-  },
+  //   children: [
+  //     {
+  //       path: 'pay',
+  //       name: 'Pay',
+  //       component: () => import('@/views/mall/pay/index'),
+  //       meta: {
+  //         title: '支付',
+  //         noKeepAlive: true,
+  //       },
+  //       children: null,
+  //     },
+  //     {
+  //       path: 'goodsList',
+  //       name: 'GoodsList',
+  //       component: () => import('@/views/mall/goodsList/index'),
+  //       meta: {
+  //         title: '商品列表',
+  //       },
+  //     },
+  //   ],
+  // },
+  // {
+  //   path: '/error',
+  //   component: EmptyLayout,
+  //   redirect: 'noRedirect',
+  //   name: 'Error',
+  //   meta: { title: '错误页', icon: 'bug' },
+  //   children: [
+  //     {
+  //       path: '401',
+  //       name: 'Error401',
+  //       component: () => import('@/views/401'),
+  //       meta: { title: '401' },
+  //     },
+  //     {
+  //       path: '404',
+  //       name: 'Error404',
+  //       component: () => import('@/views/404'),
+  //       meta: { title: '404' },
+  //     },
+  //   ],
+  // },
   {
     path: '*',
     redirect: '/404',

src/store/modules/user.js

@@ -18,10 +18,12 @@ const state = () => ({
   username: '',
   avatar: '',
   permissions: [],
+  userInfo: JSON.parse(localStorage.getItem('userInfo')),
 })
 const getters = {
   accessToken: (state) => state.accessToken,
   username: (state) => state.username,
+  userInfo: (state) => state.userInfo,
   avatar: (state) => state.avatar,
   permissions: (state) => state.permissions,
 }
@@ -30,6 +32,11 @@ const mutations = {
     state.accessToken = accessToken
     setAccessToken(accessToken)
   },
+
+  setUserInfo(state, userInfo) {
+    state.userInfo = userInfo
+    localStorage.setItem('userInfo', JSON.stringify(userInfo))
+  },
   setUsername(state, username) {
     state.username = username
   },
@@ -45,6 +52,7 @@ const actions = {
     commit('setPermissions', permissions)
   },
   async login({ commit }, userInfo) {
+    commit('setUserInfo', userInfo)
     const { data } = await login(userInfo)
     const accessToken = data[tokenName]
     if (accessToken) {
@@ -93,6 +101,8 @@ const actions = {
   resetAccessToken({ commit }) {
     commit('setPermissions', [])
     commit('setAccessToken', '')
+    commit('setWindpowerstationId', '')
+    localStorage.removeItem('userInfo')
     removeAccessToken()
   },
 }

src/styles/variables.scss

@@ -56,8 +56,8 @@ $base-tag-item-height: 34px;
 $base-menu-item-height: 50px;
 //app-main的高度
 $base-app-main-height: calc(
-  100vh - #{$base-nav-bar-height} - #{$base-tabs-bar-height} - #{$base-padding} -
-    #{$base-padding} - 55px - 55px
+  100vh - #{$base-nav-bar-height} - #{$base-padding} -
+   - 55px
 );
 //纵向布局时左侧导航未折叠时的宽度
 $base-left-menu-width: 256px;

src/utils/request.js

@@ -15,7 +15,8 @@ import store from '@/store'
 import qs from 'qs'
 import router from '@/router'
 import { isArray } from '@/utils/validate'
-
+const service = axios.create()
+service.defaults.baseURL = `${process.env.VUE_APP_API}`
 let loadingInstance
 
 /**
@@ -43,7 +44,7 @@ const handleCode = (code, msg) => {
 }
 
 const instance = axios.create({
-  baseURL,
+  baseURL: `${process.env.VUE_APP_API}`,
   timeout: requestTimeout,
   headers: {
     'Content-Type': contentType,
@@ -52,15 +53,23 @@ const instance = axios.create({
 
 instance.interceptors.request.use(
   (config) => {
+    if (
+      config.url.indexOf('/userInfo') !== -1 ||
+      config.url.indexOf('/logout') !== -1 ||
+      config.url.indexOf('/publicKey') !== -1 ||
+      config.url.indexOf('/login') !== -1
+    ) {
+      config.baseURL = 'vab-mock-server'
+    }
     if (store.getters['user/accessToken']) {
       config.headers[tokenName] = store.getters['user/accessToken']
     }
     //这里会过滤所有为空、0、false的key，如果不需要请自行注释
-    if (config.data)
-      config.data = Vue.prototype.$baseLodash.pickBy(
-        config.data,
-        Vue.prototype.$baseLodash.identity
-      )
+    // if (config.data)
+    //   config.data = Vue.prototype.$baseLodash.pickBy(
+    //     config.data,
+    //     Vue.prototype.$baseLodash.identity
+    //   )
     if (
       config.data &&
       config.headers['Content-Type'] ===

src/views/login/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="login-container">
-    <el-alert
+    <!-- <el-alert
       title="beautiful boys and girls欢迎加入vue-admin-beautifulQQ群：972435319"
       type="success"
       :closable="false"
       style="position: fixed"
-    ></el-alert>
+    ></el-alert> -->
     <el-row>
       <el-col :xs="24" :sm="24" :md="12" :lg="16" :xl="16">
         <div style="color: transparent">占位符</div>
@@ -64,9 +64,9 @@
           >
             登录
           </el-button>
-          <router-link to="/register">
+          <!-- <router-link to="/register">
             <div style="margin-top: 20px">注册</div>
-          </router-link>
+          </router-link> -->
         </el-form>
       </el-col>
     </el-row>
@@ -143,11 +143,11 @@
       document.body.style.overflow = 'auto'
     },
     mounted() {
-      this.form.username = 'admin'
-      this.form.password = '123456'
-      setTimeout(() => {
-        this.handleLogin()
-      }, 3000)
+      //   this.form.username = 'admin'
+      //   this.form.password = '123456'
+      //   setTimeout(() => {
+      //     this.handleLogin()
+      //   }, 3000)
     },
     methods: {
       handlePassword() {
@@ -165,6 +165,7 @@
             this.$store
               .dispatch('user/login', this.form)
               .then(() => {
+                console.log(this.form)
                 const routerPath =
                   this.redirect === '/404' || this.redirect === '/401'
                     ? '/'

src/views/target/components/TableEdit.vue

@@ -0,0 +1,206 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="dialogFormVisible"
+    width="800px"
+    @close="close"
+  >
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form-item label="场站" prop="windpowerstationId">
+        <el-select
+          v-model="form.windpowerstationId"
+          style="width: 200px"
+          placeholder="请选择"
+          clearable
+          :disabled="!idAdd ? true : false"
+        >
+          <el-option
+            v-for="item in wplist"
+            :key="item.nemCode"
+            :label="item.name"
+            :value="item.nemCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="填报日期" prop="recordDate">
+        <el-date-picker
+          v-model="form.recordDate"
+          :disabled="!idAdd ? true : false"
+          style="width: 200px"
+          type="date"
+          placeholder="选择日期时间"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="日发电量" prop="generationDay">
+        <el-input
+          v-model="form.generationDay"
+          style="width: 200px"
+          class="inputs"
+          placeholder="请输入"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="月发电量" prop="generationMonth">
+        <el-input
+          v-model="form.generationMonth"
+          style="width: 200px"
+          class="inputs"
+          placeholder="请输入"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="年发电量" prop="generationYear">
+        <el-input
+          v-model="form.generationYear"
+          style="width: 200px"
+          class="inputs"
+          placeholder="请输入"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="功率负荷" prop="power">
+        <el-input
+          v-model="form.power"
+          style="width: 200px"
+          class="inputs"
+          placeholder="请输入"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="风速/光照" prop="speedOrBeam">
+        <el-input
+          v-model="form.speedOrBeam"
+          style="width: 200px"
+          class="inputs"
+          placeholder="请输入"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="close">取 消</el-button>
+      <el-button type="primary" @click="handleSave()">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { doEdit, doPut } from '@/api/zhibiao.js'
+  import dayjs from 'dayjs'
+  export default {
+    name: 'TableEdit',
+    props: {
+      wplist: {
+        type: Array,
+        default: () => [],
+      },
+      //   options: {
+      //     type: Array,
+      //     default: [],
+      //   },
+      //   standardList: {
+      //     type: Array,
+      //     default: [],
+      //   },
+    },
+    data() {
+      return {
+        form: {
+          windpowerstationId: '',
+          windpowerstationName: '',
+          recordDate: '',
+          generationDay: '',
+          generationMonth: '',
+          generationYear: '',
+          power: '',
+          speedOrBeam: '',
+        },
+        rules: {
+          windpowerstationId: [
+            { required: true, trigger: 'blur', message: '请选择' },
+          ],
+          generationDay: [
+            { required: true, trigger: 'blur', message: '请选择' },
+          ],
+          generationMonth: [
+            { required: true, trigger: 'blur', message: '请输入' },
+          ],
+          generationYear: [
+            { required: true, trigger: 'blur', message: '请输入' },
+          ],
+          power: [{ required: true, trigger: 'blur', message: '请输入' }],
+          recordDate: [{ required: true, trigger: 'blur', message: '请选择' }],
+          speedOrBeam: [{ required: true, trigger: 'blur', message: '请选择' }],
+        },
+        title: '',
+        dialogFormVisible: false,
+        idAdd: true,
+      }
+    },
+    created() {},
+    methods: {
+      setFormItem(wpid, recordDate) {
+        this.form.windpowerstationId = wpid
+        this.form.recordDate = recordDate
+      },
+      openDialog(row) {
+        if (!row) {
+          this.title = '添加'
+          this.idAdd = true
+        } else {
+          this.title = '编辑'
+          this.idAdd = false
+          this.form = Object.assign({}, row)
+          this.form.windpowerstationId = row.windpowerstationId
+        }
+        this.dialogFormVisible = true
+      },
+      close() {
+        this.$refs['form'].resetFields()
+        this.form = this.$options.data().form
+        this.dialogFormVisible = false
+        this.$emit('fetch-data')
+      },
+      handleSave() {
+        this.$refs['form'].validate(async (valid) => {
+          if (valid) {
+            if (this.idAdd) {
+              let wpinfo = this.wplist.find(
+                (item) => item.nemCode == this.form.windpowerstationId
+              )
+              this.form.windpowerstationName = wpinfo.name
+              this.form.recordDate = dayjs(this.form.recordDate).format(
+                'YYYY-MM-DD'
+              )
+              doEdit(this.form).then(({ data: res }) => {
+                if (res.code == 200) {
+                  this.$message({
+                    type: 'success',
+                    message: '添加成功!',
+                  })
+                  this.$emit('handleSuccess')
+                  this.dialogFormVisible = false
+                }
+              })
+            } else {
+              console.log(this.form)
+              doPut(this.form).then(({ data: res }) => {
+                console.log(res)
+                if (res.code == 200) {
+                  this.$message({
+                    type: 'success',
+                    message: '修改成功!',
+                  })
+                  this.$emit('handleSuccess')
+                  this.dialogFormVisible = false
+                }
+              })
+            }
+          } else {
+            return false
+          }
+        })
+      },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+  .inputs {
+    width: 200px;
+  }
+</style>

src/views/target/index.vue

@@ -0,0 +1,363 @@
+<template>
+  <div class="table-container">
+    <div class="title">
+      <div class="left">
+        <div class="left-item">
+          <div class="left-station">
+            <div class="text">场站：</div>
+            <el-select
+              v-model="wpId"
+              style="width: 200px"
+              placeholder="请选择"
+              clearable
+              @change="handleChangeWpid"
+            >
+              <el-option
+                v-for="item in wplist"
+                :key="item.nemCode"
+                :label="item.name"
+                :value="item.nemCode"
+              ></el-option>
+            </el-select>
+          </div>
+          <div class="left-station">
+            <div class="text">日期：</div>
+            <el-date-picker
+              v-model="date"
+              style="width: 200px"
+              type="date"
+              placeholder="选择日期"
+              @change="handleChangeDate"
+            ></el-date-picker>
+          </div>
+        </div>
+        <el-button
+          icon="el-icon-search"
+          type="primary"
+          native-type="submit"
+          @click="handleQuery"
+        >
+          查询
+        </el-button>
+      </div>
+      <div class="right">
+        <el-button icon="el-icon-plus" type="primary" @click="handleAdd">
+          添加
+        </el-button>
+        <el-button icon="el-icon-delete" type="danger" @click="handleDelete">
+          删除
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      ref="tableSort"
+      v-loading="listLoading"
+      :data="list"
+      :element-loading-text="elementLoadingText"
+      :height="height"
+      @selection-change="setSelectRows"
+    >
+      <el-table-column
+        width="65"
+        show-overflow-tooltip
+        type="selection"
+      ></el-table-column>
+      <el-table-column
+        width="200"
+        show-overflow-tooltip
+        label="场站名称"
+        prop="windpowerstationName"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="填报日期"
+        prop="recordDate"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="日发电量(kWh)"
+        prop="generationDay"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="月发电量(kWh)"
+        prop="generationMonth"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="年发电量(kWh)"
+        prop="generationYear"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="功率负荷(kW)"
+        prop="power"
+        align="center"
+        sortable
+      ></el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="风速/光照(m/s / W/m²)"
+        prop="speedOrBeam"
+        align="center"
+        sortable
+      ></el-table-column>
+
+      <el-table-column
+        show-overflow-tooltip
+        label="操作"
+        width="120px"
+        align="center"
+        fixed="right"
+      >
+        <template #default="{ row }">
+          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+          <el-button type="text" @click="handleDelete(row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- <el-pagination
+      :background="background"
+      :current-page="queryForm.pageNo"
+      :layout="layout"
+      :page-size="queryForm.pageSize"
+      :total="total"
+      @current-change="handleCurrentChange"
+      @size-change="handleSizeChange"
+    ></el-pagination> 
+      :options="options"
+      :station-list="stationList"
+      :standard-list="standardList"
+      @handleSuccess="fetchData"-->
+    <table-edit
+      ref="edit"
+      :wplist="wplist"
+      @handleSuccess="fetchData"
+    ></table-edit>
+  </div>
+</template>
+
+<script>
+  import { getList, getWplist, doDelete } from '@/api/zhibiao.js'
+  import { getWpid } from '@/api/user.js'
+  import { mapGetters } from 'vuex'
+  import TableEdit from './components/TableEdit'
+  import dayjs from 'dayjs'
+  export default {
+    name: 'Target',
+    components: {
+      TableEdit,
+    },
+    filters: {
+      statusFilter(status) {
+        const statusMap = {
+          published: 'success',
+          draft: 'gray',
+          deleted: 'danger',
+        }
+        return statusMap[status]
+      },
+    },
+    data() {
+      return {
+        options: [],
+        imgShow: true,
+        list: [],
+        fuzzyQuery: '',
+        cascaderSel: [],
+        selectValue: '',
+        listLoading: true,
+        layout: 'total, sizes, prev, pager, next, jumper',
+        total: 0,
+        background: true,
+        selectRows: '',
+        elementLoadingText: '正在加载...',
+        queryForm: {
+          pageNo: 1,
+          pageSize: 20,
+          title: '',
+        },
+        stationList: [],
+        standardList: [], //指标列表
+        date: '',
+        wpid: '',
+        wpId: '',
+        wplist: [],
+        windpowerstationId: '',
+      }
+    },
+    computed: {
+      height() {
+        return this.$baseTableHeight() + 50
+      },
+      ...mapGetters({
+        userInfo: 'user/userInfo',
+      }),
+    },
+    created() {
+      this.date = dayjs().format('YYYY-MM-DD')
+      this.getWpid()
+    },
+    beforeDestroy() {},
+    mounted() {},
+    methods: {
+      getWpid() {
+        getWpid(this.userInfo).then(({ data }) => {
+          if (Object.keys(data.data)) {
+            this.windpowerstationId = data.data.windpowerstationId
+            if (data.data.windpowerstationId == 0) {
+              this.wpId = '0'
+            } else {
+              this.wpId = data.data.windpowerstationId
+            }
+            this.wpid = data.data.windpowerstationId
+            this.fetchData()
+            this.getWplist()
+          }
+        })
+      },
+      fetchData() {
+        this.listLoading = true
+        getList({
+          date: this.date,
+          wpid: this.wpid,
+        }).then(({ data: res }) => {
+          if (res.data) {
+            this.list = res.data.map((item) => {
+              return {
+                ...item,
+                recordDate: dayjs(item.recordDate).format('YYYY-MM-DD'),
+              }
+            })
+            setTimeout(() => {
+              this.listLoading = false
+            }, 500)
+          }
+        })
+      },
+      getWplist() {
+        getWplist({ wpid: this.wpid }).then(({ data: res }) => {
+          if (this.wpid == 0) {
+            this.wplist = [
+              {
+                name: '全部',
+                nemCode: '0',
+              },
+              ...res.data,
+            ]
+          } else {
+            this.wplist = res.data
+          }
+        })
+      },
+      handleChangeWpid(val) {
+        if (!val) {
+          this.windpowerstationId == 0
+            ? ((this.wpid = 0), (this.wpId = '0'))
+            : ((this.wpid = this.windpowerstationId),
+              (this.wpId = this.windpowerstationId))
+        } else {
+          this.wpid = val
+        }
+        // this.fetchData()
+      },
+      handleChangeDate(val) {
+        if (!val) {
+          this.date = dayjs().format('YYYY-MM-DD')
+        } else {
+          this.date = dayjs(val).format('YYYY-MM-DD')
+        }
+
+        // this.fetchData()
+      },
+      setSelectRows(val) {
+        this.selectRows = val
+      },
+      handleAdd() {
+        if (this.wpId && this.date) {
+          this.$refs['edit'].setFormItem(this.wpid, this.date)
+          this.$refs['edit'].openDialog()
+        } else {
+          this.$refs['edit'].openDialog()
+        }
+      },
+      handleEdit(row) {
+        this.$refs['edit'].openDialog(row)
+      },
+      handleDelete(row) {
+        if (row.id || this.selectRows.length > 0) {
+          this.$baseConfirm('你确定要删除吗', null, async () => {
+            let ids = ''
+            if (this.selectRows.length > 0) {
+              ids = this.selectRows.map((item) => item.id).join()
+            }
+            doDelete({
+              id: row.id || ids,
+            }).then((res) => {
+              if (res.data) {
+                this.$baseMessage('删除成功', 'success')
+                this.fetchData()
+              }
+            })
+          })
+        } else {
+          this.$baseMessage('未选中任何行', 'error')
+          return false
+        }
+      },
+      handleSizeChange(val) {
+        this.queryForm.pageSize = val
+        this.fetchData()
+      },
+      handleCurrentChange(val) {
+        this.queryForm.pageNo = val
+        this.fetchData()
+      },
+      handleQuery() {
+        this.fetchData()
+      },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+  .title {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 15px;
+  }
+
+  .left {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    .left-item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      margin-right: 10px;
+    }
+    .left-station {
+      display: flex;
+      align-items: center;
+
+      margin-right: 15px;
+    }
+  }
+
+  .cascaders {
+    width: 300px;
+  }
+</style>