-
-
- {{ article.title }}
-
-
- This article is from Evan You on medium
-
-
-
-
Page style setting
+页面风格设置
- Theme Color
+ 主题颜色
- Open Tags-View
+ 打开页面标签
-
+
- Sidebar Logo
+ 侧边栏的 LOGO
diff --git a/src/router/index.js b/src/router/index.js
index bfc62ded..a53667f3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -7,10 +7,6 @@ Vue.use(Router)
import Layout from '@/layout'
/* Router Modules */
-import componentsRouter from './modules/components'
-import chartsRouter from './modules/charts'
-import tableRouter from './modules/table'
-import nestedRouter from './modules/nested'
/**
* Note: sub-menu only appear when route children.length >= 1
@@ -136,17 +132,59 @@ export const constantRoutes = [
name: '隐患排查',
meta: { title: '隐患排查', icon: 'form', noCache: true }
},
+ {
+ path: 'hidden_check/create',
+ component: () => import('@/views/hidden_check/components/create/index'),
+ name: 'create',
+ hidden: true,
+ meta: { title: '隐患排查新增', icon: 'list', noCache: true }
+ },
+ {
+ path: 'hidden_check/audit/:id',
+ component: () => import('@/views/hidden_check/components/edit_form/index'),
+ name: 'audit',
+ hidden: true,
+ meta: { title: '隐患排查编辑', icon: 'list', noCache: true }
+ },
{
path: 'hidden_reform',
component: () => import('@/views/hidden_reform/index'),
name: '隐患整改',
meta: { title: '隐患整改', icon: 'el-icon-s-management', noCache: true }
},
+ {
+ path: 'hidden_reform/create',
+ component: () => import('@/views/hidden_reform/components/create/index'),
+ name: 'create',
+ hidden: true,
+ meta: { title: '隐患整改新增', icon: 'list', noCache: true }
+ },
+ {
+ path: 'hidden_reform/audit/:id',
+ component: () => import('@/views/hidden_reform/components/edit_form/index'),
+ name: 'audit',
+ hidden: true,
+ meta: { title: '隐患整改编辑', icon: 'list', noCache: true }
+ },
{
path: 'hidden_review',
component: () => import('@/views/hidden_review/index'),
name: '隐患验收',
meta: { title: '隐患验收', icon: 'el-icon-s-opportunity', noCache: true }
+ },
+ {
+ path: 'hidden_review/create',
+ component: () => import('@/views/hidden_review/components/create/index'),
+ name: 'create',
+ hidden: true,
+ meta: { title: '隐患验收新增', icon: 'list', noCache: true }
+ },
+ {
+ path: 'hidden_review/audit/:id',
+ component: () => import('@/views/hidden_review/components/edit_form/index'),
+ name: 'audit',
+ hidden: true,
+ meta: { title: '隐患验收编辑', icon: 'list', noCache: true }
}
]
},
@@ -172,7 +210,7 @@ export const constantRoutes = [
path: 'index',
component: () => import('@/views/sys_user/index'),
name: '用户管理',
- meta: { title: '用户管理', icon: 'guide', noCache: true }
+ meta: { title: '用户管理', icon: 'el-icon-user-solid', noCache: true }
}
]
}
@@ -183,260 +221,6 @@ export const constantRoutes = [
* the routes that need to be dynamically loaded based on user roles
*/
export const asyncRoutes = [
- {
- path: '/permission',
- component: Layout,
- redirect: '/permission/page',
- alwaysShow: true, // will always show the root menu
- name: 'Permission',
- meta: {
- title: 'Permission',
- icon: 'lock',
- roles: ['admin', 'editor'] // you can set roles in root nav
- },
- children: [
- {
- path: 'page',
- component: () => import('@/views/permission/page'),
- name: 'PagePermission',
- meta: {
- title: 'Page Permission',
- roles: ['admin'] // or you can only set roles in sub nav
- }
- },
- {
- path: 'directive',
- component: () => import('@/views/permission/directive'),
- name: 'DirectivePermission',
- meta: {
- title: 'Directive Permission'
- // if do not set roles, means: this page does not require permission
- }
- },
- {
- path: 'role',
- component: () => import('@/views/permission/role'),
- name: 'RolePermission',
- meta: {
- title: 'Role Permission',
- roles: ['admin']
- }
- }
- ]
- },
-
- {
- path: '/icon',
- component: Layout,
- children: [
- {
- path: 'index',
- component: () => import('@/views/icons/index'),
- name: 'Icons',
- meta: { title: 'Icons', icon: 'icon', noCache: true }
- }
- ]
- },
-
- /** when your routing map is too long, you can split it into small modules **/
- componentsRouter,
- chartsRouter,
- nestedRouter,
- tableRouter,
-
- {
- path: '/example',
- component: Layout,
- redirect: '/example/list',
- name: 'Example',
- meta: {
- title: 'Example',
- icon: 'el-icon-s-help'
- },
- children: [
- {
- path: 'create',
- component: () => import('@/views/example/create'),
- name: 'CreateArticle',
- meta: { title: 'Create Article', icon: 'edit' }
- },
- {
- path: 'edit/:id(\\d+)',
- component: () => import('@/views/example/edit'),
- name: 'EditArticle',
- meta: { title: 'Edit Article', noCache: true, activeMenu: '/example/list' },
- hidden: true
- },
- {
- path: 'list',
- component: () => import('@/views/example/list'),
- name: 'ArticleList',
- meta: { title: 'Article List', icon: 'v' }
- }
- ]
- },
-
- {
- path: '/tab',
- component: Layout,
- children: [
- {
- path: 'index',
- component: () => import('@/views/tab/index'),
- name: 'Tab',
- meta: { title: 'Tab', icon: 'tab' }
- }
- ]
- },
-
- {
- path: '/error',
- component: Layout,
- redirect: 'noRedirect',
- name: 'ErrorPages',
- meta: {
- title: 'Error Pages',
- icon: '404'
- },
- children: [
- {
- path: '401',
- component: () => import('@/views/error-page/401'),
- name: 'Page401',
- meta: { title: '401', noCache: true }
- },
- {
- path: '404',
- component: () => import('@/views/error-page/404'),
- name: 'Page404',
- meta: { title: '404', noCache: true }
- }
- ]
- },
-
- {
- path: '/error-log',
- component: Layout,
- children: [
- {
- path: 'log',
- component: () => import('@/views/error-log/index'),
- name: 'ErrorLog',
- meta: { title: 'Error Log', icon: 'bug' }
- }
- ]
- },
-
- {
- path: '/excel',
- component: Layout,
- redirect: '/excel/export-excel',
- name: 'Excel',
- meta: {
- title: 'Excel',
- icon: 'excel'
- },
- children: [
- {
- path: 'export-excel',
- component: () => import('@/views/excel/export-excel'),
- name: 'ExportExcel',
- meta: { title: 'Export Excel' }
- },
- {
- path: 'export-selected-excel',
- component: () => import('@/views/excel/select-excel'),
- name: 'SelectExcel',
- meta: { title: 'Export Selected' }
- },
- {
- path: 'export-merge-header',
- component: () => import('@/views/excel/merge-header'),
- name: 'MergeHeader',
- meta: { title: 'Merge Header' }
- },
- {
- path: 'upload-excel',
- component: () => import('@/views/excel/upload-excel'),
- name: 'UploadExcel',
- meta: { title: 'Upload Excel' }
- }
- ]
- },
-
- {
- path: '/zip',
- component: Layout,
- redirect: '/zip/download',
- alwaysShow: true,
- name: 'Zip',
- meta: { title: 'Zip', icon: 'zip' },
- children: [
- {
- path: 'download',
- component: () => import('@/views/zip/index'),
- name: 'ExportZip',
- meta: { title: 'Export Zip' }
- }
- ]
- },
-
- {
- path: '/pdf',
- component: Layout,
- redirect: '/pdf/index',
- children: [
- {
- path: 'index',
- component: () => import('@/views/pdf/index'),
- name: 'PDF',
- meta: { title: 'PDF', icon: 'pdf' }
- }
- ]
- },
- {
- path: '/pdf/download',
- component: () => import('@/views/pdf/download'),
- hidden: true
- },
-
- {
- path: '/theme',
- component: Layout,
- children: [
- {
- path: 'index',
- component: () => import('@/views/theme/index'),
- name: 'Theme',
- meta: { title: 'Theme', icon: 'theme' }
- }
- ]
- },
-
- {
- path: '/clipboard',
- component: Layout,
- children: [
- {
- path: 'index',
- component: () => import('@/views/clipboard/index'),
- name: 'ClipboardDemo',
- meta: { title: 'Clipboard', icon: 'clipboard' }
- }
- ]
- },
-
- {
- path: 'external-link',
- component: Layout,
- children: [
- {
- path: 'https://github.com/PanJiaChen/vue-element-admin',
- meta: { title: 'External Link', icon: 'link' }
- }
- ]
- },
-
// 404 page must be placed at the end !!!
{ path: '*', redirect: '/404', hidden: true }
]
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 49474de3..6fe4e874 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -69,7 +69,7 @@
// dropdown
.el-dropdown-menu {
a {
- display: block
+ display: block;
}
}
@@ -82,3 +82,56 @@
.el-range-separator {
box-sizing: content-box;
}
+// table 样式
+.el-table__row {
+ font-size: 12px;
+}
+
+.el-table__header {
+ font-size: 12px;
+ color: #000;
+}
+
+.el-table th,
+.el-table td {
+ color: #000;
+ padding: 0px;
+}
+
+// 解决表头和表体对不齐
+.el-table th.gutter {
+ display: table-cell !important;
+}
+
+// .el-checkbox__input.is-checked .el-checkbox__inner {
+// background-color: #42b983;
+// border-color: #42b983;
+// }
+// .el-checkbox__input.is-checked .el-checkbox__inner {
+// background-color: #42b983;
+// border-color: #42b983;
+// }
+// .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+// background-color: #42b983;
+// border-color: #42b983;
+// }
+
+// .el-checkbox__input.is-focus .el-checkbox__inner {
+// border-color: #42b983;
+// }
+
+// button样式
+.el-button--primary {
+ text-align: center;
+ line-height: 25px;
+ padding: 0px 10px;
+}
+//设置图标按钮宽度
+.el-button--text {
+ width: 20px;
+}
+// 自定义button
+.button {
+ color: #000;
+ background-color: #fff;
+}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 96095ef6..12f3f11e 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -1,16 +1,17 @@
-@import './variables.scss';
-@import './mixin.scss';
-@import './transition.scss';
-@import './element-ui.scss';
-@import './sidebar.scss';
-@import './btn.scss';
+@import "./variables.scss";
+@import "./mixin.scss";
+@import "./transition.scss";
+@import "./element-ui.scss";
+@import "./sidebar.scss";
+@import "./btn.scss";
body {
height: 100%;
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility;
- font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+ font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
+ Microsoft YaHei, Arial, sans-serif;
}
label {
@@ -104,7 +105,8 @@ aside {
display: block;
line-height: 32px;
font-size: 16px;
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
+ Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
color: #2c3e50;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
@@ -134,7 +136,7 @@ aside {
}
.text-center {
- text-align: center
+ text-align: center;
}
.sub-navbar {
@@ -145,7 +147,13 @@ aside {
text-align: right;
padding-right: 20px;
transition: 600ms ease position;
- background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
+ background: linear-gradient(
+ 90deg,
+ rgba(32, 182, 249, 1) 0%,
+ rgba(32, 182, 249, 1) 0%,
+ rgba(33, 120, 241, 1) 100%,
+ rgba(33, 120, 241, 1) 100%
+ );
.subtitle {
font-size: 20px;
diff --git a/src/utils/index.js b/src/utils/index.js
index 3225d3c4..dc208f1c 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -51,6 +51,49 @@ export function parseTime(time, cFormat) {
return time_str
}
+export function parseDay(time, cFormat) {
+ if (arguments.length === 0 || !time) {
+ return null
+ }
+ const format = cFormat || '{y}-{m}-{d}'
+ let date
+ if (typeof time === 'object') {
+ date = time
+ } else {
+ if ((typeof time === 'string')) {
+ if ((/^[0-9]+$/.test(time))) {
+ // support "1548221490638"
+ time = parseInt(time)
+ } else {
+ // support safari
+ // https://stackoverflow.com/questions/4310953/invalid-date-in-safari
+ time = time.replace(new RegExp(/-/gm), '/')
+ }
+ }
+
+ if ((typeof time === 'number') && (time.toString().length === 10)) {
+ time = time * 1000
+ }
+ date = new Date(time)
+ }
+ const formatObj = {
+ y: date.getFullYear(),
+ m: date.getMonth() + 2,
+ d: date.getDate(),
+ h: date.getHours(),
+ i: date.getMinutes(),
+ s: date.getSeconds(),
+ a: date.getDay()
+ }
+ const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
+ const value = formatObj[key]
+ // Note: getDay() returns 0 on Sunday
+ if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] }
+ return value.toString().padStart(2, '0')
+ })
+ return time_str
+}
+
/**
* @param {number} time
* @param {string} option
diff --git a/src/views/charts/keyboard.vue b/src/views/charts/keyboard.vue
deleted file mode 100644
index 917f8eeb..00000000
--- a/src/views/charts/keyboard.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/views/charts/line.vue b/src/views/charts/line.vue
deleted file mode 100644
index fea1497e..00000000
--- a/src/views/charts/line.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/views/charts/mix-chart.vue b/src/views/charts/mix-chart.vue
deleted file mode 100644
index c57db75a..00000000
--- a/src/views/charts/mix-chart.vue
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/views/clipboard/index.vue b/src/views/clipboard/index.vue
deleted file mode 100644
index 4a6bdd1e..00000000
--- a/src/views/clipboard/index.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
- copy
-
-
-
-
- copy
-
-
-
-
-
-
-
-
diff --git a/src/views/components-demo/avatar-upload.vue b/src/views/components-demo/avatar-upload.vue
deleted file mode 100644
index 5cb20a56..00000000
--- a/src/views/components-demo/avatar-upload.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
- Change Avatar
-
-
-
-
-
-
-
-
-
diff --git a/src/views/components-demo/back-to-top.vue b/src/views/components-demo/back-to-top.vue
deleted file mode 100644
index df5370be..00000000
--- a/src/views/components-demo/back-to-top.vue
+++ /dev/null
@@ -1,154 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/components-demo/count-to.vue b/src/views/components-demo/count-to.vue
deleted file mode 100644
index 70681df6..00000000
--- a/src/views/components-demo/count-to.vue
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-
-
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
-
-
-
-
-
-
-
-
-
diff --git a/src/views/components-demo/dnd-list.vue b/src/views/components-demo/dnd-list.vue
deleted file mode 100644
index e299fa68..00000000
--- a/src/views/components-demo/dnd-list.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
- - - - -
-
-
- Start
-
-
- pause/resume
-
- - - - - -
-
-
-
-
-
-
diff --git a/src/views/components-demo/drag-dialog.vue b/src/views/components-demo/drag-dialog.vue
deleted file mode 100644
index c815b282..00000000
--- a/src/views/components-demo/drag-dialog.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
- open a Drag Dialog
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/components-demo/drag-kanban.vue b/src/views/components-demo/drag-kanban.vue
deleted file mode 100644
index 943be455..00000000
--- a/src/views/components-demo/drag-kanban.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/components-demo/drag-select.vue b/src/views/components-demo/drag-select.vue
deleted file mode 100644
index 905ecb94..00000000
--- a/src/views/components-demo/drag-select.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/views/components-demo/dropzone.vue b/src/views/components-demo/dropzone.vue
deleted file mode 100644
index a8c10400..00000000
--- a/src/views/components-demo/dropzone.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- {{ item }}
-
-
-
-
-
-
-
-
-
diff --git a/src/views/components-demo/json-editor.vue b/src/views/components-demo/json-editor.vue
deleted file mode 100644
index 85bf3834..00000000
--- a/src/views/components-demo/json-editor.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/components-demo/markdown.vue b/src/views/components-demo/markdown.vue
deleted file mode 100644
index 25cf3e37..00000000
--- a/src/views/components-demo/markdown.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-
-
-
- Get HTML
-
-
-
-
-
-
-
-
diff --git a/src/views/components-demo/mixin.vue b/src/views/components-demo/mixin.vue
deleted file mode 100644
index 425cf4fb..00000000
--- a/src/views/components-demo/mixin.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
- Basic:
-
-
-
-
-
- Markdown Mode:
-
-
-
-
-
- Customize Toolbar:
-
-
-
-
-
- I18n:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/components-demo/split-pane.vue b/src/views/components-demo/split-pane.vue
deleted file mode 100644
index 7dba353f..00000000
--- a/src/views/components-demo/split-pane.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
- Buttons
-
-
-
-
- Documentation
-
-
-
-
- Icons
-
-
-
-
- Excel
-
-
-
-
- Table
-
-
-
-
- Form
-
-
-
-
- Theme
-
-
-
-
- Material Design 的input
-
-
-
-
-
- 标题
-
-
-
-
-
- 图片hover效果
-
-
-
- vue-element-admin
-
-
-
- 水波纹 waves v-directive
-
-
-
- 水波纹效果
-
-
-
- hover text
-
-
-
-
- Share
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/components-demo/sticky.vue b/src/views/components-demo/sticky.vue
deleted file mode 100644
index f01d088a..00000000
--- a/src/views/components-demo/sticky.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
-
- Platform
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
- Link
-
-
-
-
- Url
-
-
-
-
-
-
- publish
-
-
-
-
-
-
-
-
-
diff --git a/src/views/components-demo/tinymce.vue b/src/views/components-demo/tinymce.vue
deleted file mode 100644
index f03389a0..00000000
--- a/src/views/components-demo/tinymce.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
- placeholder
-
-
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
- placeholder
-
-
-
-
-
-
-
-
-
diff --git a/src/views/dashboard/admin/index.vue b/src/views/dashboard/admin/index.vue
index 3d2324ad..c4c23150 100644
--- a/src/views/dashboard/admin/index.vue
+++ b/src/views/dashboard/admin/index.vue
@@ -1,6 +1,5 @@
-
-
-
-
-
- {{ !comment_disabled?'Comment: opened':'Comment: closed' }}
-
-
-
-
-
-
- Close comment
-
-
- Open comment
-
-
-
-
-
-
-
-
diff --git a/src/views/example/components/Dropdown/Platform.vue b/src/views/example/components/Dropdown/Platform.vue
deleted file mode 100644
index 0a527264..00000000
--- a/src/views/example/components/Dropdown/Platform.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
- Platfroms({{ platforms.length }})
-
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
diff --git a/src/views/example/components/Dropdown/SourceUrl.vue b/src/views/example/components/Dropdown/SourceUrl.vue
deleted file mode 100644
index 8f47485a..00000000
--- a/src/views/example/components/Dropdown/SourceUrl.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
- Link
-
-
-
-
-
-
- URL
-
-
-
-
-
-
-
-
diff --git a/src/views/example/components/Dropdown/index.js b/src/views/example/components/Dropdown/index.js
deleted file mode 100644
index bc0c171b..00000000
--- a/src/views/example/components/Dropdown/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as CommentDropdown } from './Comment'
-export { default as PlatformDropdown } from './Platform'
-export { default as SourceUrlDropdown } from './SourceUrl'
diff --git a/src/views/example/components/Warning.vue b/src/views/example/components/Warning.vue
deleted file mode 100644
index 8d2a7e5a..00000000
--- a/src/views/example/components/Warning.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
diff --git a/src/views/example/create.vue b/src/views/example/create.vue
deleted file mode 100644
index f28ce287..00000000
--- a/src/views/example/create.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/safe_insp/components/create/index.vue b/src/views/safe_insp/components/create/index.vue
index e2df2efc..a777eaf1 100644
--- a/src/views/safe_insp/components/create/index.vue
+++ b/src/views/safe_insp/components/create/index.vue
@@ -2,7 +2,7 @@
+
@@ -22,7 +22,7 @@
-
+
@@ -31,7 +31,7 @@
-
+
-
+
@@ -57,8 +57,15 @@
-
-
+
+
@@ -147,16 +154,52 @@ export default {
safe_insp__dept_id: '',
safe_insp__insp_man_id: ''
},
+ rules: {
+ safe_insp__insp_name: [
+ { required: true, message: '请选择巡检名称', trigger: 'blur' }
+ ],
+ safe_insp__insp_man: [
+ { required: true, message: '请选择巡检人员', trigger: 'blur' }
+ ],
+ safe_insp__insp_date: [
+ { required: true, message: '请选择巡检日期', trigger: 'blur' }
+ ],
+ safe_insp__insp_times: [
+ { required: true, message: '请选择巡检频率', trigger: 'blur' }
+ ]
+ },
inspName: [],
disabled: false,
options: [],
+ insptimes: [],
selUserVisible: false,
inspNameVisible: false,
id: ''
}
},
+ watch: {
+ 'form.safe_insp__insp_name': {
+ handler(val, oldVal) {
+ this.$refs['safe_insp__insp_name'].clearValidate()
+ },
+ deep: true
+ },
+ 'form.safe_insp__insp_man': {
+ handler(val, oldVal) {
+ this.$refs['safe_insp__insp_man'].clearValidate()
+ },
+ deep: true
+ },
+ 'form.safe_insp__insp_times': {
+ handler(val, oldVal) {
+ this.$refs['safe_insp__insp_times'].clearValidate()
+ },
+ deep: true
+ }
+ },
created() {
this.getTypeSel()
+ this.getInsptimes()
},
methods: {
getList() {
@@ -173,7 +216,7 @@ export default {
})
},
async getTypeSel() {
- await publicApi.getTypeSel('insptimes').then(data => {
+ await publicApi.getTypeSel('inspstate').then(data => {
if (data.success) {
this.options = data.data.root
} else {
@@ -181,6 +224,15 @@ export default {
}
})
},
+ async getInsptimes() {
+ await publicApi.getTypeSel('insptimes').then(data => {
+ if (data.success) {
+ this.insptimes = data.data.root
+ } else {
+ this.$message.error(data.message)
+ }
+ })
+ },
onSubmit() {},
updateUser(data) {
this.form.safe_insp__insp_man = data.sys_user__user_name
@@ -202,13 +254,17 @@ export default {
this.inspNameVisible = false
},
save() {
- api.Crerte(this.form).then(data => {
- if (data.success) {
- this.$message.success('保存成功！')
- const param = `/insp/edit_form/audit/${data.data.keyid}`
- this.$router.push(param)
- } else {
- this.$message.error(data.message)
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ api.Crerte(this.form).then(data => {
+ if (data.success) {
+ this.$message.success('保存成功！')
+ const param = `/insp/edit_form/audit/${data.data.keyid}`
+ this.$router.push(param)
+ } else {
+ this.$message.error(data.message)
+ }
+ })
}
})
},
diff --git a/src/views/safe_insp/components/edit_form/index.vue b/src/views/safe_insp/components/edit_form/index.vue
index 774b172c..dff04747 100644
--- a/src/views/safe_insp/components/edit_form/index.vue
+++ b/src/views/safe_insp/components/edit_form/index.vue
@@ -2,7 +2,7 @@
+
@@ -22,14 +22,16 @@
-
-
+
+
-
+
-
-
+
+
@@ -55,8 +57,15 @@
-
-
+
+
@@ -92,6 +101,18 @@
确 定
+
+ 取 消
+ 确 定
+
+
@@ -101,12 +122,15 @@ import publicApi from '@/api/public'
import buttons from '@/components/formBtn'
import InspDet from '../insp_det'
import SelUser from '@/components/selUser'
+import InspName from '../inspName'
+import { parseDay } from '@/utils'
export default {
name: 'EditForm',
components: {
buttons,
SelUser,
- InspDet
+ InspDet,
+ InspName
},
// props: {
// id: { type: String, default: () => '' }
@@ -114,11 +138,60 @@ export default {
data() {
return {
loading: false,
- form: {},
+ parseDay,
+ form: {
+ safe_insp__insp_code: '',
+ safe_insp__insp_name: '',
+ safe_insp__insp_state: '',
+ safe_insp__insp_date: '',
+ safe_insp__insp_man: '',
+ safe_insp__insp_times: '',
+ safe_insp__insp_memo: '',
+ safe_insp__insp_ed: '',
+ safe_insp__insp_ing: '',
+ safe_insp__insp_non: '',
+ safe_insp__safe_insp_id: ''
+ },
+ rules: {
+ safe_insp__insp_name: [
+ { required: true, message: '请选择巡检名称', trigger: 'blur' }
+ ],
+ safe_insp__insp_man: [
+ { required: true, message: '请选择巡检人员', trigger: 'blur' }
+ ],
+ safe_insp__insp_date: [
+ { required: true, message: '请选择巡检日期', trigger: 'blur' }
+ ],
+ safe_insp__insp_times: [
+ { required: true, message: '请选择巡检频率', trigger: 'blur' }
+ ]
+ },
id: this.$route.params.id,
disabled: false,
options: [],
- selUserVisible: false
+ insptimes: [],
+ selUserVisible: false,
+ inspNameVisible: false
+ }
+ },
+ watch: {
+ 'form.safe_insp__insp_name': {
+ handler(val, oldVal) {
+ this.$refs['safe_insp__insp_name'].clearValidate()
+ },
+ deep: true
+ },
+ 'form.safe_insp__insp_man': {
+ handler(val, oldVal) {
+ this.$refs['safe_insp__insp_man'].clearValidate()
+ },
+ deep: true
+ },
+ 'form.safe_insp__insp_times': {
+ handler(val, oldVal) {
+ this.$refs['safe_insp__insp_times'].clearValidate()
+ },
+ deep: true
}
},
created() {
@@ -132,6 +205,7 @@ export default {
api.getFormDate(this.id).then(data => {
if (data.success) {
this.form = data.data.root[0]
+ this.form.safe_insp__insp_date = parseDay(data.data.root[0].safe_insp__insp_date)
setTimeout(() => {
this.loading = false
}, 200)
@@ -149,6 +223,15 @@ export default {
}
})
},
+ async getInsptimes() {
+ await publicApi.getTypeSel('insptimes').then(data => {
+ if (data.success) {
+ this.insptimes = data.data.root
+ } else {
+ this.$message.error(data.message)
+ }
+ })
+ },
onSubmit() {},
updateUser(data) {
this.form.safe_insp__insp_man = data.sys_user__user_name
@@ -168,6 +251,11 @@ export default {
}
})
},
+ updateInspName(data) {
+ this.form.safe_insp__insp_name = data.insp_name__insp_name
+ this.form.safe_insp__insp_name_id = data.insp_name__insp_name_id
+ this.inspNameVisible = false
+ },
back() {
// this.$router.back(-1)
}
diff --git a/src/views/safe_insp/index.vue b/src/views/safe_insp/index.vue
index 4865f4c2..457c4d9d 100644
--- a/src/views/safe_insp/index.vue
+++ b/src/views/safe_insp/index.vue
@@ -3,20 +3,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/tab/index.vue b/src/views/tab/index.vue
deleted file mode 100644
index 2a35fa58..00000000
--- a/src/views/tab/index.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
- {{ scope.row.id }}
-
-
-
-
-
- {{ scope.row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }}
-
-
-
-
-
- {{ scope.row.author }}
-
-
-
-
-
-
-
-
-
-
- {{ row.status }}
-
-
-
-
-
-
-
- {{ row.title }}
-
-
-
-
-
-
-
-
- Edit
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/excel/components/AutoWidthOption.vue b/src/views/excel/components/AutoWidthOption.vue
deleted file mode 100644
index 9050e659..00000000
--- a/src/views/excel/components/AutoWidthOption.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
- True
-
-
- False
-
-
-
-
-
-
diff --git a/src/views/excel/components/BookTypeOption.vue b/src/views/excel/components/BookTypeOption.vue
deleted file mode 100644
index af9fed39..00000000
--- a/src/views/excel/components/BookTypeOption.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/views/excel/components/FilenameOption.vue b/src/views/excel/components/FilenameOption.vue
deleted file mode 100644
index 75092235..00000000
--- a/src/views/excel/components/FilenameOption.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/excel/export-excel.vue b/src/views/excel/export-excel.vue
deleted file mode 100644
index b4d7500b..00000000
--- a/src/views/excel/export-excel.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
-
-
-
-
-
- {{ scope.$index }}
-
-
-
-
- {{ scope.row.title }}
-
-
-
-
- {{ scope.row.author }}
-
-
-
-
- {{ scope.row.pageviews }}
-
-
-
-
-
- {{ scope.row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }}
-
-
-
-
-
-
-
-
-
diff --git a/src/views/excel/merge-header.vue b/src/views/excel/merge-header.vue
deleted file mode 100644
index 4be0227d..00000000
--- a/src/views/excel/merge-header.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
- Export
-
-
-
-
- {{ scope.$index }}
-
-
-
-
-
- {{ scope.row.title }}
-
-
-
-
- {{ scope.row.author }}
-
-
-
-
- {{ scope.row.pageviews }}
-
-
-
-
-
-
- {{ scope.row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }}
-
-
-
-
-
-
-
-
diff --git a/src/views/excel/select-excel.vue b/src/views/excel/select-excel.vue
deleted file mode 100644
index 05b85fb8..00000000
--- a/src/views/excel/select-excel.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
- Export Selected Items
-
-
- Documentation
-
-
-
-
- {{ scope.$index }}
-
-
-
-
- {{ scope.row.title }}
-
-
-
-
- {{ scope.row.author }}
-
-
-
-
- {{ scope.row.pageviews }}
-
-
-
-
-
- {{ scope.row.display_time }}
-
-
-
-
-
-
-
diff --git a/src/views/excel/upload-excel.vue b/src/views/excel/upload-excel.vue
deleted file mode 100644
index 1772b7fd..00000000
--- a/src/views/excel/upload-excel.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/views/guide/api/index.js b/src/views/guide/api/index.js
deleted file mode 100644
index 1f2765ff..00000000
--- a/src/views/guide/api/index.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import request from '@/utils/request'
-
-export default {
- getDept(pageSize, pageNo) {
- return request({
- url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=administrator`,
- method: 'post',
- data: `start=${pageNo}&limit=${pageSize}&where_sql=&where_value=&where_type=&is_query=1&query_type=0`
- }).then(response => response.data)
- },
- Crerte(data) {
- return request({
- url: `/commonAction.do`,
- method: 'post',
- data: `${data}`
- }).then(response => response.data)
- },
- auditSave(data) {
- return request({
- url: `/commonAction.do`,
- method: 'post',
- data: `${data}`
- }).then(response => response.data)
- },
- Delete(ids) {
- let keys = ''
- ids.forEach(d => {
- keys += 'keyid=' + d + '&'
- })
- return request({
- url: `/commonAction.do`,
- method: 'post',
- data: `funid=sys_dept&${keys}pagetype=editgrid&eventcode=delete_eg&user_id=administrator&dataType=json`
- }).then(response => response.data)
- }
-}
diff --git a/src/views/guide/components/auditDept.vue b/src/views/guide/components/auditDept.vue
deleted file mode 100644
index 452d67a4..00000000
--- a/src/views/guide/components/auditDept.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/guide/index.vue b/src/views/guide/index.vue
deleted file mode 100644
index 0456b0f3..00000000
--- a/src/views/guide/index.vue
+++ /dev/null
@@ -1,299 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/guide/steps.js b/src/views/guide/steps.js
deleted file mode 100644
index 283c672e..00000000
--- a/src/views/guide/steps.js
+++ /dev/null
@@ -1,53 +0,0 @@
-const steps = [
- {
- element: '#hamburger-container',
- popover: {
- title: 'Hamburger',
- description: 'Open && Close sidebar',
- position: 'bottom'
- }
- },
- {
- element: '#breadcrumb-container',
- popover: {
- title: 'Breadcrumb',
- description: 'Indicate the current page location',
- position: 'bottom'
- }
- },
- {
- element: '#header-search',
- popover: {
- title: 'Page Search',
- description: 'Page search, quick navigation',
- position: 'left'
- }
- },
- {
- element: '#screenfull',
- popover: {
- title: 'Screenfull',
- description: 'Set the page into fullscreen',
- position: 'left'
- }
- },
- {
- element: '#size-select',
- popover: {
- title: 'Switch Size',
- description: 'Switch the system size',
- position: 'left'
- }
- },
- {
- element: '#tags-view-container',
- popover: {
- title: 'Tags view',
- description: 'The history of the page you visited',
- position: 'bottom'
- },
- padding: 0
- }
-]
-
-export default steps
diff --git a/src/views/hidden_check/api/index.js b/src/views/hidden_check/api/index.js
new file mode 100644
index 00000000..3c8e8bcc
--- /dev/null
+++ b/src/views/hidden_check/api/index.js
@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+export default {
+ getDate(pageSize, pageNo, isWhereSql, whereValue) {
+ let whereSql = ''
+ let whereType = ''
+ if (isWhereSql) {
+ whereSql = `dept_id like ?`
+ whereType = 'string'
+ }
+ return request({
+ url: `commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_check&user_id=administrator`,
+ method: 'post',
+ data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0`
+ }).then(response => response.data)
+ },
+ getDeptTree() {
+ return request({
+ url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=administrator`,
+ method: 'post',
+ data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0`
+ }).then(response => response.data)
+ },
+ Crerte(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=hidden_check&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_code=${data.hidden_danger__hidden_code}&hidden_danger__hidden_state=${data.hidden_danger__hidden_state}&hidden_danger__check_man=${data.hidden_danger__check_man}&hidden_danger__check_dept=${data.hidden_danger__check_dept}&hidden_danger__check_date=${data.hidden_danger__check_date}&hidden_danger__check_location=${data.hidden_danger__check_location}&hidden_danger__check_content=${data.hidden_danger__check_content}&hidden_danger__check_problem=${data.hidden_danger__check_problem}&hidden_danger__org_id=${data.hidden_danger__org_id}&hidden_danger__insp_det_id=${data.hidden_danger__insp_det_id}&hidden_danger__dept_id=${data.hidden_danger__dept_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__reform_man=${data.hidden_danger__reform_man}&hidden_danger__reform_dept=${data.hidden_danger__reform_dept}&hidden_danger__reform_limit=${data.hidden_danger__reform_limit}&hidden_danger__check_photo=${data.hidden_danger__check_photo}&hidden_danger__more_flag=${data.hidden_danger__more_flag}&hidden_danger__check_man_id=${data.hidden_danger__check_man_id}&hidden_danger__check_dept_id=${data.hidden_danger__check_dept_id}&hidden_danger__reform_dept_id=${data.hidden_danger__reform_dept_id}&hidden_danger__reform_man_id=${data.hidden_danger__reform_man_id}&hidden_danger__safe_insp_id=${data.hidden_danger__safe_insp_id}&pagetype=form&eventcode=create&fkValue=&user_id=administrator&dataType=json`
+ }).then(response => response.data)
+ },
+ Save(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=hidden_check&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_code=${data.hidden_danger__hidden_code}&hidden_danger__hidden_state=${data.hidden_danger__hidden_state}&hidden_danger__check_man=${data.hidden_danger__check_man}&hidden_danger__check_dept=${data.hidden_danger__check_dept}&hidden_danger__check_date=${data.hidden_danger__check_date}&hidden_danger__check_location=${data.hidden_danger__check_location}&hidden_danger__check_content=${data.hidden_danger__check_content}&hidden_danger__check_problem=${data.hidden_danger__check_problem}&hidden_danger__org_id=${data.hidden_danger__org_id}&hidden_danger__insp_det_id=${data.hidden_danger__insp_det_id}&hidden_danger__dept_id=${data.hidden_danger__dept_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__reform_man=${data.hidden_danger__reform_man}&hidden_danger__reform_dept=${data.hidden_danger__reform_dept}&hidden_danger__reform_limit=${data.hidden_danger__reform_limit}&hidden_danger__check_photo=${data.hidden_danger__check_photo}&hidden_danger__more_flag=${data.hidden_danger__more_flag}&hidden_danger__check_man_id=${data.hidden_danger__check_man_id}&hidden_danger__check_dept_id=${data.hidden_danger__check_dept_id}&hidden_danger__reform_dept_id=${data.hidden_danger__reform_dept_id}&hidden_danger__reform_man_id=${data.hidden_danger__reform_man_id}&hidden_danger__safe_insp_id=${data.hidden_danger__safe_insp_id}&pagetype=form&eventcode=save&dirtyfields=hidden_danger.check_man;hidden_danger.reform_man;hidden_danger.reform_dept;hidden_danger.check_dept;hidden_danger.check_date;hidden_danger.check_location;hidden_danger.check_content;hidden_danger.check_problem;hidden_danger.dept_id;hidden_danger.reform_dept_id;hidden_danger.reform_limit;hidden_danger.check_dept_id;hidden_danger.check_man_id;hidden_danger.reform_man_id&fkValue=&user_id=administrator&dataType=json`
+ }).then(response => response.data)
+ },
+ auditSave(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `${data}`
+ }).then(response => response.data)
+ },
+ Delete(ids) {
+ let keys = ''
+ ids.forEach(d => {
+ keys += 'keyid=' + d + '&'
+ })
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=hidden_check&${keys}pagetype=editgrid&eventcode=delete&user_id=administrator&dataType=json`
+ }).then(response => response.data)
+ },
+ getFormDate(id) {
+ return request({
+ url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_check&user_id=administrator`,
+ method: 'post',
+ data: `start=0&limit=10&where_sql=hidden_danger.hidden_danger_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0`
+ }).then(response => response.data)
+ }
+}
diff --git a/src/views/hidden_check/components/create/index.vue b/src/views/hidden_check/components/create/index.vue
new file mode 100644
index 00000000..7a9c183c
--- /dev/null
+++ b/src/views/hidden_check/components/create/index.vue
@@ -0,0 +1,344 @@
+
+
- {{
- scope.row.sys_dept__is_novalid == 0 ? '否' : '是'
- }}
-
-
-
- {{ scope.row[d.prop] }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
diff --git a/src/views/hidden_check/components/edit_form/index.vue b/src/views/hidden_check/components/edit_form/index.vue
new file mode 100644
index 00000000..f0b9d348
--- /dev/null
+++ b/src/views/hidden_check/components/edit_form/index.vue
@@ -0,0 +1,344 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
diff --git a/src/views/hidden_check/index.vue b/src/views/hidden_check/index.vue
index e69de29b..a34f2e50 100644
--- a/src/views/hidden_check/index.vue
+++ b/src/views/hidden_check/index.vue
@@ -0,0 +1,257 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/hidden_reform/api/index.js b/src/views/hidden_reform/api/index.js
new file mode 100644
index 00000000..0cf3e9a3
--- /dev/null
+++ b/src/views/hidden_reform/api/index.js
@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+export default {
+ getDate(pageSize, pageNo, isWhereSql, whereValue) {
+ let whereSql = ''
+ let whereType = ''
+ if (isWhereSql) {
+ whereSql = `dept_id like ?`
+ whereType = 'string'
+ }
+ return request({
+ url: `commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_reform&user_id=administrator`,
+ method: 'post',
+ data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0`
+ }).then(response => response.data)
+ },
+ getDeptTree() {
+ return request({
+ url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=administrator`,
+ method: 'post',
+ data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0`
+ }).then(response => response.data)
+ },
+ Crerte(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=hidden_reform&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_code=${data.hidden_danger__hidden_code}&hidden_danger__hidden_state=${data.hidden_danger__hidden_state}&hidden_danger__check_man=${data.hidden_danger__check_man}&hidden_danger__check_dept=${data.hidden_danger__check_dept}&hidden_danger__check_date=${data.hidden_danger__check_date}&hidden_danger__check_location=${data.hidden_danger__check_location}&hidden_danger__check_content=${data.hidden_danger__check_content}&hidden_danger__check_problem=${data.hidden_danger__check_problem}&hidden_danger__org_id=${data.hidden_danger__org_id}&hidden_danger__insp_det_id=${data.hidden_danger__insp_det_id}&hidden_danger__dept_id=${data.hidden_danger__dept_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__reform_man=${data.hidden_danger__reform_man}&hidden_danger__reform_dept=${data.hidden_danger__reform_dept}&hidden_danger__reform_limit=${data.hidden_danger__reform_limit}&hidden_danger__check_photo=${data.hidden_danger__check_photo}&hidden_danger__more_flag=${data.hidden_danger__more_flag}&hidden_danger__check_man_id=${data.hidden_danger__check_man_id}&hidden_danger__check_dept_id=${data.hidden_danger__check_dept_id}&hidden_danger__reform_dept_id=${data.hidden_danger__reform_dept_id}&hidden_danger__reform_man_id=${data.hidden_danger__reform_man_id}&hidden_danger__safe_insp_id=${data.hidden_danger__safe_insp_id}&pagetype=form&eventcode=create&fkValue=&user_id=administrator&dataType=json`
+ }).then(response => response.data)
+ },
+ Save(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=hidden_reform&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__reform_date=${data.hidden_danger__reform_date}&hidden_danger__reform_money=${data.hidden_danger__reform_money}&hidden_danger__reform_desc=${data.hidden_danger__reform_desc}&pagetype=form&eventcode=save&dirtyfields=hidden_danger.reform_date;hidden_danger.reform_money;hidden_danger.reform_desc&fkValue=&user_id=administrator&dataType=json`
+ }).then(response => response.data)
+ },
+ auditSave(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `${data}`
+ }).then(response => response.data)
+ },
+ Delete(ids) {
+ let keys = ''
+ ids.forEach(d => {
+ keys += 'keyid=' + d + '&'
+ })
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=hidden_reform&${keys}pagetype=editgrid&eventcode=delete&user_id=administrator&dataType=json`
+ }).then(response => response.data)
+ },
+ getFormDate(id) {
+ return request({
+ url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_reform&user_id=administrator`,
+ method: 'post',
+ data: `start=0&limit=10&where_sql=hidden_danger.hidden_danger_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0`
+ }).then(response => response.data)
+ }
+}
diff --git a/src/views/hidden_reform/components/create/index.vue b/src/views/hidden_reform/components/create/index.vue
new file mode 100644
index 00000000..7a9c183c
--- /dev/null
+++ b/src/views/hidden_reform/components/create/index.vue
@@ -0,0 +1,344 @@
+
+
+ {{
+ scope.row.hidden_danger__hidden_state == 1 ? '排查中' : scope.row.hidden_danger__hidden_state == 2 ? '待整改' :scope.row.hidden_danger__hidden_state == 3 ? '整改中' :scope.row.hidden_danger__hidden_state == 4 ? '待验收' : '已验收'
+ }}
+
+
+
+ {{ scope.row[d.prop] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
diff --git a/src/views/hidden_reform/components/edit_form/index.vue b/src/views/hidden_reform/components/edit_form/index.vue
new file mode 100644
index 00000000..6ed37f62
--- /dev/null
+++ b/src/views/hidden_reform/components/edit_form/index.vue
@@ -0,0 +1,374 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
diff --git a/src/views/hidden_reform/index.vue b/src/views/hidden_reform/index.vue
index e69de29b..59b49373 100644
--- a/src/views/hidden_reform/index.vue
+++ b/src/views/hidden_reform/index.vue
@@ -0,0 +1,266 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/hidden_review/api/index.js b/src/views/hidden_review/api/index.js
new file mode 100644
index 00000000..fa18be36
--- /dev/null
+++ b/src/views/hidden_review/api/index.js
@@ -0,0 +1,63 @@
+import request from '@/utils/request'
+
+export default {
+ getDate(pageSize, pageNo, isWhereSql, whereValue) {
+ let whereSql = ''
+ let whereType = ''
+ if (isWhereSql) {
+ whereSql = `dept_id like ?`
+ whereType = 'string'
+ }
+ return request({
+ url: `commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_review&user_id=administrator`,
+ method: 'post',
+ data: `start=${pageNo}&limit=${pageSize}&where_sql=${whereSql}&where_value=${whereValue}&where_type=${whereType}&is_query=1&query_type=0`
+ }).then(response => response.data)
+ },
+ getDeptTree() {
+ return request({
+ url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_dept&user_id=administrator`,
+ method: 'post',
+ data: `start=0&limit=10000&where_sql=&where_value=&where_type=&is_query=1&query_type=0`
+ }).then(response => response.data)
+ },
+ Crerte(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=hidden_review&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_code=${data.hidden_danger__hidden_code}&hidden_danger__hidden_state=${data.hidden_danger__hidden_state}&hidden_danger__check_man=${data.hidden_danger__check_man}&hidden_danger__check_dept=${data.hidden_danger__check_dept}&hidden_danger__check_date=${data.hidden_danger__check_date}&hidden_danger__check_location=${data.hidden_danger__check_location}&hidden_danger__check_content=${data.hidden_danger__check_content}&hidden_danger__check_problem=${data.hidden_danger__check_problem}&hidden_danger__org_id=${data.hidden_danger__org_id}&hidden_danger__insp_det_id=${data.hidden_danger__insp_det_id}&hidden_danger__dept_id=${data.hidden_danger__dept_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__reform_man=${data.hidden_danger__reform_man}&hidden_danger__reform_dept=${data.hidden_danger__reform_dept}&hidden_danger__reform_limit=${data.hidden_danger__reform_limit}&hidden_danger__check_photo=${data.hidden_danger__check_photo}&hidden_danger__more_flag=${data.hidden_danger__more_flag}&hidden_danger__check_man_id=${data.hidden_danger__check_man_id}&hidden_danger__check_dept_id=${data.hidden_danger__check_dept_id}&hidden_danger__reform_dept_id=${data.hidden_danger__reform_dept_id}&hidden_danger__reform_man_id=${data.hidden_danger__reform_man_id}&hidden_danger__safe_insp_id=${data.hidden_danger__safe_insp_id}&pagetype=form&eventcode=create&fkValue=&user_id=administrator&dataType=json`
+ }).then(response => response.data)
+ },
+ Save(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=hidden_review&keyid=${data.hidden_danger__hidden_danger_id}&hidden_danger__hidden_danger_id=${data.hidden_danger__hidden_danger_id}&hidden_danger__review_date=${data.hidden_danger__review_date}&hidden_danger__review_man=${data.hidden_danger__review_man}&hidden_danger__review_man_id=${data.hidden_danger__review_man_id}&hidden_danger__review_desc=${data.hidden_danger__review_desc}&pagetype=form&eventcode=save&dirtyfields=hidden_danger.review_date;hidden_danger.review_man;hidden_danger.review_man_id;hidden_danger.review_desc&fkValue=&user_id=administrator&dataType=json`
+ }).then(response => response.data)
+ },
+ auditSave(data) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `${data}`
+ }).then(response => response.data)
+ },
+ Delete(ids) {
+ let keys = ''
+ ids.forEach(d => {
+ keys += 'keyid=' + d + '&'
+ })
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=hidden_review&${keys}pagetype=editgrid&eventcode=delete&user_id=administrator&dataType=json`
+ }).then(response => response.data)
+ },
+ getFormDate(id) {
+ return request({
+ url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=grid&query_funid=hidden_review&user_id=administrator`,
+ method: 'post',
+ data: `start=0&limit=10&where_sql=hidden_danger.hidden_danger_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0`
+ }).then(response => response.data)
+ }
+}
diff --git a/src/views/hidden_review/components/create/index.vue b/src/views/hidden_review/components/create/index.vue
new file mode 100644
index 00000000..7a9c183c
--- /dev/null
+++ b/src/views/hidden_review/components/create/index.vue
@@ -0,0 +1,344 @@
+
+
+ {{
+ scope.row.hidden_danger__hidden_state == 1 ? '排查中' : scope.row.hidden_danger__hidden_state == 2 ? '待整改' :scope.row.hidden_danger__hidden_state == 3 ? '整改中' :scope.row.hidden_danger__hidden_state == 4 ? '待验收' : '已验收'
+ }}
+
+
+
+ {{ scope.row[d.prop] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
diff --git a/src/views/hidden_review/components/edit_form/index.vue b/src/views/hidden_review/components/edit_form/index.vue
new file mode 100644
index 00000000..89903c99
--- /dev/null
+++ b/src/views/hidden_review/components/edit_form/index.vue
@@ -0,0 +1,428 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+ 取 消
+ 确 定
+
+
+
+
+
+
+
+
diff --git a/src/views/hidden_review/index.vue b/src/views/hidden_review/index.vue
index e69de29b..53ae9df1 100644
--- a/src/views/hidden_review/index.vue
+++ b/src/views/hidden_review/index.vue
@@ -0,0 +1,266 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/icons/element-icons.js b/src/views/icons/element-icons.js
deleted file mode 100644
index 9ea4d63f..00000000
--- a/src/views/icons/element-icons.js
+++ /dev/null
@@ -1,3 +0,0 @@
-const elementIcons = ['platform-eleme', 'eleme', 'delete-solid', 'delete', 's-tools', 'setting', 'user-solid', 'user', 'phone', 'phone-outline', 'more', 'more-outline', 'star-on', 'star-off', 's-goods', 'goods', 'warning', 'warning-outline', 'question', 'info', 'remove', 'circle-plus', 'success', 'error', 'zoom-in', 'zoom-out', 'remove-outline', 'circle-plus-outline', 'circle-check', 'circle-close', 's-help', 'help', 'minus', 'plus', 'check', 'close', 'picture', 'picture-outline', 'picture-outline-round', 'upload', 'upload2', 'download', 'camera-solid', 'camera', 'video-camera-solid', 'video-camera', 'message-solid', 'bell', 's-cooperation', 's-order', 's-platform', 's-fold', 's-unfold', 's-operation', 's-promotion', 's-home', 's-release', 's-ticket', 's-management', 's-open', 's-shop', 's-marketing', 's-flag', 's-comment', 's-finance', 's-claim', 's-custom', 's-opportunity', 's-data', 's-check', 's-grid', 'menu', 'share', 'd-caret', 'caret-left', 'caret-right', 'caret-bottom', 'caret-top', 'bottom-left', 'bottom-right', 'back', 'right', 'bottom', 'top', 'top-left', 'top-right', 'arrow-left', 'arrow-right', 'arrow-down', 'arrow-up', 'd-arrow-left', 'd-arrow-right', 'video-pause', 'video-play', 'refresh', 'refresh-right', 'refresh-left', 'finished', 'sort', 'sort-up', 'sort-down', 'rank', 'loading', 'view', 'c-scale-to-original', 'date', 'edit', 'edit-outline', 'folder', 'folder-opened', 'folder-add', 'folder-remove', 'folder-delete', 'folder-checked', 'tickets', 'document-remove', 'document-delete', 'document-copy', 'document-checked', 'document', 'document-add', 'printer', 'paperclip', 'takeaway-box', 'search', 'monitor', 'attract', 'mobile', 'scissors', 'umbrella', 'headset', 'brush', 'mouse', 'coordinate', 'magic-stick', 'reading', 'data-line', 'data-board', 'pie-chart', 'data-analysis', 'collection-tag', 'film', 'suitcase', 'suitcase-1', 'receiving', 'collection', 'files', 'notebook-1', 'notebook-2', 'toilet-paper', 'office-building', 'school', 'table-lamp', 'house', 'no-smoking', 'smoking', 'shopping-cart-full', 'shopping-cart-1', 'shopping-cart-2', 'shopping-bag-1', 'shopping-bag-2', 'sold-out', 'sell', 'present', 'box', 'bank-card', 'money', 'coin', 'wallet', 'discount', 'price-tag', 'news', 'guide', 'male', 'female', 'thumb', 'cpu', 'link', 'connection', 'open', 'turn-off', 'set-up', 'chat-round', 'chat-line-round', 'chat-square', 'chat-dot-round', 'chat-dot-square', 'chat-line-square', 'message', 'postcard', 'position', 'turn-off-microphone', 'microphone', 'close-notification', 'bangzhu', 'time', 'odometer', 'crop', 'aim', 'switch-button', 'full-screen', 'copy-document', 'mic', 'stopwatch', 'medal-1', 'medal', 'trophy', 'trophy-1', 'first-aid-kit', 'discover', 'place', 'location', 'location-outline', 'location-information', 'add-location', 'delete-location', 'map-location', 'alarm-clock', 'timer', 'watch-1', 'watch', 'lock', 'unlock', 'key', 'service', 'mobile-phone', 'bicycle', 'truck', 'ship', 'basketball', 'football', 'soccer', 'baseball', 'wind-power', 'light-rain', 'lightning', 'heavy-rain', 'sunrise', 'sunrise-1', 'sunset', 'sunny', 'cloudy', 'partly-cloudy', 'cloudy-and-sunny', 'moon', 'moon-night', 'dish', 'dish-1', 'food', 'chicken', 'fork-spoon', 'knife-fork', 'burger', 'tableware', 'sugar', 'dessert', 'ice-cream', 'hot-water', 'water-cup', 'coffee-cup', 'cold-drink', 'goblet', 'goblet-full', 'goblet-square', 'goblet-square-full', 'refrigerator', 'grape', 'watermelon', 'cherry', 'apple', 'pear', 'orange', 'coffee', 'ice-tea', 'ice-drink', 'milk-tea', 'potato-strips', 'lollipop', 'ice-cream-square', 'ice-cream-round']
-
-export default elementIcons
diff --git a/src/views/icons/index.vue b/src/views/icons/index.vue
deleted file mode 100644
index 4c483db4..00000000
--- a/src/views/icons/index.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
+ {{
+ scope.row.hidden_danger__hidden_state == 1 ? '排查中' : scope.row.hidden_danger__hidden_state == 2 ? '待整改' :scope.row.hidden_danger__hidden_state == 3 ? '整改中' :scope.row.hidden_danger__hidden_state == 4 ? '待验收' : '已验收'
+ }}
+
+
+
+ {{ scope.row[d.prop] }}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/icons/svg-icons.js b/src/views/icons/svg-icons.js
deleted file mode 100644
index 1e3c66d2..00000000
--- a/src/views/icons/svg-icons.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const req = require.context('../../icons/svg', false, /\.svg$/)
-const requireAll = requireContext => requireContext.keys()
-
-const re = /\.\/(.*)\.svg/
-
-const svgIcons = requireAll(req).map(i => {
- return i.match(re)[1]
-})
-
-export default svgIcons
diff --git a/src/views/nested/menu1/index.vue b/src/views/nested/menu1/index.vue
deleted file mode 100644
index 30cb6701..00000000
--- a/src/views/nested/menu1/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
-
- {{ generateIconCode(item) }}
-
-
-
-
-
-
-
-
-
-
- {{ generateElementIconCode(item) }}
-
-
-
- {{ item }}
-
-
-
-
-
-
diff --git a/src/views/nested/menu1/menu1-1/index.vue b/src/views/nested/menu1/menu1-1/index.vue
deleted file mode 100644
index 27e173a6..00000000
--- a/src/views/nested/menu1/menu1-1/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
diff --git a/src/views/nested/menu1/menu1-2/index.vue b/src/views/nested/menu1/menu1-2/index.vue
deleted file mode 100644
index 0c86276e..00000000
--- a/src/views/nested/menu1/menu1-2/index.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
diff --git a/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue b/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue
deleted file mode 100644
index f87d88f4..00000000
--- a/src/views/nested/menu1/menu1-2/menu1-2-1/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
diff --git a/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue b/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue
deleted file mode 100644
index d88789f2..00000000
--- a/src/views/nested/menu1/menu1-2/menu1-2-2/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
diff --git a/src/views/nested/menu1/menu1-3/index.vue b/src/views/nested/menu1/menu1-3/index.vue
deleted file mode 100644
index f7cd0738..00000000
--- a/src/views/nested/menu1/menu1-3/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
diff --git a/src/views/nested/menu2/index.vue b/src/views/nested/menu2/index.vue
deleted file mode 100644
index 19dd48f0..00000000
--- a/src/views/nested/menu2/index.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
diff --git a/src/views/pdf/content.js b/src/views/pdf/content.js
deleted file mode 100644
index e62b1a2b..00000000
--- a/src/views/pdf/content.js
+++ /dev/null
@@ -1,58 +0,0 @@
-const title = 'Plans for the Next Iteration of Vue.js'
-
-const content = `Last week atVue.js LondonI gave a brief sneak peek of what’s coming in the next major version of Vue. This post provides an in-depth overview of the plan.
-
Why a new majorversion?
-Vue 2.0 was releasedexactly two years ago(how time flies!). During this period, the core has remained backwards compatible with five minor releases. We’ve accumulated a number of ideas that would bring improvements, but they were held off because they would result in breaking changes. At the same time, the JavaScript ecosystem and the language itself has been evolving rapidly. There are greatly improved tools that could enhance our workflow, and many new language features that could unlock simpler, more complete, and more efficient solutions to the problems Vue is trying to solve. What’s more exciting is that we are seeing ES2015 support becoming a baseline for all major evergreen browsers. Vue 3.0 aims to leverage these new language features to make Vue core smaller, faster, and more powerful.
-Vue 3.0 is currently in prototyping phase, and we have already implemented a runtime close to feature-parity with 2.x.Many of the items listed below are either already implemented, or confirmed to be feasible. Ones that are not yet implemented or still in exploration phase are marked with a *.
-The Details
-High-Level APIChanges
-TL;DR: Everything except render function API and scoped-slots syntax will either remain the same or can be made 2.x compatible via a compatibility build.-
Since it’s a new major, there is going to be some breaking changes. However, we take backwards compatibility seriously, so we want to start communicating these changes as soon as possible. Here’s the currently planned public API changes:
-- Template syntax will remain 99% the same. There may be small tweaks in scoped slots syntax, but other than that we have no plans to change anything else for templates.
- 3.0 will support class-based components natively, with the aim to provide an API that is pleasant to use in native ES2015 without requiring any transpilation or stage-x features. Most current options will have a reasonable mapping in the class-based API. Stage-x features such as class fields and decorators can still be used optionally to enhance the authoring experience. In addition, the API is designed with TypeScript type inference in mind. The 3.x codebase will itself be written in TypeScript, and providing improved TypeScript support. (That said, usage of TypeScript in an application is still entirely optional.)
- The 2.x object-based component format will still be supported by internally transforming the object to a corresponding class.
- Mixins will still be supported.*
- Top level APIs will likely receive an overhaul to avoid globally mutating the Vue runtime when installing plugins. Instead, plugins will be applied and scoped to a component tree. This will make it easier to test components that rely on specific plugins, and also make it possible to mount multiple Vue applications on the same page with different plugins, but using the same Vue runtime.*
- Functional components can finally be plain functions —however, async components will now need to be explicitly created via a helper function.
- The part that will receive the most changes is the Virtual DOM format used in render functions. We are currently collecting feedback from major library authors and will be sharing more details as we are more confident of the changes, but as long as you don’t heavily rely on hand-written (non-JSX) render functions in your app, upgrading should be a reasonably straightforward process.
Source Code Architecture
-TL;DR: better decoupled internal modules, TypeScript, and a codebase that is easier to contribute to.-
We are re-writing 3.0 from the ground up for a cleaner and more maintainable architecture, in particular trying to make it easier to contribute to. We are breaking some internal functionalities into individual packages in order to isolate the scope of complexity. For example, the observer module will become its own package, with its own public API and tests. Note this does not affect framework-level API— you will not have to manually import individual bits from multiple packages in order to use Vue. Instead, the final Vue package is assembled using these internal packages.
-The codebase is also now written in TypeScript. Although this will make proficiency in TypeScript a pre-requisite for contributing to the new codebase, we believe the type information and IDE support will actually make it easier for a new contributor to make meaningful contributions.
-Decoupling the observer and scheduler into separate packages also allows us to easily experiment with alternative implementations of these parts. For example, we can implement an IE11 compatible observer implementation with the same API, or an alternative scheduler that leveragesrequestIdleCallbackto yield to the browser during long updates.*
Observation Mechanism
-TL;DR: more complete, precise, efficient and debuggable reactivity tracking & API for creating observables.-
3.0 will ship with a Proxy-based observer implementation that provides reactivity tracking with full language coverage. This eliminates a number of limitations of Vue 2’s current implementation based onObject.defineProperty:
The new observer also features the following:
-Easily understand why a component is re-rendering
-
Other Runtime Improvements
-TL;DR: smaller, faster, tree-shakable features, fragments & portals, custom renderer API.-
Compiler Improvements*
-TL;DR: tree-shaking friendly output, more AOT optimizations, parser with better error info and source map support.-
IE11 Support*
-TL;DR: it will be supported, but in a separate build with the same reactivity limitations of Vue 2.x.-
The new codebase currently targets evergreen browsers only and assumes baseline native ES2015 support. But alas, we know a lot of our users still need to support IE11 for the foreseeable future. Most of the ES2015 features used can be transpiled / polyfilled for IE11, with the exception for Proxies. Our plan is to implement an alternative observer with the same API, but using the good old ES5Object.definePropertyAPI. A separate build of Vue 3.x will be distributed using this observer implementation. However, this build will be subject to the same change detection caveats of Vue 2.x and thus not fully compatible with the “modern” build of 3.x. We are aware that this imposes some inconvenience for library authors as they will need to be aware of compatibility for two different builds, but we will make sure to provide clear guidelines on this when we reach that stage.
How Do We GetThere
-First of all, although we are announcing it today, we do not have a definitive timeline yet. What we do know at the moment is the steps we will be taking to get there:
-1. Internal Feedback for the Runtime Prototype
-This is the phase we are in right now. Currently, we already have a working runtime prototype that includes the new observer, Virtual DOM and component implementation. We have invited a group of authors of influential community projects to provide feedback for the internal changes, and would like to make sure they are comfortable with the changes before moving forward. We want to ensure that important libraries in the ecosystem will be ready at the same time when we release 3.0, so that users relying on those projects can upgrade easily.
-2. Public Feedback viaRFCs
-Once we gain a certain level of confidence in the new design, for each breaking change we will be opening a dedicated RFC issue which includes:
-We will anticipate public feedback from the wider community to help us consolidate these ideas.
-3. Introduce Compatible Features in 2.x &2.x-next
-We are not forgetting about 2.x! In fact, we plan to use 2.x to progressively accustom users to the new changes. We will be gradually introducing confirmed API changes into 2.x via opt-in adaptors, and 2.x-next will allow users to try out the new Proxy-based observer.
-The last minor release in 2.x will become LTS and continue to receive bug and security fixes for 18 months when 3.0 is released.
-4. AlphaPhase
-Next, we will finish up the compiler and server-side rendering parts of 3.0 and start making alpha releases. These will mostly be for stability testing purposes in small greenfield apps.
-5. BetaPhase
-During beta phase, our main goal is updating support libraries and tools like Vue Router, Vuex, Vue CLI, Vue DevTools and make sure they work smoothly with the new core. We will also be working with major library authors from the community to help them get ready for 3.0.
-6. RCPhase
-Once we consider the API and codebase stable, we will enter RC phase with API freeze. During this phase we will also work on a “compat build”: a build of 3.0 that includes compatibility layers for 2.x API. This build will also ship with a flag you can turn on to emit deprecation warnings for 2.x API usage in your app. The compat build can be used as a guide to upgrade your app to 3.0.
-7. IE11build
-The last task before the final release will be the IE11 compatibility build as mentioned above.
-8. FinalRelease
-In all honesty, we don’t know when this will happen yet, but likely in 2019. Again, we care more about shipping something that is solid and stable rather than hitting specific dates. There is a lot of work to be done, but we are excited for what’s coming next!
` - -const data = { - title, - content -} - -export default data diff --git a/src/views/pdf/download.vue b/src/views/pdf/download.vue deleted file mode 100644 index a348c697..00000000 --- a/src/views/pdf/download.vue +++ /dev/null @@ -1,201 +0,0 @@ - -
-
-
-
-
-
-
diff --git a/src/views/pdf/index.vue b/src/views/pdf/index.vue
deleted file mode 100644
index 86278b38..00000000
--- a/src/views/pdf/index.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
- Click to download PDF
-
-
-
-
-
diff --git a/src/views/qiniu/upload.vue b/src/views/qiniu/upload.vue
deleted file mode 100644
index 9dc9aeda..00000000
--- a/src/views/qiniu/upload.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
- 将文件拖到此处，或点击上传
-
-
@@ -24,8 +30,13 @@
scope.row.ssafe_insp__insp_state == 1 ? '巡检中' : '已巡检'
}}
+
+ {{
+ parseDay(scope.row.safe_insp__insp_date)
+ }}
+
-
{{ scope.row[d.prop] }}
@@ -44,38 +55,12 @@
/>
- mounted times ：{{ createdTimes }}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/table/complex-table.vue b/src/views/table/complex-table.vue
deleted file mode 100644
index 295c5fc4..00000000
--- a/src/views/table/complex-table.vue
+++ /dev/null
@@ -1,379 +0,0 @@
-
-
-
-
-
- {{ row.id }}
-
-
-
-
- {{ row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }}
-
-
-
-
- {{ row.title }}
- {{ row.type | typeFilter }}
-
-
-
-
- {{ row.author }}
-
-
-
-
- {{ row.reviewer }}
-
-
-
-
-
-
-
- {{ row.pageviews }}
- 0
-
-
-
-
-
- {{ row.status }}
-
-
-
-
-
-
- Edit
-
-
- Publish
-
-
- Draft
-
-
- Delete
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/table/drag-table.vue b/src/views/table/drag-table.vue
deleted file mode 100644
index 3b5c890a..00000000
--- a/src/views/table/drag-table.vue
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
-
-
-
-
-
- Search
-
-
- Add
-
-
- Export
-
-
- reviewer
-
-
-
-
-
-
-
-
- {{ row.id }}
-
-
-
-
-
- {{ row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }}
-
-
-
-
-
- {{ row.title }}
-
-
-
-
-
- {{ row.author }}
-
-
-
-
-
-
-
-
-
- {{ row.pageviews }}
-
-
-
-
-
-
- {{ row.status }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/table/dynamic-table/components/FixedThead.vue b/src/views/table/dynamic-table/components/FixedThead.vue
deleted file mode 100644
index c3deb925..00000000
--- a/src/views/table/dynamic-table/components/FixedThead.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
- The default order : {{ oldList }}
-
-
- The after dragging order : {{ newList }}
-
-
-
-
-
- {{ scope.row[fruit] }}
-
-
-
-
-
-
-
-
diff --git a/src/views/table/dynamic-table/components/UnfixedThead.vue b/src/views/table/dynamic-table/components/UnfixedThead.vue
deleted file mode 100644
index 831b070a..00000000
--- a/src/views/table/dynamic-table/components/UnfixedThead.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
-
- apple
-
-
- banana
-
-
- orange
-
-
-
-
-
-
-
-
- {{ scope.row[fruit] }}
-
-
-
-
-
-
-
diff --git a/src/views/table/dynamic-table/index.vue b/src/views/table/dynamic-table/index.vue
deleted file mode 100644
index 5a4dd363..00000000
--- a/src/views/table/dynamic-table/index.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- apple
-
-
- banana
-
-
- orange
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/table/inline-edit-table.vue b/src/views/table/inline-edit-table.vue
deleted file mode 100644
index 31e0065f..00000000
--- a/src/views/table/inline-edit-table.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
- Fixed header, sorted by header order,
-
-
- Not fixed header, sorted by click order
-
-
-
-
-
- {{ row.id }}
-
-
-
-
-
- {{ row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }}
-
-
-
-
-
- {{ row.author }}
-
-
-
-
-
-
-
-
-
-
- {{ row.status }}
-
-
-
-
-
-
-
-
- cancel
-
-
- {{ row.title }}
-
-
-
-
-
-
- Ok
-
-
- Edit
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/theme/index.vue b/src/views/theme/index.vue
deleted file mode 100644
index 0af7711a..00000000
--- a/src/views/theme/index.vue
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/zip/index.vue b/src/views/zip/index.vue
deleted file mode 100644
index 412608f8..00000000
--- a/src/views/zip/index.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
- Change Theme :
-
-
-
- Primary
-
-
- Success
-
-
- Info
-
-
- Warning
-
-
- Danger
-
-
-
-
-
- Search
-
-
- Upload
-
-
-
-
-
-
- {{ tag.name }}
-
-
-
-
-
-
- Option A
-
-
- Option B
-
-
- Option C
-
-
-
-
-
-
-
-
- Export Zip
-
-
-
-
- {{ scope.$index }}
-
-
-
-
- {{ scope.row.title }}
-
-
-
-
- {{ scope.row.author }}
-
-
-
-
- {{ scope.row.pageviews }}
-
-
-
-
-
- {{ scope.row.display_time }}
-
-
-
-
-
-
-
diff --git a/vue.config.js b/vue.config.js
index 8095e592..57087878 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,13 +18,13 @@ const port = process.env.port || process.env.npm_config_port || 9527 // dev port
// All configuration item explanations can be find in https://cli.vuejs.org/config/
module.exports = {
/**
- * You will need to set publicPath if you plan to deploy your site under a sub path,
- * for example GitHub Pages. If you plan to deploy your site to https://foo.github.io/bar/,
- * then publicPath should be set to "/bar/".
- * In most cases please use '/' !!!
+ * You will need to set publicPath if you plan to deploy your site under a sub path,
+ * for example GitHub Pages. If you plan to deploy your site to https://foo.github.io/bar/,
+ * then publicPath should be set to "/bar/".
+ * In most cases please use '/' !!!
* Detail: https://cli.vuejs.org/config/#publicpath
*/
- publicPath: '/',
+ publicPath: '/bwhse',
outputDir: 'dist',
assetsDir: 'static',
lintOnSave: process.env.NODE_ENV === 'development',