diff --git a/src/api/project/attendanceConfig.js b/src/api/project/attendanceConfig.js
index 4931d49..7d5caae 100644
--- a/src/api/project/attendanceConfig.js
+++ b/src/api/project/attendanceConfig.js
@@ -3,8 +3,8 @@ import request from '@/utils/request'
// 查询项目考勤配置列表
export function listAttendanceConfig(query) {
return request({
- url: '/project/attendanceConfig/list',
- method: 'get',
+ url: '/system/attendanceCfg/list',
+ method: 'post',
params: query
})
}
@@ -12,7 +12,7 @@ export function listAttendanceConfig(query) {
// 查询项目考勤配置详细
export function getAttendanceConfig(id) {
return request({
- url: '/project/attendanceConfig/' + id,
+ url: '/system/attendanceCfg/' + id,
method: 'get'
})
}
diff --git a/src/api/project/surProject.js b/src/api/project/surProject.js
index dbfd7e4..227c854 100644
--- a/src/api/project/surProject.js
+++ b/src/api/project/surProject.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
// 查询项目管理列表
export function listSurProject(query) {
return request({
- url: '/project/surProject/list',
+ url: '/system/project/list',
method: 'get',
params: query
})
diff --git a/src/router/index.js b/src/router/index.js
index d687f5e..442c175 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -30,6 +30,10 @@ import Layout from '@/layout'
// 公共路由
export const constantRoutes = [
+ {
+ path: '/index',
+ component: () => import('@/views/index1.vue'),
+ },
{
path: '/attendanceCfg',
component: () => import('@/views/project/attendanceConfig/index.vue'),
@@ -72,16 +76,7 @@ export const constantRoutes = [
},
{
path: '',
- component: Layout,
- redirect: 'index',
- children: [
- {
- path: 'index',
- component: () => import('@/views/index'),
- name: 'Index',
- meta: { title: '首页', icon: 'dashboard', affix: true }
- }
- ]
+ component: () => import('@/views/index_v1'),
},
{
path: '/user',
diff --git a/src/views/index1.vue b/src/views/index1.vue
new file mode 100644
index 0000000..6bd71d7
--- /dev/null
+++ b/src/views/index1.vue
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
diff --git a/src/views/project/attendanceConfig/attendanceConfigDialog.vue b/src/views/project/attendanceConfig/attendanceConfigDialog.vue
index e4293bf..36ba8d5 100644
--- a/src/views/project/attendanceConfig/attendanceConfigDialog.vue
+++ b/src/views/project/attendanceConfig/attendanceConfigDialog.vue
@@ -11,14 +11,7 @@
{{ form.projectName }}
-
-
-
-
-
- {{ form.unitName }}
-
+
@@ -95,7 +88,7 @@ export default {
// 表单参数
form: {
projectId: '',
- subDeptId: '',
+ subDeptId: '1',
appId: '',
secret: '',
vendorsCode:'gld',
@@ -233,7 +226,7 @@ export default {
this.form = {
id: null,
projectId: '',
- subDeptId: '',
+ subDeptId: '1',
appId: '',
secret: '',
vendorsCode:'gld',
diff --git a/src/views/project/attendanceConfig/index.vue b/src/views/project/attendanceConfig/index.vue
index 8302ad8..5875ec6 100644
--- a/src/views/project/attendanceConfig/index.vue
+++ b/src/views/project/attendanceConfig/index.vue
@@ -6,14 +6,7 @@
-
-
-
-
-
-
-
-
+
搜索
重置
@@ -44,7 +37,6 @@
-
@@ -53,9 +45,9 @@
修改
+ >修改
删除
+ >删除
@@ -70,6 +62,7 @@