diff --git a/src/api/home/alarm/index.js b/src/api/home/alarm/index.js index 03ac4bf..4ec9d2a 100644 --- a/src/api/home/alarm/index.js +++ b/src/api/home/alarm/index.js @@ -9,6 +9,14 @@ export function info(params) { }) } +export function FetchYpGetSite(params) { + return request({ + url: 'api/alarm/ypGetSite', + params, + method: 'get' + }) +} + // getDataForIP export function FetchDataForIP(params) { return request({ @@ -18,4 +26,4 @@ export function FetchDataForIP(params) { }) } -export default { info, FetchDataForIP } +export default { info, FetchDataForIP, FetchYpGetSite } diff --git a/src/assets/icons/svg/jiaquan.svg b/src/assets/icons/svg/jiaquan.svg new file mode 100644 index 0000000..1b68ee7 --- /dev/null +++ b/src/assets/icons/svg/jiaquan.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/kongqi.svg b/src/assets/icons/svg/kongqi.svg new file mode 100644 index 0000000..581b4cc --- /dev/null +++ b/src/assets/icons/svg/kongqi.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 17d67f9..5d15f72 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,7 +9,7 @@ import { filterAsyncRouter } from '@/store/modules/permission' NProgress.configure({ showSpinner: false })// NProgress Configuration -const whiteList = ['/login', '/environmentalScreen']// no redirect whitelist +const whiteList = ['/login', '/envScreen']// no redirect whitelist router.beforeEach((to, from, next) => { if (to.meta.title) { diff --git a/src/router/routers.js b/src/router/routers.js index 2fc6c48..10d70b0 100644 --- a/src/router/routers.js +++ b/src/router/routers.js @@ -59,7 +59,7 @@ export const constantRouterMap = [ ] }, { - path: '/environmentalScreen', + path: '/envScreen', component: (resolve) => require(['@/views/environmentalScreen/index'], resolve), hidden: true } diff --git a/src/views/archivesManage/caseManage/caseList/index.vue b/src/views/archivesManage/caseManage/caseList/index.vue index 14c14d5..9931b95 100644 --- a/src/views/archivesManage/caseManage/caseList/index.vue +++ b/src/views/archivesManage/caseManage/caseList/index.vue @@ -285,13 +285,24 @@ export default { { lsfFileVar: { varname: 'barcode', // 模板中的条形码变量名，需和打印模板一致 - varvalue: '编号：' + item.barcode + // varvalue: '编号：' + item.barcode + // varvalue: '编号\r\n1字第0000001号' + varvalue: '15字第000000001号' } }, { lsfFileVar: { varname: 'title', - varvalue: '姓名：' + item.title + // varvalue: '姓名：' + item.title + // varvalue: '姓名\r\n李军' + varvalue: '李军' + } + }, + { + lsfFileVar: { + varname: 'nativePlace', + // varvalue: '籍贯\r\n北京' + varvalue: '湖北武汉' } } ] diff --git a/src/views/components/WarehouseWarning.vue b/src/views/components/WarehouseWarning.vue index 991d0f6..ceb5ed7 100644 --- a/src/views/components/WarehouseWarning.vue +++ b/src/views/components/WarehouseWarning.vue @@ -142,6 +142,8 @@ export default { alarmApi.info({ storeroomId: this.storeroomId }).then((data) => { if (data && data.length > 0) { this.tableData.splice(0, data.length, ...data) + } else { + this.tableData = [] } }) } diff --git a/src/views/components/echarts/lendAcross.vue b/src/views/components/echarts/lendAcross.vue index d753535..6050d48 100644 --- a/src/views/components/echarts/lendAcross.vue +++ b/src/views/components/echarts/lendAcross.vue @@ -117,7 +117,7 @@ export default { { name: '数量', type: 'bar', - barWidth: 30, // 柱图宽度 + barWidth: 12, // 柱图宽度 barGap: 25, showBackground: true, backgroundStyle: { diff --git a/src/views/environmentalScreen/index-old.vue b/src/views/environmentalScreen/index-old.vue new file mode 100644 index 0000000..5ae71fc --- /dev/null +++ b/src/views/environmentalScreen/index-old.vue @@ -0,0 +1,903 @@ +