From 33762ffb8e0ff0683b704feb1d6b30147e2c564a Mon Sep 17 00:00:00 2001 From: dengfuchuan <389068019@qq.com> Date: Sat, 10 Apr 2021 10:38:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9A=90=E6=82=A3=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/1.png | Bin 0 -> 2436 bytes src/assets/images/2.png | Bin 0 -> 2494 bytes src/assets/images/3.png | Bin 0 -> 3510 bytes src/components/HeaderMessage/index.vue | 10 +- src/components/selDept/index.vue | 731 ++++++++-------- src/components/show_images/api/index.js | 40 + src/components/show_images/index.vue | 262 ++++++ src/store/getters.js | 34 +- src/store/modules/user.js | 34 +- src/styles/element-ui.scss | 35 + src/utils/index.js | 800 +++++++++--------- src/views/dashboard/admin/index.vue | 238 +++--- .../hidden_check/components/create/index.vue | 21 +- .../components/edit_form/index.vue | 30 +- .../components/edit_form/index.vue | 20 +- src/views/hidden_reform/index.vue | 4 + .../components/edit_form/index.vue | 23 +- src/views/hidden_review/index.vue | 7 +- .../insp_name/components/edit_form/index.vue | 4 +- .../safe_insp/components/create/index.vue | 6 +- .../safe_insp/components/edit_form/index.vue | 6 +- .../safe_insp/components/insp_det/index.vue | 11 +- src/views/sys_dept/components/auditDept.vue | 184 ++-- src/views/sys_dept/index.vue | 7 +- src/views/sys_user/components/auditUser.vue | 430 +++++----- src/views/sys_user/index.vue | 2 +- 26 files changed, 1705 insertions(+), 1234 deletions(-) create mode 100644 src/assets/images/1.png create mode 100644 src/assets/images/2.png create mode 100644 src/assets/images/3.png create mode 100644 src/components/show_images/api/index.js create mode 100644 src/components/show_images/index.vue diff --git a/src/assets/images/1.png b/src/assets/images/1.png new file mode 100644 index 0000000000000000000000000000000000000000..72818b50c73cb5de9586623f530f19aa8a1a1279 GIT binary patch literal 2436 zcmeH}SyYqP8itebQ~qGUK(L4wOaelaB9mAJlqL``0Sz=@0ii-6$czxAfGCg%DMKR! zP=){njiEA0lww7c3Nc}_${>N3(J+)Mq6~?MmHua~b9rvg#aZiI^kVOQvDdray}rGl z_uDz1^rKpuyEI`im==vnVL)s5zXtdbG&lM-Rl#6LcN&H4oqTGk!aw`U2|cd7ie_kd zd~fBzpk5*)%GCBc_8xlu>f!1T+;21!g09*%%uaGv2$HX7;+yQHuj?Y>_-IXLifl~m z-K-3S4Tk}z6wQPOI|(@~*3w_;TU-0Wj!d>GCtqBcOnIC5398c)Bvtz(;Gd&2NGbrG zc~cvFza0+D^r<1hPB{!11YaWyr93Y>h|Mm#np5TqBM<%@-;0C;@eEt*ArMR5b&zg{ z%fQleO;7KF12lz{U80Qe7yfgwpoA7qmR-j2}GZ)N$9*iT5 zR}^Cq;B#SkutjS(a)Oa7^p5x2BEbKRDanGv{JnOq=+^{=OK0*T3N!fCU009L znRf5K?SlrFvgXwq<>8tmuehWh4%5HfvbbVUCkI>JGRuJ76Q*V;F zUas-Ula?&?B`?E;Wt{>U+3wBIOxG(&m8p03W zYp-9={JpESd3ySNRe>amn@o0$sQB~*YxJ|`?(s0;?Z{)k$i(dVci+-*Uafho)DP|Y45}|H{cGkeg6$nkOV$4IKqCamFlyRrUw0Ura7c8`lTW-3C@oOpUyq)wc=qmUrxVQy&f7qVwyV@nZ{&q;I3ZJc}#u^f<+Co~dbT z0sI+Ncx_qVcfZ)*XdBh#{<^hq-5#Lr)lZFmP2nTmLp-bl?b$yF?F9zh{!QW>5unvv zVTtNWx@Q+C=K_CVmG8f<6Rx$M5OzI)jU@~-p4ggyY+yrJw_R|<6@=z>HK**6o?>Ig z61TFO0-}wQ&4`_jCbF>(P7~vHVwpmH?5DMOyMb0~C2rnD_#}wm^CUMjGER?N9ZOFH zaetcadagdE8jjqE4|CVqI42Qc_FxQ#pBi5cNWfWm^H9d8_wdGclY_(OtW$^1@&(I} z6{fGU_hvwjnx)HMI0+*{;oDb*dKOgq!a$<;Fa zcRV04z9hFf9{9-hg6#W2tS5^7ZU_EAh>(@8v5^v%huXYW+T5 zF?{&>a}uTGJR9IzU>2Ww*Q9IQeeJhxs*%_nU3JOK(}BjEzP1C+Ty{Q_-EsuefiuH; zV%bmKnQzi%!YAx5-*;3sY61iRyOnhOEJj> zuxpRzRZRYMwPv&d0XKvL1M$JV1SpYC9u_A8Xo@U{PzzZ_ypfDR7KUb`3SAPq_7TP( zI^NleQkEMOG9PpEQrvw6}qP9ZSv${sr!g3m0SX&QSe z8Hs1jW?dRh=y$I6L>$nnoKY@46FX40v1oWUWL)+N8U_h}|Q2sFeH?(Wxp%a}) zO7iDTsYZQq8bAX?O%$&=p8!!^r+q~X_56kdosJ@i>KpdHQmD&|N5IWeh-%TFK?YF} pYA20fhUCIHrF9oW|BuAe9#7v-D7Dk-Vxiv^jOIe8G&u!v{styz05|{u literal 0 HcmV?d00001 diff --git a/src/assets/images/2.png b/src/assets/images/2.png new file mode 100644 index 0000000000000000000000000000000000000000..ac090dcb1adf0885856ac34fc06147f1468777fd GIT binary patch literal 2494 zcmeHJdo+~m9vAwelY z3lQLi`D4h0_N|&7cd3K^N8&$<)aCAWgv!OAjAMM4A;j zFzc(!$mMU`RIi(^Gs^k%CyIU8){8N4PUVGtuRAWRRE|S+uiX2veSFDDQw;K(sC3~H zJDb^-+P}CPmixdi=M_wpZ8PUoNiBr-XJi!_Wm+%Nxa_v7%xji!o34sw{v4o6v$_Oe z;@G&brdyfq1V97AD~UD!ay-TFLe3zP;&i%jI9B1^zhL8x>d9OPHIBWt)gI2ps?R{ zoV`+JPi>KYkYR)#Sz1^9G<>II<3Ki}37bZn9kU7`xYY zbJs{mhkl5M1IgcMaT>}}&~FY%x`1|CP=)xlGRr)vJDQ^k&WDkw7L-kz=DFrX`;iez zq+zCrQLz#3V;T9Zs9k+$6tvO$Hf6A?(%;#nvrD#}20)v{%#wN4>?-@szV8iJGgo8a zVAq=4H97sA`m&|frFi;wt)1?7Mpe16LmeUA%LLW9p43`VyweLXjdJ`SvU<=j8Rq+s zH)2o9viU;a4?AvUTXu#k5OIpQ0@bKj<(0h*HvhoVudt>|wo|w$@oYimHm^@_!{~`9 zI6Ppc+)3;o)<$kMV?$OB)yAmPs%4!aAo1PB$7{kd3qcKmy4p=3MXoIVi)31;B5_$V z-~B4KOBq31H$VXPA9Nb(p;!R|FSNvE0bKZRa9p%(G6v|*D)XGb%01Q;&jieGrzv&t z%LQklN4To>r?wbq7woh*F?SPMJ%7zq@c${$@M4)WvA%dt&JabE=JukM{vLu@Ds)WF zP4`3}=k7frk3OY<{Xa#HG{DDx>VXr;fvw~5VO~IdgZ@|`S2x_t#+hRf#Zs#+XDpa< zKklHS7y<2AV(X=0=rf9+=pEdjvBnANJw}7;;%Z?Ho_|vl5@52n>FSWOZ!Kx~h3eMm zGu&YPvyfN-SOdGwXI;uT1L_&6J=v+aZqmW^x*t{hZYO<+PyA9Tql$@RXs8m7MwkVI z_|hZI7MV|G08CrzHvl z*o%fNWtRs9o&PqQv2_5r3+W8}Opc8lO5P3?9+!hYBkp_6aN|+zpOGW zpaIbceps;e94~eWB0$_uF7QHMMJB~ww

{SWwi%`vwPu|6A{&!ANXgUJ{0@?PNhi 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 literal 0 HcmV?d00001 diff --git a/src/components/HeaderMessage/index.vue b/src/components/HeaderMessage/index.vue index 552853ce..39c7e5e5 100644 --- a/src/components/HeaderMessage/index.vue +++ b/src/components/HeaderMessage/index.vue @@ -10,14 +10,14 @@ > - + 待整改 ({{ 11 }}) - + 待验收 ({{ 22 }}) @@ -83,6 +83,12 @@ export default { mounted() { }, methods: { + jumpReform() { + this.$router.push({ path: '/hidden_danger/hidden_reform', query: { isBacklog: true }}) + }, + jumpReview() { + this.$router.push({ path: '/hidden_danger/hidden_review', query: { isBacklog: true }}) + } } } diff --git a/src/components/selDept/index.vue b/src/components/selDept/index.vue index 739d7c11..ffd6ac8c 100644 --- a/src/components/selDept/index.vue +++ b/src/components/selDept/index.vue @@ -1,364 +1,367 @@ - - - - + + + + diff --git a/src/components/show_images/api/index.js b/src/components/show_images/api/index.js new file mode 100644 index 00000000..f189942b --- /dev/null +++ b/src/components/show_images/api/index.js @@ -0,0 +1,40 @@ +import request from '@/utils/request' +import store from '@/store/modules/user' + +var roles = store.state.roles.replace(/;/g, '') + +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=${roles}`, + 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=${roles}&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=${roles}`, + 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) { + const timestamp = new Date().getTime() + return request({ + url: `fileAction.do?funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=${roles}&dataType=byte&_dc=${timestamp}`, + method: 'get' + // data: `funid=sys_attach&keyid=${keys}&pagetype=editgrid&eventcode=down&user_id=${roles}&dataType=byte&_dc=${timestamp}` + }) + } +} diff --git a/src/components/show_images/index.vue b/src/components/show_images/index.vue new file mode 100644 index 00000000..a3e6df0e --- /dev/null +++ b/src/components/show_images/index.vue @@ -0,0 +1,262 @@ + + + + diff --git a/src/store/getters.js b/src/store/getters.js index 8fcf5a59..52928b23 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -1,15 +1,19 @@ -const getters = { - sidebar: state => state.app.sidebar, - size: state => state.app.size, - device: state => state.app.device, - visitedViews: state => state.tagsView.visitedViews, - cachedViews: state => state.tagsView.cachedViews, - token: state => state.user.token, - avatar: state => state.user.avatar, - name: state => state.user.name, - introduction: state => state.user.introduction, - roles: state => state.user.roles, - permission_routes: state => state.permission.routes, - errorLogs: state => state.errorLog.logs -} -export default getters +const getters = { + sidebar: state => state.app.sidebar, + size: state => state.app.size, + device: state => state.app.device, + visitedViews: state => state.tagsView.visitedViews, + cachedViews: state => state.tagsView.cachedViews, + token: state => state.user.token, + userName: state => state.user.userName, + userId: state => state.user.userId, + deptName: state => state.user.deptName, + deptId: state => state.user.deptId, + avatar: state => state.user.avatar, + name: state => state.user.name, + introduction: state => state.user.introduction, + roles: state => state.user.roles, + permission_routes: state => state.permission.routes, + errorLogs: state => state.errorLog.logs +} +export default getters diff --git a/src/store/modules/user.js b/src/store/modules/user.js index c7aef027..81131d0a 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -8,7 +8,11 @@ const state = { name: '', avatar: '', introduction: '', - roles: [] + roles: [], + userName: '', + userId: '', + deptName: '', + deptId: '' } const mutations = { @@ -26,6 +30,18 @@ const mutations = { }, SET_ROLES: (state, roles) => { state.roles = roles + }, + USER_NAME: (state, userName) => { + state.userName = userName + }, + USER_ID: (state, userId) => { + state.userId = userId + }, + DEPT_NAME: (state, deptName) => { + state.deptName = deptName + }, + DEPT_ID: (state, deptId) => { + state.deptId = deptId } } @@ -39,8 +55,16 @@ const actions = { commit('SET_ROLES', res.data.data.role_id) // const { data } = res.data commit('SET_TOKEN', 'bwhse') + commit('USER_NAME', res.data.data.user_name) + commit('USER_ID', res.data.data.user_id) + commit('DEPT_NAME', res.data.data.dept_name) + commit('DEPT_ID', res.data.data.dept_id) setToken('bwhse') sessionStorage.setItem('ROLES', res.data.data.role_id) + sessionStorage.setItem('USER_NAME', res.data.data.user_name) + sessionStorage.setItem('USER_ID', res.data.data.user_id) + sessionStorage.setItem('DEPT_NAME', res.data.data.dept_name) + sessionStorage.setItem('DEPT_ID', res.data.data.dept_id) resolve() } else { Vue.prototype.$message.error(res.data.message) @@ -85,6 +109,10 @@ const actions = { // logout(state.token).then(() => { commit('SET_TOKEN', '') commit('SET_ROLES', []) + commit('USER_NAME', '') + commit('USER_ID', '') + commit('DEPT_NAME', '') + commit('DEPT_ID', '') sessionStorage.clear removeToken() resetRouter() @@ -104,6 +132,10 @@ const actions = { getRoles({ commit }, roles) { return new Promise(resolve => { commit('SET_ROLES', roles) + commit('USER_NAME', sessionStorage.getItem('USER_NAME')) + commit('USER_ID', sessionStorage.getItem('USER_ID')) + commit('DEPT_NAME', sessionStorage.getItem('DEPT_NAME')) + commit('DEPT_ID', sessionStorage.getItem('DEPT_ID')) resolve() }) }, diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index 6282c714..202c2844 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -158,3 +158,38 @@ // .el-input--medium .el-input__icon { // line-height: 26.8px; // } + +.el-tree .el-tree-node__expand-icon.expanded { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); +} +//有子节点 且未展开 +.el-tree .el-icon-caret-right:before { + background: url("../assets/images/1.png") no-repeat; + content: ""; + display: block; + width: 16px; + height: 16px; + font-size: 16px; + background-size: 16px; +} +//有子节点 且已展开 +.el-tree .el-tree-node__expand-icon.expanded.el-icon-caret-right:before { + background: url("../assets/images/2.png") no-repeat 0 3px; + content: ""; + display: block; + width: 16px; + height: 16px; + font-size: 16px; + background-size: 16px; +} +//没有子节点 +.el-tree .el-tree-node__expand-icon.is-leaf::before { + background: url("../assets/images/3.png") no-repeat; + content: ""; + display: block; + width: 16px; + height: 16px; + font-size: 16px; + background-size: 16px; +} diff --git a/src/utils/index.js b/src/utils/index.js index dc208f1c..79d44e7a 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,400 +1,400 @@ -/** - * Created by PanJiaChen on 16/11/18. - */ - -/** - * Parse the time to string - * @param {(Object|string|number)} time - * @param {string} cFormat - * @returns {string | null} - */ -export function parseTime(time, cFormat) { - if (arguments.length === 0 || !time) { - return null - } - const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}' - 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() + 1, - 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 -} - -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 - * @returns {string} - */ -export function formatTime(time, option) { - if (('' + time).length === 10) { - time = parseInt(time) * 1000 - } else { - time = +time - } - const d = new Date(time) - const now = Date.now() - - const diff = (now - d) / 1000 - - if (diff < 30) { - return '刚刚' - } else if (diff < 3600) { - // less 1 hour - return Math.ceil(diff / 60) + '分钟前' - } else if (diff < 3600 * 24) { - return Math.ceil(diff / 3600) + '小时前' - } else if (diff < 3600 * 24 * 2) { - return '1天前' - } - if (option) { - return parseTime(time, option) - } else { - return ( - d.getMonth() + - 1 + - '月' + - d.getDate() + - '日' + - d.getHours() + - '时' + - d.getMinutes() + - '分' - ) - } -} - -/** - * @param {string} url - * @returns {Object} - */ -export function getQueryObject(url) { - url = url == null ? window.location.href : url - const search = url.substring(url.lastIndexOf('?') + 1) - const obj = {} - const reg = /([^?&=]+)=([^?&=]*)/g - search.replace(reg, (rs, $1, $2) => { - const name = decodeURIComponent($1) - let val = decodeURIComponent($2) - val = String(val) - obj[name] = val - return rs - }) - return obj -} - -/** - * @param {string} input value - * @returns {number} output value - */ -export function byteLength(str) { - // returns the byte length of an utf8 string - let s = str.length - for (var i = str.length - 1; i >= 0; i--) { - const code = str.charCodeAt(i) - if (code > 0x7f && code <= 0x7ff) s++ - else if (code > 0x7ff && code <= 0xffff) s += 2 - if (code >= 0xDC00 && code <= 0xDFFF) i-- - } - return s -} - -/** - * @param {Array} actual - * @returns {Array} - */ -export function cleanArray(actual) { - const newArray = [] - for (let i = 0; i < actual.length; i++) { - if (actual[i]) { - newArray.push(actual[i]) - } - } - return newArray -} - -/** - * @param {Object} json - * @returns {Array} - */ -export function param(json) { - if (!json) return '' - return cleanArray( - Object.keys(json).map(key => { - if (json[key] === undefined) return '' - return encodeURIComponent(key) + '=' + encodeURIComponent(json[key]) - }) - ).join('&') -} - -/** - * @param {string} url - * @returns {Object} - */ -export function param2Obj(url) { - const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') - if (!search) { - return {} - } - const obj = {} - const searchArr = search.split('&') - searchArr.forEach(v => { - const index = v.indexOf('=') - if (index !== -1) { - const name = v.substring(0, index) - const val = v.substring(index + 1, v.length) - obj[name] = val - } - }) - return obj -} - -/** - * @param {string} val - * @returns {string} - */ -export function html2Text(val) { - const div = document.createElement('div') - div.innerHTML = val - return div.textContent || div.innerText -} - -/** - * Merges two objects, giving the last one precedence - * @param {Object} target - * @param {(Object|Array)} source - * @returns {Object} - */ -export function objectMerge(target, source) { - if (typeof target !== 'object') { - target = {} - } - if (Array.isArray(source)) { - return source.slice() - } - Object.keys(source).forEach(property => { - const sourceProperty = source[property] - if (typeof sourceProperty === 'object') { - target[property] = objectMerge(target[property], sourceProperty) - } else { - target[property] = sourceProperty - } - }) - return target -} - -/** - * @param {HTMLElement} element - * @param {string} className - */ -export function toggleClass(element, className) { - if (!element || !className) { - return - } - let classString = element.className - const nameIndex = classString.indexOf(className) - if (nameIndex === -1) { - classString += '' + className - } else { - classString = - classString.substr(0, nameIndex) + - classString.substr(nameIndex + className.length) - } - element.className = classString -} - -/** - * @param {string} type - * @returns {Date} - */ -export function getTime(type) { - if (type === 'start') { - return new Date().getTime() - 3600 * 1000 * 24 * 90 - } else { - return new Date(new Date().toDateString()) - } -} - -/** - * @param {Function} func - * @param {number} wait - * @param {boolean} immediate - * @return {*} - */ -export function debounce(func, wait, immediate) { - let timeout, args, context, timestamp, result - - const later = function() { - // 据上一次触发时间间隔 - const last = +new Date() - timestamp - - // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait - if (last < wait && last > 0) { - timeout = setTimeout(later, wait - last) - } else { - timeout = null - // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用 - if (!immediate) { - result = func.apply(context, args) - if (!timeout) context = args = null - } - } - } - - return function(...args) { - context = this - timestamp = +new Date() - const callNow = immediate && !timeout - // 如果延时不存在，重新设定延时 - if (!timeout) timeout = setTimeout(later, wait) - if (callNow) { - result = func.apply(context, args) - context = args = null - } - - return result - } -} - -/** - * This is just a simple version of deep copy - * Has a lot of edge cases bug - * If you want to use a perfect deep copy, use lodash's _.cloneDeep - * @param {Object} source - * @returns {Object} - */ -export function deepClone(source) { - if (!source && typeof source !== 'object') { - throw new Error('error arguments', 'deepClone') - } - const targetObj = source.constructor === Array ? [] : {} - Object.keys(source).forEach(keys => { - if (source[keys] && typeof source[keys] === 'object') { - targetObj[keys] = deepClone(source[keys]) - } else { - targetObj[keys] = source[keys] - } - }) - return targetObj -} - -/** - * @param {Array} arr - * @returns {Array} - */ -export function uniqueArr(arr) { - return Array.from(new Set(arr)) -} - -/** - * @returns {string} - */ -export function createUniqueString() { - const timestamp = +new Date() + '' - const randomNum = parseInt((1 + Math.random()) * 65536) + '' - return (+(randomNum + timestamp)).toString(32) -} - -/** - * Check if an element has a class - * @param {HTMLElement} elm - * @param {string} cls - * @returns {boolean} - */ -export function hasClass(ele, cls) { - return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)')) -} - -/** - * Add class to element - * @param {HTMLElement} elm - * @param {string} cls - */ -export function addClass(ele, cls) { - if (!hasClass(ele, cls)) ele.className += ' ' + cls -} - -/** - * Remove class from element - * @param {HTMLElement} elm - * @param {string} cls - */ -export function removeClass(ele, cls) { - if (hasClass(ele, cls)) { - const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)') - ele.className = ele.className.replace(reg, ' ') - } -} +/** + * Created by PanJiaChen on 16/11/18. + */ + +/** + * Parse the time to string + * @param {(Object|string|number)} time + * @param {string} cFormat + * @returns {string | null} + */ +export function parseTime(time, cFormat) { + if (arguments.length === 0 || !time) { + return null + } + const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}' + 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() + 1, + 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 +} + +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() + 1, + 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 + * @returns {string} + */ +export function formatTime(time, option) { + if (('' + time).length === 10) { + time = parseInt(time) * 1000 + } else { + time = +time + } + const d = new Date(time) + const now = Date.now() + + const diff = (now - d) / 1000 + + if (diff < 30) { + return '刚刚' + } else if (diff < 3600) { + // less 1 hour + return Math.ceil(diff / 60) + '分钟前' + } else if (diff < 3600 * 24) { + return Math.ceil(diff / 3600) + '小时前' + } else if (diff < 3600 * 24 * 2) { + return '1天前' + } + if (option) { + return parseTime(time, option) + } else { + return ( + d.getMonth() + + 1 + + '月' + + d.getDate() + + '日' + + d.getHours() + + '时' + + d.getMinutes() + + '分' + ) + } +} + +/** + * @param {string} url + * @returns {Object} + */ +export function getQueryObject(url) { + url = url == null ? window.location.href : url + const search = url.substring(url.lastIndexOf('?') + 1) + const obj = {} + const reg = /([^?&=]+)=([^?&=]*)/g + search.replace(reg, (rs, $1, $2) => { + const name = decodeURIComponent($1) + let val = decodeURIComponent($2) + val = String(val) + obj[name] = val + return rs + }) + return obj +} + +/** + * @param {string} input value + * @returns {number} output value + */ +export function byteLength(str) { + // returns the byte length of an utf8 string + let s = str.length + for (var i = str.length - 1; i >= 0; i--) { + const code = str.charCodeAt(i) + if (code > 0x7f && code <= 0x7ff) s++ + else if (code > 0x7ff && code <= 0xffff) s += 2 + if (code >= 0xDC00 && code <= 0xDFFF) i-- + } + return s +} + +/** + * @param {Array} actual + * @returns {Array} + */ +export function cleanArray(actual) { + const newArray = [] + for (let i = 0; i < actual.length; i++) { + if (actual[i]) { + newArray.push(actual[i]) + } + } + return newArray +} + +/** + * @param {Object} json + * @returns {Array} + */ +export function param(json) { + if (!json) return '' + return cleanArray( + Object.keys(json).map(key => { + if (json[key] === undefined) return '' + return encodeURIComponent(key) + '=' + encodeURIComponent(json[key]) + }) + ).join('&') +} + +/** + * @param {string} url + * @returns {Object} + */ +export function param2Obj(url) { + const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ') + if (!search) { + return {} + } + const obj = {} + const searchArr = search.split('&') + searchArr.forEach(v => { + const index = v.indexOf('=') + if (index !== -1) { + const name = v.substring(0, index) + const val = v.substring(index + 1, v.length) + obj[name] = val + } + }) + return obj +} + +/** + * @param {string} val + * @returns {string} + */ +export function html2Text(val) { + const div = document.createElement('div') + div.innerHTML = val + return div.textContent || div.innerText +} + +/** + * Merges two objects, giving the last one precedence + * @param {Object} target + * @param {(Object|Array)} source + * @returns {Object} + */ +export function objectMerge(target, source) { + if (typeof target !== 'object') { + target = {} + } + if (Array.isArray(source)) { + return source.slice() + } + Object.keys(source).forEach(property => { + const sourceProperty = source[property] + if (typeof sourceProperty === 'object') { + target[property] = objectMerge(target[property], sourceProperty) + } else { + target[property] = sourceProperty + } + }) + return target +} + +/** + * @param {HTMLElement} element + * @param {string} className + */ +export function toggleClass(element, className) { + if (!element || !className) { + return + } + let classString = element.className + const nameIndex = classString.indexOf(className) + if (nameIndex === -1) { + classString += '' + className + } else { + classString = + classString.substr(0, nameIndex) + + classString.substr(nameIndex + className.length) + } + element.className = classString +} + +/** + * @param {string} type + * @returns {Date} + */ +export function getTime(type) { + if (type === 'start') { + return new Date().getTime() - 3600 * 1000 * 24 * 90 + } else { + return new Date(new Date().toDateString()) + } +} + +/** + * @param {Function} func + * @param {number} wait + * @param {boolean} immediate + * @return {*} + */ +export function debounce(func, wait, immediate) { + let timeout, args, context, timestamp, result + + const later = function() { + // 据上一次触发时间间隔 + const last = +new Date() - timestamp + + // 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait + if (last < wait && last > 0) { + timeout = setTimeout(later, wait - last) + } else { + timeout = null + // 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用 + if (!immediate) { + result = func.apply(context, args) + if (!timeout) context = args = null + } + } + } + + return function(...args) { + context = this + timestamp = +new Date() + const callNow = immediate && !timeout + // 如果延时不存在，重新设定延时 + if (!timeout) timeout = setTimeout(later, wait) + if (callNow) { + result = func.apply(context, args) + context = args = null + } + + return result + } +} + +/** + * This is just a simple version of deep copy + * Has a lot of edge cases bug + * If you want to use a perfect deep copy, use lodash's _.cloneDeep + * @param {Object} source + * @returns {Object} + */ +export function deepClone(source) { + if (!source && typeof source !== 'object') { + throw new Error('error arguments', 'deepClone') + } + const targetObj = source.constructor === Array ? [] : {} + Object.keys(source).forEach(keys => { + if (source[keys] && typeof source[keys] === 'object') { + targetObj[keys] = deepClone(source[keys]) + } else { + targetObj[keys] = source[keys] + } + }) + return targetObj +} + +/** + * @param {Array} arr + * @returns {Array} + */ +export function uniqueArr(arr) { + return Array.from(new Set(arr)) +} + +/** + * @returns {string} + */ +export function createUniqueString() { + const timestamp = +new Date() + '' + const randomNum = parseInt((1 + Math.random()) * 65536) + '' + return (+(randomNum + timestamp)).toString(32) +} + +/** + * Check if an element has a class + * @param {HTMLElement} elm + * @param {string} cls + * @returns {boolean} + */ +export function hasClass(ele, cls) { + return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)')) +} + +/** + * Add class to element + * @param {HTMLElement} elm + * @param {string} cls + */ +export function addClass(ele, cls) { + if (!hasClass(ele, cls)) ele.className += ' ' + cls +} + +/** + * Remove class from element + * @param {HTMLElement} elm + * @param {string} cls + */ +export function removeClass(ele, cls) { + if (hasClass(ele, cls)) { + const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)') + ele.className = ele.className.replace(reg, ' ') + } +} diff --git a/src/views/dashboard/admin/index.vue b/src/views/dashboard/admin/index.vue index c4c23150..e94eca27 100644 --- a/src/views/dashboard/admin/index.vue +++ b/src/views/dashboard/admin/index.vue @@ -1,119 +1,119 @@ - - - - - + + + + + diff --git a/src/views/hidden_check/components/create/index.vue b/src/views/hidden_check/components/create/index.vue index 514ba340..4f72bd80 100644 --- a/src/views/hidden_check/components/create/index.vue +++ b/src/views/hidden_check/components/create/index.vue @@ -54,19 +54,19 @@ - + - + - + @@ -148,7 +148,7 @@ > - 取 消 + 确 定 @@ -161,6 +161,7 @@ import publicApi from '@/api/public' import buttons from '@/components/formBtn' import SelUser from '@/components/selUser' import SelDept from '@/components/selDept' +import { parseDay } from '@/utils/index' export default { name: 'HiddenCheckCreateForm', components: { @@ -177,9 +178,9 @@ export default { form: { hidden_danger__hidden_code: '', hidden_danger__hidden_state: '1', - hidden_danger__check_man: '', - hidden_danger__check_dept: '', - hidden_danger__check_date: '', + hidden_danger__check_man: this.$store.state.user.userName, + hidden_danger__check_dept: this.$store.state.user.deptName, + hidden_danger__check_date: parseDay(new Date()), hidden_danger__check_location: '', hidden_danger__check_content: '', hidden_danger__check_problem: '', @@ -195,8 +196,8 @@ export default { hidden_danger__insp_det_id: '', hidden_danger__hidden_danger_id: '', hidden_danger__dept_id: '', - hidden_danger__check_man_id: '', - hidden_danger__check_dept_id: '' + hidden_danger__check_man_id: this.$store.state.user.userId, + hidden_danger__check_dept_id: this.$store.state.user.deptId }, rules: { hidden_danger__check_man: [ @@ -230,6 +231,8 @@ export default { } }, created() { + console.log(this.$store) + console.log(this.form) this.getHiddenState() }, methods: { diff --git a/src/views/hidden_check/components/edit_form/index.vue b/src/views/hidden_check/components/edit_form/index.vue index ac454b9a..d0e8fbe3 100644 --- a/src/views/hidden_check/components/edit_form/index.vue +++ b/src/views/hidden_check/components/edit_form/index.vue @@ -54,19 +54,19 @@ - + - + - + @@ -100,6 +100,16 @@ + + + 隐患排查图片 + + + + 隐患整改图片 + + + '' } @@ -356,9 +368,6 @@ export default { -webkit-box-sizing: border-box; box-sizing: border-box; } -.el-col{ - margin-left: 2%; -} .buttons { display: flex; .el-button--primary { @@ -366,4 +375,11 @@ export default { height: 26.8px; } } +.img{ + margin-top: 10px; + text-align: center; + span{ + width: 100%; + } +} diff --git a/src/views/hidden_reform/components/edit_form/index.vue b/src/views/hidden_reform/components/edit_form/index.vue index 498b9c82..4ff5e035 100644 --- a/src/views/hidden_reform/components/edit_form/index.vue +++ b/src/views/hidden_reform/components/edit_form/index.vue @@ -6,6 +6,9 @@ 返回列表 +

+
| 隐患排查
+
@@ -100,6 +103,11 @@ +
+
+ | 隐患整改 +
+
@@ -120,7 +128,7 @@ - + @@ -382,4 +390,14 @@ export default { height: 26.8px; } } +.classify{ + width: 100%; + // display: inline-block; + padding: 10px 0; + font-weight: bold; + color: #1890ff; + span{ + color: #000; + } +} diff --git a/src/views/hidden_reform/index.vue b/src/views/hidden_reform/index.vue index 71a122f4..b8e79ef9 100644 --- a/src/views/hidden_reform/index.vue +++ b/src/views/hidden_reform/index.vue @@ -94,6 +94,7 @@ export default { data: [], deptTree: [], ids: [], + isBacklog: this.$route.query.isBacklog || false, levels: [], pager: { pageNo: 0, @@ -198,6 +199,9 @@ export default { } }, created() { + if (this.isBacklog) { + this.whereSql = '' + } this.getList() }, mounted() { diff --git a/src/views/hidden_review/components/edit_form/index.vue b/src/views/hidden_review/components/edit_form/index.vue index 70cad97f..85ea1c40 100644 --- a/src/views/hidden_review/components/edit_form/index.vue +++ b/src/views/hidden_review/components/edit_form/index.vue @@ -6,6 +6,9 @@ 返回列表 +
+
| 隐患排查
+
@@ -100,6 +103,9 @@ +
+
| 隐患整改
+
@@ -125,6 +131,9 @@ +
+
| 隐患验收
+
@@ -147,7 +156,7 @@ - + @@ -436,4 +445,16 @@ export default { height: 26.8px; } } +.classify{ + width: 100%; + // display: inline-block; + padding: 10px 0; + font-weight: bold; + color: #1890ff; + span{ + height: 100%; + line-height: 18.4px; + color: #000; + } +} diff --git a/src/views/hidden_review/index.vue b/src/views/hidden_review/index.vue index a96e28c3..63432304 100644 --- a/src/views/hidden_review/index.vue +++ b/src/views/hidden_review/index.vue @@ -90,6 +90,7 @@ export default { data: [], deptTree: [], ids: [], + isBacklog: this.$route.query.isBacklog || false, levels: [], pager: { pageNo: 0, @@ -174,6 +175,9 @@ export default { } }, created() { + if (this.isBacklog) { + this.whereSql = '' + } this.getList() }, mounted() { @@ -188,8 +192,7 @@ export default { api.getDate( this.pager.pageSize, pageNo, - this.whereSql, - this.whereValue + this.whereSql ).then(data => { if (data.success) { this.data = data.data.root diff --git a/src/views/insp_name/components/edit_form/index.vue b/src/views/insp_name/components/edit_form/index.vue index 8dcaaee9..44374347 100644 --- a/src/views/insp_name/components/edit_form/index.vue +++ b/src/views/insp_name/components/edit_form/index.vue @@ -26,7 +26,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/src/views/safe_insp/components/create/index.vue b/src/views/safe_insp/components/create/index.vue index 1b8c164a..fdb15edc 100644 --- a/src/views/safe_insp/components/create/index.vue +++ b/src/views/safe_insp/components/create/index.vue @@ -9,7 +9,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -54,7 +54,7 @@ - + diff --git a/src/views/safe_insp/components/edit_form/index.vue b/src/views/safe_insp/components/edit_form/index.vue index 644686a2..fc2a2a90 100644 --- a/src/views/safe_insp/components/edit_form/index.vue +++ b/src/views/safe_insp/components/edit_form/index.vue @@ -54,7 +54,7 @@ - + @@ -199,6 +199,7 @@ export default { console.log(this.id) this.getList() this.getTypeSel() + this.getInsptimes() }, methods: { getList() { @@ -215,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 { @@ -227,6 +228,7 @@ export default { await publicApi.getTypeSel('insptimes').then(data => { if (data.success) { this.insptimes = data.data.root + console.log(this.insptimes, 'this.insptimes') } else { this.$message.error(data.message) } diff --git a/src/views/safe_insp/components/insp_det/index.vue b/src/views/safe_insp/components/insp_det/index.vue index 9b77764e..a044890b 100644 --- a/src/views/safe_insp/components/insp_det/index.vue +++ b/src/views/safe_insp/components/insp_det/index.vue @@ -56,6 +56,15 @@ + + + + + + + + + - +
diff --git a/src/views/sys_dept/components/auditDept.vue b/src/views/sys_dept/components/auditDept.vue index 452d67a4..27651500 100644 --- a/src/views/sys_dept/components/auditDept.vue +++ b/src/views/sys_dept/components/auditDept.vue @@ -1,92 +1,92 @@ - - - - - + + + + + diff --git a/src/views/sys_dept/index.vue b/src/views/sys_dept/index.vue index d156e33a..88394330 100644 --- a/src/views/sys_dept/index.vue +++ b/src/views/sys_dept/index.vue @@ -40,7 +40,7 @@
- +
{{ scope.row[d.prop] }}
@@ -416,4 +416,9 @@ export default { .el-card { margin-top: 10px; } + .el-tree{ + height: 500px; + overflow-x:auto; + overflow-y:auto; + } diff --git a/src/views/sys_user/components/auditUser.vue b/src/views/sys_user/components/auditUser.vue index 41006e1b..ee88cb6b 100644 --- a/src/views/sys_user/components/auditUser.vue +++ b/src/views/sys_user/components/auditUser.vue @@ -1,211 +1,219 @@ - - - - - + + + + + diff --git a/src/views/sys_user/index.vue b/src/views/sys_user/index.vue index c15239cc..02aaf0e5 100644 --- a/src/views/sys_user/index.vue +++ b/src/views/sys_user/index.vue @@ -51,7 +51,7 @@
- +
{{ scope.row[d.prop] }}