diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue index 419d14d..2344541 100644 --- a/src/components/DeptSelect/index.vue +++ b/src/components/DeptSelect/index.vue @@ -176,7 +176,7 @@ class="full-width-input" /> - + diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue index 419d14d..2344541 100644 --- a/src/components/DeptSelect/index.vue +++ b/src/components/DeptSelect/index.vue @@ -176,7 +176,7 @@ class="full-width-input" /> - + diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index d0a46f3..8326149 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -117,6 +117,6 @@ diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue index 419d14d..2344541 100644 --- a/src/components/DeptSelect/index.vue +++ b/src/components/DeptSelect/index.vue @@ -176,7 +176,7 @@ class="full-width-input" /> - + diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index d0a46f3..8326149 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -117,6 +117,6 @@ diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index d87651b..031e444 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -35,6 +35,7 @@ .button-area { display: flex; justify-content: space-between; + margin-bottom: 10px; .button-left { display: flex; diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue index 419d14d..2344541 100644 --- a/src/components/DeptSelect/index.vue +++ b/src/components/DeptSelect/index.vue @@ -176,7 +176,7 @@ class="full-width-input" /> - + diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index d0a46f3..8326149 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -117,6 +117,6 @@ diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index d87651b..031e444 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -35,6 +35,7 @@ .button-area { display: flex; justify-content: space-between; + margin-bottom: 10px; .button-left { display: flex; diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue index 419d14d..2344541 100644 --- a/src/components/DeptSelect/index.vue +++ b/src/components/DeptSelect/index.vue @@ -176,7 +176,7 @@ class="full-width-input" /> - + diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index d0a46f3..8326149 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -117,6 +117,6 @@ diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index d87651b..031e444 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -35,6 +35,7 @@ .button-area { display: flex; justify-content: space-between; + margin-bottom: 10px; .button-left { display: flex; diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue index 419d14d..2344541 100644 --- a/src/components/DeptSelect/index.vue +++ b/src/components/DeptSelect/index.vue @@ -176,7 +176,7 @@ class="full-width-input" /> - + diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index d0a46f3..8326149 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -117,6 +117,6 @@ diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index d87651b..031e444 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -35,6 +35,7 @@ .button-area { display: flex; justify-content: space-between; + margin-bottom: 10px; .button-left { display: flex; diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue index 419d14d..2344541 100644 --- a/src/components/DeptSelect/index.vue +++ b/src/components/DeptSelect/index.vue @@ -176,7 +176,7 @@ class="full-width-input" /> - + diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index d0a46f3..8326149 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -117,6 +117,6 @@ diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index d87651b..031e444 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -35,6 +35,7 @@ .button-area { display: flex; justify-content: space-between; + margin-bottom: 10px; .button-left { display: flex; diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue index 419d14d..2344541 100644 --- a/src/components/DeptSelect/index.vue +++ b/src/components/DeptSelect/index.vue @@ -176,7 +176,7 @@ class="full-width-input" /> - + diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index d0a46f3..8326149 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -117,6 +117,6 @@ diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index d87651b..031e444 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -35,6 +35,7 @@ .button-area { display: flex; justify-content: space-between; + margin-bottom: 10px; .button-left { display: flex; diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue index 419d14d..2344541 100644 --- a/src/components/DeptSelect/index.vue +++ b/src/components/DeptSelect/index.vue @@ -176,7 +176,7 @@ class="full-width-input" /> - + diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index d0a46f3..8326149 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -117,6 +117,6 @@ diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index d87651b..031e444 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -35,6 +35,7 @@ .button-area { display: flex; justify-content: space-between; + margin-bottom: 10px; .button-left { display: flex; diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue index 419d14d..2344541 100644 --- a/src/components/DeptSelect/index.vue +++ b/src/components/DeptSelect/index.vue @@ -176,7 +176,7 @@ class="full-width-input" /> - + diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index d0a46f3..8326149 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -117,6 +117,6 @@ diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index d87651b..031e444 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -35,6 +35,7 @@ .button-area { display: flex; justify-content: space-between; + margin-bottom: 10px; .button-left { display: flex; diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ - - - - diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue index 419d14d..2344541 100644 --- a/src/components/DeptSelect/index.vue +++ b/src/components/DeptSelect/index.vue @@ -176,7 +176,7 @@ class="full-width-input" /> - + diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index d0a46f3..8326149 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -117,6 +117,6 @@ diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index d87651b..031e444 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -35,6 +35,7 @@ .button-area { display: flex; justify-content: space-between; + margin-bottom: 10px; .button-left { display: flex; diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ - - - - diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue new file mode 100644 index 0000000..f59d49f --- /dev/null +++ b/src/views/system/notice/noteList.vue @@ -0,0 +1,178 @@ + + + + + + diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue index 419d14d..2344541 100644 --- a/src/components/DeptSelect/index.vue +++ b/src/components/DeptSelect/index.vue @@ -176,7 +176,7 @@ class="full-width-input" /> - + diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index d0a46f3..8326149 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -117,6 +117,6 @@ diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index d87651b..031e444 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -35,6 +35,7 @@ .button-area { display: flex; justify-content: space-between; + margin-bottom: 10px; .button-left { display: flex; diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ - - - - diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue new file mode 100644 index 0000000..f59d49f --- /dev/null +++ b/src/views/system/notice/noteList.vue @@ -0,0 +1,178 @@ + + + + + + diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts new file mode 100644 index 0000000..a1fc349 --- /dev/null +++ b/src/views/system/notice/notice-interface.ts @@ -0,0 +1,12 @@ +// 通知公告信息类型 +export interface noticeType { + id: number // 主键id（列表接口参数） + minioFileName: string // 上传文件返回名称 string + noticeCompany: string // 发布单位 string + noticeContent: string // 发布内容 string + noticeNo: string // 通知公告编号 string + noticePublisher: string // 发布人 string + noticeSketch: string // 内容简述 string + noticeTime: string // 发布时间 string + noticeTitle: string // 通知公告标题 string +} diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue index 419d14d..2344541 100644 --- a/src/components/DeptSelect/index.vue +++ b/src/components/DeptSelect/index.vue @@ -176,7 +176,7 @@ class="full-width-input" /> - + diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index d0a46f3..8326149 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -117,6 +117,6 @@ diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index d87651b..031e444 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -35,6 +35,7 @@ .button-area { display: flex; justify-content: space-between; + margin-bottom: 10px; .button-left { display: flex; diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ - - - - diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue new file mode 100644 index 0000000..f59d49f --- /dev/null +++ b/src/views/system/notice/noteList.vue @@ -0,0 +1,178 @@ + + + + + + diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts new file mode 100644 index 0000000..a1fc349 --- /dev/null +++ b/src/views/system/notice/notice-interface.ts @@ -0,0 +1,12 @@ +// 通知公告信息类型 +export interface noticeType { + id: number // 主键id（列表接口参数） + minioFileName: string // 上传文件返回名称 string + noticeCompany: string // 发布单位 string + noticeContent: string // 发布内容 string + noticeNo: string // 通知公告编号 string + noticePublisher: string // 发布人 string + noticeSketch: string // 内容简述 string + noticeTime: string // 发布时间 string + noticeTitle: string // 通知公告标题 string +} diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue index ba48d0c..748edc6 100644 --- a/src/views/system/notice/noticeDetail.vue +++ b/src/views/system/notice/noticeDetail.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ - - - - diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue new file mode 100644 index 0000000..f59d49f --- /dev/null +++ b/src/views/system/notice/noteList.vue @@ -0,0 +1,178 @@ + + + + + + diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts new file mode 100644 index 0000000..a1fc349 --- /dev/null +++ b/src/views/system/notice/notice-interface.ts @@ -0,0 +1,12 @@ +// 通知公告信息类型 +export interface noticeType { + id: number // 主键id（列表接口参数） + minioFileName: string // 上传文件返回名称 string + noticeCompany: string // 发布单位 string + noticeContent: string // 发布内容 string + noticeNo: string // 通知公告编号 string + noticePublisher: string // 发布人 string + noticeSketch: string // 内容简述 string + noticeTime: string // 发布时间 string + noticeTitle: string // 通知公告标题 string +} diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue index ba48d0c..748edc6 100644 --- a/src/views/system/notice/noticeDetail.vue +++ b/src/views/system/notice/noticeDetail.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ - - - - diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue new file mode 100644 index 0000000..f59d49f --- /dev/null +++ b/src/views/system/notice/noteList.vue @@ -0,0 +1,178 @@ + + + + + + diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts new file mode 100644 index 0000000..a1fc349 --- /dev/null +++ b/src/views/system/notice/notice-interface.ts @@ -0,0 +1,12 @@ +// 通知公告信息类型 +export interface noticeType { + id: number // 主键id（列表接口参数） + minioFileName: string // 上传文件返回名称 string + noticeCompany: string // 发布单位 string + noticeContent: string // 发布内容 string + noticeNo: string // 通知公告编号 string + noticePublisher: string // 发布人 string + noticeSketch: string // 内容简述 string + noticeTime: string // 发布时间 string + noticeTitle: string // 通知公告标题 string +} diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue index ba48d0c..748edc6 100644 --- a/src/views/system/notice/noticeDetail.vue +++ b/src/views/system/notice/noticeDetail.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ - - - - diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue new file mode 100644 index 0000000..f59d49f --- /dev/null +++ b/src/views/system/notice/noteList.vue @@ -0,0 +1,178 @@ + + + + + + diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts new file mode 100644 index 0000000..a1fc349 --- /dev/null +++ b/src/views/system/notice/notice-interface.ts @@ -0,0 +1,12 @@ +// 通知公告信息类型 +export interface noticeType { + id: number // 主键id（列表接口参数） + minioFileName: string // 上传文件返回名称 string + noticeCompany: string // 发布单位 string + noticeContent: string // 发布内容 string + noticeNo: string // 通知公告编号 string + noticePublisher: string // 发布人 string + noticeSketch: string // 内容简述 string + noticeTime: string // 发布时间 string + noticeTitle: string // 通知公告标题 string +} diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue index ba48d0c..748edc6 100644 --- a/src/views/system/notice/noticeDetail.vue +++ b/src/views/system/notice/noticeDetail.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ - - - - diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue new file mode 100644 index 0000000..f59d49f --- /dev/null +++ b/src/views/system/notice/noteList.vue @@ -0,0 +1,178 @@ + + + + + + diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts new file mode 100644 index 0000000..a1fc349 --- /dev/null +++ b/src/views/system/notice/notice-interface.ts @@ -0,0 +1,12 @@ +// 通知公告信息类型 +export interface noticeType { + id: number // 主键id（列表接口参数） + minioFileName: string // 上传文件返回名称 string + noticeCompany: string // 发布单位 string + noticeContent: string // 发布内容 string + noticeNo: string // 通知公告编号 string + noticePublisher: string // 发布人 string + noticeSketch: string // 内容简述 string + noticeTime: string // 发布时间 string + noticeTitle: string // 通知公告标题 string +} diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue index ba48d0c..748edc6 100644 --- a/src/views/system/notice/noticeDetail.vue +++ b/src/views/system/notice/noticeDetail.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ - - - - diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue new file mode 100644 index 0000000..f59d49f --- /dev/null +++ b/src/views/system/notice/noteList.vue @@ -0,0 +1,178 @@ + + + + + + diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts new file mode 100644 index 0000000..a1fc349 --- /dev/null +++ b/src/views/system/notice/notice-interface.ts @@ -0,0 +1,12 @@ +// 通知公告信息类型 +export interface noticeType { + id: number // 主键id（列表接口参数） + minioFileName: string // 上传文件返回名称 string + noticeCompany: string // 发布单位 string + noticeContent: string // 发布内容 string + noticeNo: string // 通知公告编号 string + noticePublisher: string // 发布人 string + noticeSketch: string // 内容简述 string + noticeTime: string // 发布时间 string + noticeTitle: string // 通知公告标题 string +} diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue index ba48d0c..748edc6 100644 --- a/src/views/system/notice/noticeDetail.vue +++ b/src/views/system/notice/noticeDetail.vue @@ -1,6 +1,6 @@ + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ - - - - diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue new file mode 100644 index 0000000..f59d49f --- /dev/null +++ b/src/views/system/notice/noteList.vue @@ -0,0 +1,178 @@ + + + + + + diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts new file mode 100644 index 0000000..a1fc349 --- /dev/null +++ b/src/views/system/notice/notice-interface.ts @@ -0,0 +1,12 @@ +// 通知公告信息类型 +export interface noticeType { + id: number // 主键id（列表接口参数） + minioFileName: string // 上传文件返回名称 string + noticeCompany: string // 发布单位 string + noticeContent: string // 发布内容 string + noticeNo: string // 通知公告编号 string + noticePublisher: string // 发布人 string + noticeSketch: string // 内容简述 string + noticeTime: string // 发布时间 string + noticeTitle: string // 通知公告标题 string +} diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue index ba48d0c..748edc6 100644 --- a/src/views/system/notice/noticeDetail.vue +++ b/src/views/system/notice/noticeDetail.vue @@ -1,6 +1,6 @@ + + + + diff --git a/plop-templates/page/prompt.js b/plop-templates/page/prompt.js index 1de9011..26c2d38 100644 --- a/plop-templates/page/prompt.js +++ b/plop-templates/page/prompt.js @@ -42,7 +42,7 @@ const actions = [ { type: 'add', - path: `${data.path}/{{dotCase name}}.vue`, + path: `${data.path}/{{camelCase name}}.vue`, templateFile: 'plop-templates/page/index.hbs', data: { componentName: `${relativePath} ${data.name}`, diff --git a/src/api/system/area.ts b/src/api/system/area.ts index 8b4e5a8..682162d 100644 --- a/src/api/system/area.ts +++ b/src/api/system/area.ts @@ -2,7 +2,7 @@ * 区域管理接口 */ import request from '../index' -const prefix = 'sys' +const prefix = 'ext' // 区域查询 export function getAreaListPage(params: object) { @@ -45,7 +45,7 @@ // 区域类型查询 export function getAreaType() { return request({ - url: `${prefix}/dict/code/levelType`, + url: 'sys/dict/code/levelType', method: 'get', }) } diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts index 48f386e..06e3178 100644 --- a/src/api/system/dept.ts +++ b/src/api/system/dept.ts @@ -64,3 +64,11 @@ }, }) } + +// 资源类型列表 +export function getDeptTypeList() { + return request({ + url: `${prefix}/dict/code/deptType`, + method: 'get', + }) +} diff --git a/src/api/system/source.ts b/src/api/system/source.ts new file mode 100644 index 0000000..e0fabe7 --- /dev/null +++ b/src/api/system/source.ts @@ -0,0 +1,23 @@ +/** + * 溯源供方请求接口 + */ +import request from '../index' +const prefix = '/meter' + +// 列表查询 +export function getSoucreList(data: object) { + return request({ + url: `${prefix}/supplier/list`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getSoucreListDelete(data: object) { + return request({ + url: `${prefix}/supplier/delete`, + method: 'post', + data, + }) +} diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts new file mode 100644 index 0000000..c50a242 --- /dev/null +++ b/src/api/system/tool.ts @@ -0,0 +1,59 @@ +import request from '../index' +const prefix = 'system/' + +// 签名/签章新增 +export function addApi(data: object) { + return request({ + url: `${prefix}sign/add`, + method: 'post', + data, + }) +} +// 签名/签章批量删除 +export function batchDelete(data: { ids: string[] }) { + return request({ + url: `${prefix}sign/batchDelete`, + method: 'post', + data, + }) +} +// 签名/签章删除 +export function deleteApi(data: { id: string }) { + return request({ + url: `${prefix}sign/delete`, + method: 'post', + data, + }) +} +// 签名/签章列表 +export function listApi(data: object) { + return request({ + url: `${prefix}sign/list`, + method: 'post', + data, + }) +} +// 签名/签章导出 +export function exportApi(data: object) { + return request({ + url: `${prefix}sign/listExport`, + method: 'post', + data, + }) +} +// 签名/签章列表/详情（分页） +export function listPageApi(data: object) { + return request({ + url: `${prefix}sign/listPage`, + method: 'post', + data, + }) +} +// 签名/签章更新 +export function updateApi(data: object) { + return request({ + url: `${prefix}sign/update`, + method: 'post', + data, + }) +} diff --git a/src/assets/styles/element-plus/index.scss b/src/assets/styles/element-plus/index.scss index 79a85dc..3b53223 100644 --- a/src/assets/styles/element-plus/index.scss +++ b/src/assets/styles/element-plus/index.scss @@ -3,6 +3,10 @@ "primary": ( "base": #4384ff ) + ), + $table:( + "header-bg-color":#f2f6ff, + "header-text-color":#444c59 ) ); @use "element-plus/theme-chalk/src/index.scss" as *; diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index a7b0974..4565a0f 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -58,10 +58,10 @@ // 右侧内容区针对fixed元素，有横向铺满的需求，可在fixed元素上设置 [data-fixed-calc-width] [data-fixed-calc-width] { position: fixed; - left: 50%; + left: var(--g-main-sidebar-actual-width) + var(--g-sub-sidebar-actual-width); right: 0; width: calc(100% - var(--g-main-sidebar-actual-width) - var(--g-sub-sidebar-actual-width)); - transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); + // transform: translateX(-50%) translateX(calc(var(--g-main-sidebar-actual-width) / 2)) translateX(calc(var(--g-sub-sidebar-actual-width) / 2)); } [data-mode="mobile"] { diff --git a/src/components/DeptSelect/index.vue b/src/components/DeptSelect/index.vue index 419d14d..2344541 100644 --- a/src/components/DeptSelect/index.vue +++ b/src/components/DeptSelect/index.vue @@ -176,7 +176,7 @@ class="full-width-input" /> - + diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index d0a46f3..8326149 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -117,6 +117,6 @@ diff --git a/src/components/TableContainer/index.vue b/src/components/TableContainer/index.vue index d87651b..031e444 100644 --- a/src/components/TableContainer/index.vue +++ b/src/components/TableContainer/index.vue @@ -35,6 +35,7 @@ .button-area { display: flex; justify-content: space-between; + margin-bottom: 10px; .button-left { display: flex; diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts index 1a4b535..113d712 100644 --- a/src/router/modules/system.ts +++ b/src/router/modules/system.ts @@ -113,7 +113,7 @@ { path: 'list', name: 'UserList', - component: () => import('@/views/system/user/list.user.vue'), + component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', auth: '/sys/mgr', diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts index c41731e..7de3b8b 100644 --- a/src/store/modules/dict.ts +++ b/src/store/modules/dict.ts @@ -1,4 +1,4 @@ -import type { DeptTreeNode } from '@/views/system/dept/dept_interface' +import type { DeptTreeNode } from '@/views/system/dept/dept-interface' const useDictStore = defineStore( 'dict', diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue index 2fcdf5d..8efe918 100644 --- a/src/views/measure/source/approve.vue +++ b/src/views/measure/source/approve.vue @@ -1,3 +1,4 @@ + diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue index e966fb8..cad751e 100644 --- a/src/views/measure/source/list.vue +++ b/src/views/measure/source/list.vue @@ -1,3 +1,182 @@ + + + + diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue new file mode 100644 index 0000000..609ba57 --- /dev/null +++ b/src/views/measure/source/listAdd.vue @@ -0,0 +1,233 @@ + + + + + diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts new file mode 100644 index 0000000..cebfa79 --- /dev/null +++ b/src/views/measure/source/list_interface.ts @@ -0,0 +1,15 @@ +export interface IlistQuery { + businessContent: string + supplierName: string + supplierNo: string + logType?: string + offset: number + limit: number +} + +export interface IformInline { + businessContent: string + supplierName: string + supplierNo: string +} + diff --git a/src/views/system/area/areaSelectTree.vue b/src/views/system/area/areaSelectTree.vue index 43e73d7..190617e 100644 --- a/src/views/system/area/areaSelectTree.vue +++ b/src/views/system/area/areaSelectTree.vue @@ -1,6 +1,6 @@ - - - - diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue new file mode 100644 index 0000000..f59d49f --- /dev/null +++ b/src/views/system/notice/noteList.vue @@ -0,0 +1,178 @@ + + + + + + diff --git a/src/views/system/notice/notice-interface.ts b/src/views/system/notice/notice-interface.ts new file mode 100644 index 0000000..a1fc349 --- /dev/null +++ b/src/views/system/notice/notice-interface.ts @@ -0,0 +1,12 @@ +// 通知公告信息类型 +export interface noticeType { + id: number // 主键id（列表接口参数） + minioFileName: string // 上传文件返回名称 string + noticeCompany: string // 发布单位 string + noticeContent: string // 发布内容 string + noticeNo: string // 通知公告编号 string + noticePublisher: string // 发布人 string + noticeSketch: string // 内容简述 string + noticeTime: string // 发布时间 string + noticeTitle: string // 通知公告标题 string +} diff --git a/src/views/system/notice/noticeDetail.vue b/src/views/system/notice/noticeDetail.vue index ba48d0c..748edc6 100644 --- a/src/views/system/notice/noticeDetail.vue +++ b/src/views/system/notice/noticeDetail.vue @@ -1,6 +1,6 @@ + + + + diff --git a/src/views/system/tool/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue index f7b262f..ee76513 100644 --- a/src/views/system/tool/autograph/autograph.vue +++ b/src/views/system/tool/autograph/autograph.vue @@ -1,19 +1,50 @@