diff --git a/mock/role/routes.js b/mock/role/routes.js
index 1ba6711a..1f93de1f 100644
--- a/mock/role/routes.js
+++ b/mock/role/routes.js
@@ -383,19 +383,19 @@ const asyncRoutes = [
]
},
- {
- path: '/error-log',
- component: 'layout/Layout',
- redirect: 'noRedirect',
- children: [
- {
- path: 'log',
- component: 'views/error-log/index',
- name: 'ErrorLog',
- meta: { title: 'Error Log', icon: 'bug' }
- }
- ]
- },
+ // {
+ // path: '/error-log',
+ // component: 'layout/Layout',
+ // redirect: 'noRedirect',
+ // children: [
+ // {
+ // path: 'log',
+ // component: 'views/error-log/index',
+ // name: 'ErrorLog',
+ // meta: { title: 'Error Log', icon: 'bug' }
+ // }
+ // ]
+ // },
{
path: '/excel',
diff --git a/public/index.html b/public/index.html
index e9185009..1add1b0c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
-
+
<%= webpackConfig.name %>
diff --git a/public/portrait.jpg b/public/portrait.jpg
new file mode 100644
index 00000000..3ec5b7ad
Binary files /dev/null and b/public/portrait.jpg differ
diff --git a/src/components/check_attach/api/index.js b/src/components/check_attach/api/index.js
new file mode 100644
index 00000000..0efbf891
--- /dev/null
+++ b/src/components/check_attach/api/index.js
@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+export default {
+ getDate(pageSize, pageNo, data_id, table_name) {
+ return request({
+ url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_attach&user_id=administrator`,
+ method: 'post',
+ data: `start=${pageNo}&limit=${pageSize}&where_sql=sys_attach.data_id = ? and sys_attach.table_name = ?&where_type=string;string&where_value=${data_id};${table_name}`
+ }).then(response => response.data)
+ },
+ Delete(ids) {
+ let keys = ''
+ ids.forEach(d => {
+ keys += 'keyid=' + d + '&'
+ })
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=sys_attach&${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=safe_insp&user_id=administrator`,
+ method: 'post',
+ data: `start=0&limit=10&where_sql=safe_insp.safe_insp_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0`
+ }).then(response => response.data)
+ },
+ downLoad(keys) {
+ return request({
+ url: `fileAction.do?funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=administrator&dataType=byte&_dc=`,
+ method: 'post',
+ data: `funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=administrator&dataType=byte&_dc=`
+ }).then(response => response.data)
+ }
+}
diff --git a/src/components/check_attach/index.vue b/src/components/check_attach/index.vue
new file mode 100644
index 00000000..01c6bbeb
--- /dev/null
+++ b/src/components/check_attach/index.vue
@@ -0,0 +1,324 @@
+
+
+
+
+
+ 点击上传
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row[d.prop] }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/sys_attach/api/index.js b/src/components/sys_attach/api/index.js
new file mode 100644
index 00000000..0efbf891
--- /dev/null
+++ b/src/components/sys_attach/api/index.js
@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+export default {
+ getDate(pageSize, pageNo, data_id, table_name) {
+ return request({
+ url: `/commonAction.do?eventcode=query_data&funid=queryevent&pagetype=editgrid&query_funid=sys_attach&user_id=administrator`,
+ method: 'post',
+ data: `start=${pageNo}&limit=${pageSize}&where_sql=sys_attach.data_id = ? and sys_attach.table_name = ?&where_type=string;string&where_value=${data_id};${table_name}`
+ }).then(response => response.data)
+ },
+ Delete(ids) {
+ let keys = ''
+ ids.forEach(d => {
+ keys += 'keyid=' + d + '&'
+ })
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=sys_attach&${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=safe_insp&user_id=administrator`,
+ method: 'post',
+ data: `start=0&limit=10&where_sql=safe_insp.safe_insp_id = ?&where_value=${id}&where_type=string&is_query=1&query_type=0`
+ }).then(response => response.data)
+ },
+ downLoad(keys) {
+ return request({
+ url: `fileAction.do?funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=administrator&dataType=byte&_dc=`,
+ method: 'post',
+ data: `funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=administrator&dataType=byte&_dc=`
+ }).then(response => response.data)
+ }
+}
diff --git a/src/components/sys_attach/index.vue b/src/components/sys_attach/index.vue
new file mode 100644
index 00000000..77219335
--- /dev/null
+++ b/src/components/sys_attach/index.vue
@@ -0,0 +1,329 @@
+
+
+
+
+
+ 点击上传
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row[d.prop] }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/settings.js b/src/settings.js
index 1ebc7f29..9971d98b 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,5 +1,5 @@
module.exports = {
- title: 'Vue Element Admin',
+ title: '',
/**
* @type {boolean} true | false
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 6fe4e874..4650e4cd 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -135,3 +135,14 @@
color: #000;
background-color: #fff;
}
+
+//设置el-dialog样式
+.el-dialog__body {
+ padding: 0px 20px;
+}
+.el-dialog__header {
+ padding: 10px 20px;
+}
+.el-dialog__footer {
+ padding: 10px 20px;
+}
diff --git a/src/utils/get-page-title.js b/src/utils/get-page-title.js
index cab7fd91..1c2b8662 100644
--- a/src/utils/get-page-title.js
+++ b/src/utils/get-page-title.js
@@ -1,10 +1,11 @@
import defaultSettings from '@/settings'
-const title = defaultSettings.title || 'Vue Element Admin'
+const title = defaultSettings.title
export default function getPageTitle(pageTitle) {
if (pageTitle) {
- return `${pageTitle} - ${title}`
+ // return `${pageTitle} - ${title}` 网站页面标签
+ return `${pageTitle}`
}
return `${title}`
}
diff --git a/src/views/hidden_check/api/index.js b/src/views/hidden_check/api/index.js
index 3c8e8bcc..211ea059 100644
--- a/src/views/hidden_check/api/index.js
+++ b/src/views/hidden_check/api/index.js
@@ -59,5 +59,12 @@ export default {
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)
+ },
+ queryAttach(keyids) {
+ return request({
+ url: `/commonAction.do`,
+ method: 'post',
+ data: `funid=queryevent&pagetype=grid&eventcode=query_attach&tablename=hidden_danger&keyids=${keyids}&is_queryrelat=0&user_id=administrator&dataType=json&query_type=0&has_page=0`
+ }).then(response => response.data)
}
}
diff --git a/src/views/hidden_check/index.vue b/src/views/hidden_check/index.vue
index a34f2e50..5588b1c2 100644
--- a/src/views/hidden_check/index.vue
+++ b/src/views/hidden_check/index.vue
@@ -5,27 +5,36 @@
- {{
+ {{
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 ? '待验收' : '已验收'
- }}
+ }}
+
+
+ {{ parseDay(scope.row.hidden_danger__check_date) }}
+
{{ scope.row[d.prop] }}
@@ -43,21 +52,44 @@
@current-change="pageChange"
/>
+
+
+
+
+
+
+
+
+