自动登录

src/permission.js

@@ -11,7 +11,7 @@ import usePermissionStore from '@/store/modules/permission'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login', '/register']
+const whiteList = ['/login', '/register','/sso']
 
 const isWhiteList = (path) => {
   return whiteList.some(pattern => isPathMatch(pattern, path))

src/router/index.js

@@ -43,6 +43,11 @@ export const constantRoutes = [
     hidden: true
   },
   {
+    path: '/sso',
+    component: () => import('@/views/sso'),
+    hidden: true
+  },
+  {
     path: '/register',
     component: () => import('@/views/register'),
     hidden: true

src/views/sso.vue

@@ -0,0 +1,42 @@
+<template>
+</template>
+
+<script setup>
+import useUserStore from '@/store/modules/user'
+
+const userStore = useUserStore()
+const route = useRoute();
+const router = useRouter();
+const {proxy} = getCurrentInstance();
+
+const loginForm = ref({
+  username: "guest",
+  password: "123456",
+  rememberMe: false,
+  code: "",
+  uuid: ""
+});
+
+const redirect = ref(undefined);
+
+watch(route, (newRoute) => {
+  redirect.value = newRoute.query && newRoute.query.redirect;
+}, {immediate: true});
+
+function handleLogin() {
+  // 调用action的登录方法
+  userStore.login(loginForm.value).then(() => {
+    const query = route.query;
+    const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
+      if (cur !== "redirect") {
+        acc[cur] = query[cur];
+      }
+      return acc;
+    }, {});
+    router.push({path: redirect.value || "/", query: otherQueryParams});
+  }).catch(() => {
+  });
+}
+
+handleLogin();
+</script>

src/views/ws/calc/index.vue

@@ -3,34 +3,18 @@
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="日期" prop="dataDate">
         <el-date-picker clearable
-          v-model="queryParams.dataDate"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择日期">
+                        v-model="queryParams.dataDate"
+                        type="date"
+                        value-format="YYYY-MM-DD"
+                        placeholder="请选择日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="车间ID" prop="wsId">
         <el-input
-          v-model="queryParams.wsId"
-          placeholder="请输入车间ID"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="A班统计" prop="aValue">
-        <el-input
-          v-model="queryParams.aValue"
-          placeholder="请输入A班统计"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="B班统计" prop="bValue">
-        <el-input
-          v-model="queryParams.bValue"
-          placeholder="请输入B班统计"
-          clearable
-          @keyup.enter="handleQuery"
+            v-model="queryParams.wsId"
+            placeholder="请输入车间ID"
+            clearable
+            @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item>
@@ -42,40 +26,40 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['ws:calc:add']"
+            type="primary"
+            plain
+            icon="Plus"
+            @click="handleAdd"
+            v-hasPermi="['ws:calc:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['ws:calc:edit']"
+            type="success"
+            plain
+            icon="Edit"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['ws:calc:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['ws:calc:remove']"
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+            v-hasPermi="['ws:calc:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['ws:calc:export']"
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExport"
+            v-hasPermi="['ws:calc:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -90,6 +74,10 @@
         </template>
       </el-table-column>
       <el-table-column label="车间ID" align="center" prop="wsId" />
+      <el-table-column label="总价格" align="center" prop="totalPrice" />
+      <el-table-column label="A班价格" align="center" prop="aPrice" />
+      <el-table-column label="B班价格" align="center" prop="bPrice" />
+      <el-table-column label="总计" align="center" prop="totalValue" />
       <el-table-column label="A班统计" align="center" prop="aValue" />
       <el-table-column label="B班统计" align="center" prop="bValue" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -99,13 +87,13 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total>0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
     />
 
     <!-- 添加或修改能源统计对话框 -->
@@ -113,15 +101,27 @@
       <el-form ref="calcRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="日期" prop="dataDate">
           <el-date-picker clearable
-            v-model="form.dataDate"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="请选择日期">
+                          v-model="form.dataDate"
+                          type="date"
+                          value-format="YYYY-MM-DD"
+                          placeholder="请选择日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="车间ID" prop="wsId">
           <el-input v-model="form.wsId" placeholder="请输入车间ID" />
         </el-form-item>
+        <el-form-item label="总价格" prop="totalPrice">
+          <el-input v-model="form.totalPrice" placeholder="请输入总价格" />
+        </el-form-item>
+        <el-form-item label="A班价格" prop="aPrice">
+          <el-input v-model="form.aPrice" placeholder="请输入A班价格" />
+        </el-form-item>
+        <el-form-item label="B班价格" prop="bPrice">
+          <el-input v-model="form.bPrice" placeholder="请输入B班价格" />
+        </el-form-item>
+        <el-form-item label="总计" prop="totalValue">
+          <el-input v-model="form.totalValue" placeholder="请输入总计" />
+        </el-form-item>
         <el-form-item label="A班统计" prop="aValue">
           <el-input v-model="form.aValue" placeholder="请输入A班统计" />
         </el-form-item>
@@ -161,6 +161,10 @@ const data = reactive({
     pageSize: 10,
     dataDate: null,
     wsId: null,
+    totalPrice: null,
+    aPrice: null,
+    bPrice: null,
+    totalValue: null,
     aValue: null,
     bValue: null
   },
@@ -192,6 +196,10 @@ function reset() {
     calcId: null,
     dataDate: null,
     wsId: null,
+    totalPrice: null,
+    aPrice: null,
+    bPrice: null,
+    totalValue: null,
     aValue: null,
     bValue: null
   };