diff --git a/index.html b/index.html index 4d3e9ed..92aacc3 100644 --- a/index.html +++ b/index.html @@ -10,10 +10,12 @@ + +
diff --git a/src/asyncRouter.js b/src/asyncRouter.js index abffc21..f9e507c 100644 --- a/src/asyncRouter.js +++ b/src/asyncRouter.js @@ -24,7 +24,6 @@ router.beforeEach((to, from, next) => { router.addRoutes(accessRoutes) next({ ...to, replace: true }) } catch (error) { - console.info(error) next(`/login`) } }) @@ -37,7 +36,6 @@ router.beforeEach((to, from, next) => { router.addRoutes(accessRoutes) next({ ...to, replace: true }) } catch (error) { - console.info(error) next(`/login`) } } diff --git a/src/utils/validate.js b/src/utils/validate.js index 396200d..db98efb 100644 --- a/src/utils/validate.js +++ b/src/utils/validate.js @@ -7,7 +7,6 @@ * @returns {Boolean} */ export function validText(str) { - console.info(str) if (str.trim().length < 1) { return false } diff --git a/src/views/bi_onecom/majorHazardSources/info.vue b/src/views/bi_onecom/majorHazardSources/info.vue index b73bdc1..e97670e 100644 --- a/src/views/bi_onecom/majorHazardSources/info.vue +++ b/src/views/bi_onecom/majorHazardSources/info.vue @@ -368,7 +368,7 @@ export default { this.listLoading = false this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID = data.pd.MAJORDANGERSOURCE_DISPOSAL_ID this.disposal.DISPOSAL_TIME = data.pd.DISPOSAL_TIME - console.info(this.disposal) + // this.dialogFormEdit = false // this.hasDisposal = false }).catch((e) => { @@ -414,7 +414,7 @@ export default { this.uploadDisposalAfterFile() this.listLoading = true this.disposal.DISPOSAL_STATUS = '1' - console.info(this.disposal) + requestFN( '/majordangersourcedisposal/' + methodName, this.disposal @@ -423,7 +423,6 @@ export default { this.dialogFormEdit = false this.hasDisposal = false this.resetDisposal() - console.info(this.disposal) this.timer = setInterval(this.handleTimerOperation, 5000) }).catch((e) => { this.listLoading = false @@ -443,7 +442,7 @@ export default { } } // formData.append('FFILE', this.disposal.disposalBeforeFile) - console.info(this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID) + formData.append('FOREIGN_KEY', this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID) formData.append('TYPE', 20) this.uploadFileSubmit(formData, '处置前照片上传完成') @@ -457,7 +456,7 @@ export default { } } // formData.append('FFILE', this.disposal.disposalAfterFile) - console.info(this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID) + formData.append('FOREIGN_KEY', this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID) formData.append('TYPE', 21) this.uploadFileSubmit(formData, '处置后照片上传完成') @@ -467,7 +466,7 @@ export default { '/imgfiles/add', formData ).then((data) => { - console.info(str) + }).catch((e) => { }) }, diff --git a/src/views/check/checklist/components/recording.vue b/src/views/check/checklist/components/recording.vue index 0075a76..41ed6bb 100644 --- a/src/views/check/checklist/components/recording.vue +++ b/src/views/check/checklist/components/recording.vue @@ -496,9 +496,6 @@ export default { if (this.isClearRectificationor) { this.hiddenForm.RECTIFICATIONOR = '' } - - console.info(this.isClearRectificationor) - console.info(this.hiddenForm.RECTIFICATIONOR) this.getReUserList(newVal) this.isClearRectificationor = true } diff --git a/src/views/corpInfo/user/components/list.vue b/src/views/corpInfo/user/components/list.vue index 3dac564..32dfabb 100644 --- a/src/views/corpInfo/user/components/list.vue +++ b/src/views/corpInfo/user/components/list.vue @@ -796,7 +796,7 @@ export default { SHIFTDUTYTWO: this.SHIFTDUTYTWO, IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER, USER_ID: this.USER_ID, - ISPUSH:'2' + ISPUSH: '2' } ).then((data) => { this.listLoading = false diff --git a/src/views/map/components/menjin2.vue b/src/views/map/components/menjin2.vue new file mode 100644 index 0000000..70bb238 --- /dev/null +++ b/src/views/map/components/menjin2.vue @@ -0,0 +1,470 @@ + + + + + diff --git a/src/views/map/components/menjin_index.vue b/src/views/map/components/menjin_index.vue new file mode 100644 index 0000000..00b8d54 --- /dev/null +++ b/src/views/map/components/menjin_index.vue @@ -0,0 +1,207 @@ + + + + + diff --git a/src/views/map/dialog/electricity.vue b/src/views/map/dialog/electricity.vue index b1e8bcc..e5c8440 100644 --- a/src/views/map/dialog/electricity.vue +++ b/src/views/map/dialog/electricity.vue @@ -230,7 +230,7 @@ export default { this.measuresList = data.measuresList this.gasList = data.gasList this.otherProtectiveMeasures = this.validStr(this.info.OTHER_PROTECTIVE_MEASURES.replace(/;_;/g, '')) ? this.info.OTHER_PROTECTIVE_MEASURES.split(';_;') : [] - console.info(this.otherProtectiveMeasures) + if (!this.info.WORK_OPERATOR_ID) { this.$set(this.info, 'WORK_OPERATOR_ID', []) } else { diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue index bf31cdf..18d58fc 100644 --- a/src/views/map/dialog/index.vue +++ b/src/views/map/dialog/index.vue @@ -9,13 +9,22 @@ - + - + @@ -180,6 +189,14 @@ export default { infoname: { type: String, default: '' + }, + videoType: { + type: String, + default: '' + }, + code: { + type: String, + default: '' } }, methods: { diff --git a/src/views/map/dialog/mkGateMachine.vue b/src/views/map/dialog/mkGateMachine.vue index 16ccf6c..cdd6f77 100644 --- a/src/views/map/dialog/mkGateMachine.vue +++ b/src/views/map/dialog/mkGateMachine.vue @@ -1,6 +1,6 @@ + + diff --git a/src/views/map/dialog/zhong_da_info.vue b/src/views/map/dialog/zhong_da_info.vue index fb277d0..d579779 100644 --- a/src/views/map/dialog/zhong_da_info.vue +++ b/src/views/map/dialog/zhong_da_info.vue @@ -279,7 +279,7 @@ export default { this.listLoading = false this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID = data.pd.MAJORDANGERSOURCE_DISPOSAL_ID this.disposal.DISPOSAL_TIME = data.pd.DISPOSAL_TIME - console.info(this.disposal) + // this.dialogFormEdit = false // this.hasDisposal = false }).catch((e) => { @@ -325,7 +325,7 @@ export default { this.uploadDisposalAfterFile() this.listLoading = true this.disposal.DISPOSAL_STATUS = '1' - console.info(this.disposal) + requestFN( '/majordangersourcedisposal/' + methodName, this.disposal @@ -334,7 +334,7 @@ export default { this.dialogFormEdit = false this.hasDisposal = false this.resetDisposal() - console.info(this.disposal) + this.timer = setInterval(this.handleTimerOperation, 5000) }).catch((e) => { this.listLoading = false @@ -354,7 +354,7 @@ export default { } } // formData.append('FFILE', this.disposal.disposalBeforeFile) - console.info(this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID) + formData.append('FOREIGN_KEY', this.disposal.MAJORDANGERSOURCE_DISPOSAL_ID) formData.append('TYPE', 20) this.uploadFileSubmit(formData, '处置前照片上传完成') diff --git a/src/views/map/index.vue b/src/views/map/index.vue index 8edf416..fbe95de 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -215,6 +215,8 @@ :corp-info-id="dialog.corpInfoId" :gangkou="gangkouActive" :infoname="dialog.infoname" + :code="dialog.code" + :video-type="dialog.video_type" /> @@ -229,7 +231,7 @@ import { requestFN } from '@/utils/request' import gangkouIndex from './components/gangkou_index.vue' import fengongsiIndex from './components/fengongsi_index.vue' import caofeidianIndex from './components/caofeidian_index.vue' -import menjin from './components/menjin.vue' +import menjin from './components/menjin_index.vue' import menjinCfd from './components/menjinCfd.vue' import xiaofang from './components/xiaofang.vue' import anquan from './components/anquan.vue' @@ -427,7 +429,7 @@ export default { img: require('../../assets/map/gangkou_index/buttom/ico1.png'), checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'), type: 'PERSON', - containAuthorization: [], + containAuthorization: ['035958e685cf4850bc40151c5e0617a6'], eliminateAuthorization: [] }, { @@ -437,9 +439,29 @@ export default { img: require('../../assets/map/gangkou_index/buttom/ico2.png'), checkImg: require('../../assets/map/gangkou_index/buttom/ico2_on.png'), type: 'CAR', - containAuthorization: [], + containAuthorization: ['035958e685cf4850bc40151c5e0617a6'], eliminateAuthorization: [] }, + { + label: '人员闸机', // 杂货公司的人员 + dialog_width: '800px', + check: false, + img: require('../../assets/map/gangkou_index/buttom/ico1.png'), + checkImg: require('../../assets/map/gangkou_index/buttom/ico1_on.png'), + type: 'PERSON_MACHINE', + containAuthorization: ['allCorp'], + eliminateAuthorization: ['035958e685cf4850bc40151c5e0617a6'] + }, + { + label: '车辆闸机', // 杂货公司的车辆 + dialog_width: '600px', + check: false, + img: require('../../assets/map/gangkou_index/buttom/ico2.png'), + checkImg: require('../../assets/map/gangkou_index/buttom/ico2_on.png'), + type: 'CAR_MACHINE', + containAuthorization: ['allCorp'], + eliminateAuthorization: ['035958e685cf4850bc40151c5e0617a6'] + }, { label: '摄像头', dialog_width: '600px', @@ -1206,7 +1228,7 @@ export default { } const point_type = pick.id._monitoItems.data.point_type if (point_type.indexOf('标记点') !== -1) { - const { label, point_type, data_id, corpInfoId, dialog_width, infoname } = pick.id._monitoItems.data + const { label, point_type, data_id, corpInfoId, dialog_width, infoname, code, video_type, name } = pick.id._monitoItems.data this.dialog.visible = true this.dialog.title = label this.dialog.type = point_type.substring(3) @@ -1214,6 +1236,9 @@ export default { this.dialog.corpInfoId = corpInfoId this.dialog.infoname = infoname this.dialog.width = dialog_width || '50%' + this.dialog.code = code + this.dialog.video_type = video_type + this.dialog.name = name } } else { this.closeBubbles() @@ -1815,7 +1840,9 @@ export default { } } } - if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' && urlType === 'peoplePosition') { + if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' && + this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f' && + urlType === 'peoplePosition') { this.clearRYDWPoint('+/UwbBQ/') this.removeTrajectory() } @@ -1853,12 +1880,23 @@ export default { this.cfdBottomOptionsList[pindex].list[index].check = true this.bottomOptionsList[pindex].list[index].check = false } + console.info('---------') + console.info('---------') + console.info(this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f') + console.info('---------') + console.info('---------') if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') { !this.connecting ? this.createConnection(this.CORP_INFO_ID) : this.doSubscribe() - } else if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' && urlType === 'peoplePosition') { + } else if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '21590a00ea5e462e9ee44dd332dddc26' && + urlType === 'peoplePosition') { // websocket实时获取人员定位 + console.info('Assssssss') this.initRYDWWebsocket('21590a00ea5e462e9ee44dd332dddc26') + } else if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '033549ed3bd648e49c8a65eb4993ec2f' && urlType === 'peoplePosition') { + // websocket实时获取人员定位 + console.info('Assssssss') + this.initRYDWWebsocket('033549ed3bd648e49c8a65eb4993ec2f') } else { requestFN( pointUrl, @@ -1871,6 +1909,7 @@ export default { ).then(async(data) => { const points = [] const varList = this.filterNull(data.varList) + console.info(data) for (let i = 0; i < varList.length; i++) { const point = {} point.id = pindex + '_' + index + '_' + i @@ -1913,6 +1952,7 @@ export default { } points.push(point) } + console.info(points) if (this.gangkouActive === '00004' && urlType === 'carPosition') { this.timerCfdCarDingwei() this.carLocArr = points @@ -2751,6 +2791,8 @@ export default { if (containAuthorization.length === 0) return true if (containAuthorization.includes(CORP_INFO_ID)) { return true + } else if (containAuthorization.includes('allCorp') && CORP_INFO_ID) { + return true } else { return false } diff --git a/src/views/map/js/dragentity.js b/src/views/map/js/dragentity.js index 5ea538c..68fcf11 100644 --- a/src/views/map/js/dragentity.js +++ b/src/views/map/js/dragentity.js @@ -112,14 +112,46 @@ export default class DragEntity { } } if (value.point_type.indexOf('标记点') !== -1) { - billboard = { - image: imgMap['img' + value.icon_type], - height: 36, - width: 30, - verticalOrigin: Cesium.VerticalOrigin.BOTTOM, - horizontalOrigin: Cesium.HorizontalOrigin.CENTER, - heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, - disableDepthTestDistance: Number.POSITIVE_INFINITY + if (value.label == '人员闸机') { + billboard = { + image: imgMap['img0_0' ], + height: 36, + width: 30, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, + disableDepthTestDistance: Number.POSITIVE_INFINITY + } + } else if (value.label == '车辆闸机') { + billboard = { + image: imgMap['img0_1' ], + height: 36, + width: 30, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, + disableDepthTestDistance: Number.POSITIVE_INFINITY + } + } else if (value.label == '摄像头') { + billboard = { + image: imgMap['img0_2' ], + height: 36, + width: 30, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, + disableDepthTestDistance: Number.POSITIVE_INFINITY + } + } else { + billboard = { + image: imgMap['img' + value.icon_type], + height: 36, + width: 30, + verticalOrigin: Cesium.VerticalOrigin.BOTTOM, + horizontalOrigin: Cesium.HorizontalOrigin.CENTER, + heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, + disableDepthTestDistance: Number.POSITIVE_INFINITY + } } } // 曹妃甸使用 diff --git a/src/views/safetyenvironmental/archive/components/accept.vue b/src/views/safetyenvironmental/archive/components/accept.vue index a2ec907..ee6fcf1 100644 --- a/src/views/safetyenvironmental/archive/components/accept.vue +++ b/src/views/safetyenvironmental/archive/components/accept.vue @@ -595,7 +595,7 @@ export default { this.$refs.form.validate(valid => { if (valid) { requestFN( - '/safetyenvironmental/V2/finalcheck', + '/hidden/finalcheck', { HIDDEN_ID: this.HIDDEN_ID, FINAL_CHECKDESCR: this.form.FINAL_CHECKDESCR, diff --git a/src/views/safetyenvironmental/inspected/components/list.vue b/src/views/safetyenvironmental/inspected/components/list.vue index a2dfef5..f0bcd4d 100644 --- a/src/views/safetyenvironmental/inspected/components/list.vue +++ b/src/views/safetyenvironmental/inspected/components/list.vue @@ -330,7 +330,7 @@ export default { hiddenCount(INSPECTION_ID) { this.listLoading = true requestFN( - '/safetyenvironmental/V2/hiddencount', + '/safetyenvironmentalexplain/hiddencount', { INSPECTION_ID: INSPECTION_ID } @@ -347,10 +347,9 @@ export default { }, // 完成 subCanvas(img64) { - console.info('img64：' + img64) this.form.INSPECTED_SITEUSER_SIGN_IMG = img64 this.$set(this.form, 'INSPECTED_SITEUSER_SIGN_TIME', formatDate(new Date(), 'YYYY-MM-DD HH:mm')) - console.info(this.form) + this.dialogWriteSign = false }, diff --git a/src/views/safetyenvironmental/inspection/components/add.vue b/src/views/safetyenvironmental/inspection/components/add.vue index 610d76d..d4d2ab5 100644 --- a/src/views/safetyenvironmental/inspection/components/add.vue +++ b/src/views/safetyenvironmental/inspection/components/add.vue @@ -96,7 +96,7 @@ - + @@ -530,7 +530,7 @@ export default { this.INSPECTED_SITEUSER_List = [] } if (newVal != null && newVal != '') { - this.getXgfUserList(newVal) + this.getUserList(newVal) } }, immediate: false @@ -600,7 +600,9 @@ export default { updateInspecteDept(DEPARTMENT_ID, i) { // this.form.inspectorList[i].INSPECTION_USER_ID = '' // this.getInspectorList(DEPARTMENT_ID, i) - this.getXgfUserList(DEPARTMENT_ID) + // this.getXgfUserList(DEPARTMENT_ID) + this.form.inspectorList[i].INSPECTION_USER_ID = '' + this.getInspectorList(DEPARTMENT_ID, i) }, // 获取人员列表 getInspectorList(DEPARTMENT_ID, i) { diff --git a/static/bi/index.html b/static/bi/index.html index 9b483e0..a720594 100644 --- a/static/bi/index.html +++ b/static/bi/index.html @@ -7,7 +7,7 @@ - + diff --git a/static/bi/js/jquery-3.7.1.min.js b/static/bi/js/jquery-3.7.1.min.js new file mode 100644 index 0000000..7f37b5d --- /dev/null +++ b/static/bi/js/jquery-3.7.1.min.js @@ -0,0 +1,2 @@ +/*! jQuery v3.7.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */ +!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(ie,e){"use strict";var oe=[],r=Object.getPrototypeOf,ae=oe.slice,g=oe.flat?function(e){return oe.flat.call(e)}:function(e){return oe.concat.apply([],e)},s=oe.push,se=oe.indexOf,n={},i=n.toString,ue=n.hasOwnProperty,o=ue.toString,a=o.call(Object),le={},v=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},y=function(e){return null!=e&&e===e.window},C=ie.document,u={type:!0,src:!0,nonce:!0,noModule:!0};function m(e,t,n){var r,i,o=(n=n||C).createElement("script");if(o.text=e,t)for(r in u)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[i.call(e)]||"object":typeof e}var t="3.7.1",l=/HTML$/i,ce=function(e,t){return new ce.fn.init(e,t)};function c(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!v(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+ge+")"+ge+"*"),x=new RegExp(ge+"|>"),j=new RegExp(g),A=new RegExp("^"+t+"$"),D={ID:new RegExp("^#("+t+")"),CLASS:new RegExp("^\\.("+t+")"),TAG:new RegExp("^("+t+"|[*])"),ATTR:new RegExp("^"+p),PSEUDO:new RegExp("^"+g),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ge+"*(even|odd|(([+-]|)(\\d*)n|)"+ge+"*(?:([+-]|)"+ge+"*(\\d+)|))"+ge+"*\\)|)","i"),bool:new RegExp("^(?:"+f+")$","i"),needsContext:new RegExp("^"+ge+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ge+"*((?:-\\d)?\\d*)"+ge+"*\\)|)(?=[^-]|$)","i")},N=/^(?:input|select|textarea|button)$/i,q=/^h\d$/i,L=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,H=/[+~]/,O=new RegExp("\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\([^\\r\\n\\f])","g"),P=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},M=function(){V()},R=J(function(e){return!0===e.disabled&&fe(e,"fieldset")},{dir:"parentNode",next:"legend"});try{k.apply(oe=ae.call(ye.childNodes),ye.childNodes),oe[ye.childNodes.length].nodeType}catch(e){k={apply:function(e,t){me.apply(e,ae.call(t))},call:function(e){me.apply(e,ae.call(arguments,1))}}}function I(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(V(e),e=e||T,C)){if(11!==p&&(u=L.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return k.call(n,a),n}else if(f&&(a=f.getElementById(i))&&I.contains(e,a)&&a.id===i)return k.call(n,a),n}else{if(u[2])return k.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&e.getElementsByClassName)return k.apply(n,e.getElementsByClassName(i)),n}if(!(h[t+" "]||d&&d.test(t))){if(c=t,f=e,1===p&&(x.test(t)||m.test(t))){(f=H.test(t)&&U(e.parentNode)||e)==e&&le.scope||((s=e.getAttribute("id"))?s=ce.escapeSelector(s):e.setAttribute("id",s=S)),o=(l=Y(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+Q(l[o]);c=l.join(",")}try{return k.apply(n,f.querySelectorAll(c)),n}catch(e){h(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return re(t.replace(ve,"$1"),e,n,r)}function W(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function F(e){return e[S]=!0,e}function $(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function B(t){return function(e){return fe(e,"input")&&e.type===t}}function _(t){return function(e){return(fe(e,"input")||fe(e,"button"))&&e.type===t}}function z(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&R(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function X(a){return F(function(o){return o=+o,F(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function U(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function V(e){var t,n=e?e.ownerDocument||e:ye;return n!=T&&9===n.nodeType&&n.documentElement&&(r=(T=n).documentElement,C=!ce.isXMLDoc(T),i=r.matches||r.webkitMatchesSelector||r.msMatchesSelector,r.msMatchesSelector&&ye!=T&&(t=T.defaultView)&&t.top!==t&&t.addEventListener("unload",M),le.getById=$(function(e){return r.appendChild(e).id=ce.expando,!T.getElementsByName||!T.getElementsByName(ce.expando).length}),le.disconnectedMatch=$(function(e){return i.call(e,"*")}),le.scope=$(function(){return T.querySelectorAll(":scope")}),le.cssHas=$(function(){try{return T.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),le.getById?(b.filter.ID=function(e){var t=e.replace(O,P);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(O,P);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):t.querySelectorAll(e)},b.find.CLASS=function(e,t){if("undefined"!=typeof t.getElementsByClassName&&C)return t.getElementsByClassName(e)},d=[],$(function(e){var t;r.appendChild(e).innerHTML="",e.querySelectorAll("[selected]").length||d.push("\\["+ge+"*(?:value|"+f+")"),e.querySelectorAll("[id~="+S+"-]").length||d.push("~="),e.querySelectorAll("a#"+S+"+*").length||d.push(".#.+[+~]"),e.querySelectorAll(":checked").length||d.push(":checked"),(t=T.createElement("input")).setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),r.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&d.push(":enabled",":disabled"),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||d.push("\\["+ge+"*name"+ge+"*="+ge+"*(?:''|\"\")")}),le.cssHas||d.push(":has"),d=d.length&&new RegExp(d.join("|")),l=function(e,t){if(e===t)return a=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!le.sortDetached&&t.compareDocumentPosition(e)===n?e===T||e.ownerDocument==ye&&I.contains(ye,e)?-1:t===T||t.ownerDocument==ye&&I.contains(ye,t)?1:o?se.call(o,e)-se.call(o,t):0:4&n?-1:1)}),T}for(e in I.matches=function(e,t){return I(e,null,null,t)},I.matchesSelector=function(e,t){if(V(e),C&&!h[t+" "]&&(!d||!d.test(t)))try{var n=i.call(e,t);if(n||le.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){h(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(O,P),e[3]=(e[3]||e[4]||e[5]||"").replace(O,P),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||I.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&I.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return D.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&j.test(n)&&(t=Y(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(O,P).toLowerCase();return"*"===e?function(){return!0}:function(e){return fe(e,t)}},CLASS:function(e){var t=s[e+" "];return t||(t=new RegExp("(^|"+ge+")"+e+"("+ge+"|$)"))&&s(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=I.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function T(e,n,r){return v(n)?ce.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?ce.grep(e,function(e){return e===n!==r}):"string"!=typeof n?ce.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(ce.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||k,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:S.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ce?t[0]:t,ce.merge(this,ce.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:C,!0)),w.test(r[1])&&ce.isPlainObject(t))for(r in t)v(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=C.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):v(e)?void 0!==n.ready?n.ready(e):e(ce):ce.makeArray(e,this)}).prototype=ce.fn,k=ce(C);var E=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function A(e,t){while((e=e[t])&&1!==e.nodeType);return e}ce.fn.extend({has:function(e){var t=ce(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,Ce=/^$|^module$|\/(?:java|ecma)script/i;xe=C.createDocumentFragment().appendChild(C.createElement("div")),(be=C.createElement("input")).setAttribute("type","radio"),be.setAttribute("checked","checked"),be.setAttribute("name","t"),xe.appendChild(be),le.checkClone=xe.cloneNode(!0).cloneNode(!0).lastChild.checked,xe.innerHTML="",le.noCloneChecked=!!xe.cloneNode(!0).lastChild.defaultValue,xe.innerHTML="",le.option=!!xe.lastChild;var ke={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function Se(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&fe(e,t)?ce.merge([e],n):n}function Ee(e,t){for(var n=0,r=e.length;n",""]);var je=/<|&#?\w+;/;function Ae(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function Re(e,t){return fe(e,"table")&&fe(11!==t.nodeType?t:t.firstChild,"tr")&&ce(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function We(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Fe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(_.hasData(e)&&(s=_.get(e).events))for(i in _.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),C.head.appendChild(r[0])},abort:function(){i&&i()}}});var Jt,Kt=[],Zt=/(=)\?(?=&|$)|\?\?/;ce.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Kt.pop()||ce.expando+"_"+jt.guid++;return this[e]=!0,e}}),ce.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Zt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Zt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=v(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Zt,"$1"+r):!1!==e.jsonp&&(e.url+=(At.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||ce.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=ie[r],ie[r]=function(){o=arguments},n.always(function(){void 0===i?ce(ie).removeProp(r):ie[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Kt.push(r)),o&&v(i)&&i(o[0]),o=i=void 0}),"script"}),le.createHTMLDocument=((Jt=C.implementation.createHTMLDocument("").body).innerHTML="
",2===Jt.childNodes.length),ce.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(le.createHTMLDocument?((r=(t=C.implementation.createHTMLDocument("")).createElement("base")).href=C.location.href,t.head.appendChild(r)):t=C),o=!n&&[],(i=w.exec(e))?[t.createElement(i[1])]:(i=Ae([e],t,o),o&&o.length&&ce(o).remove(),ce.merge([],i.childNodes)));var r,i,o},ce.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(ce.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},ce.expr.pseudos.animated=function(t){return ce.grep(ce.timers,function(e){return t===e.elem}).length},ce.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=ce.css(e,"position"),c=ce(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=ce.css(e,"top"),u=ce.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),v(t)&&(t=t.call(e,n,ce.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},ce.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){ce.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===ce.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===ce.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=ce(e).offset()).top+=ce.css(e,"borderTopWidth",!0),i.left+=ce.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-ce.css(r,"marginTop",!0),left:t.left-i.left-ce.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===ce.css(e,"position"))e=e.offsetParent;return e||J})}}),ce.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;ce.fn[t]=function(e){return M(this,function(e,t,n){var r;if(y(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),ce.each(["top","left"],function(e,n){ce.cssHooks[n]=Ye(le.pixelPosition,function(e,t){if(t)return t=Ge(e,n),_e.test(t)?ce(e).position()[n]+"px":t})}),ce.each({Height:"height",Width:"width"},function(a,s){ce.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){ce.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return M(this,function(e,t,n){var r;return y(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?ce.css(e,t,i):ce.style(e,t,n,i)},s,n?e:void 0,n)}})}),ce.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){ce.fn[t]=function(e){return this.on(t,e)}}),ce.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)}}),ce.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){ce.fn[n]=function(e,t){return 0 - + diff --git a/static/qrcode/views/bsbw/detail.html b/static/qrcode/views/bsbw/detail.html index 413bc75..959c087 100644 --- a/static/qrcode/views/bsbw/detail.html +++ b/static/qrcode/views/bsbw/detail.html @@ -71,7 +71,7 @@ 返回列表 --> - + + - + + diff --git a/static/qrcode/views/bsbw/point_list.html b/static/qrcode/views/bsbw/point_list.html index 43e16c2..19cfd1e 100644 --- a/static/qrcode/views/bsbw/point_list.html +++ b/static/qrcode/views/bsbw/point_list.html @@ -116,7 +116,7 @@ - + diff --git a/static/qrcode/views/bsbw/record_list.html b/static/qrcode/views/bsbw/record_list.html index 7e56cf0..f2b3c33 100644 --- a/static/qrcode/views/bsbw/record_list.html +++ b/static/qrcode/views/bsbw/record_list.html @@ -119,7 +119,7 @@ - + - +