Commit d2f6a7ce authored by xinzhedeai's avatar xinzhedeai

中台接口key文件封装,隐患列表页面对接finish

parent ced5769b
......@@ -7,10 +7,10 @@
content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0, viewprot-fit:cover">
<title>高区应急系统-首页</title>
<script type="text/javascript" src="./js/includeHead.js"></script>
<script type="text/javascript" src="//cdn.bootcdn.net/ajax/libs/eruda/2.4.1/eruda.js"></script>
<!-- <script type="text/javascript" src="//cdn.bootcdn.net/ajax/libs/eruda/2.4.1/eruda.js"></script>
<script>
eruda.init();
</script>
</script> -->
<style>
.wrapper .item {
width: 7.5rem;
......@@ -53,10 +53,12 @@
</style>
</head>
<body>
<script type="text/javascript" src="https://isdapp.shandong.gov.cn/jmopen/jssdk/index.js"></script>
<!-- <script type="text/javascript" src="https://isdapp.shandong.gov.cn/jmopen/jssdk/index.js"></script>
<script type="text/javascript" src="js/jssdk2/aes.js"></script>
<script type='text/javascript' src="js/jssdk2/sm2/build/SM.js"></script>
<script type="text/javascript" src="js/jssdk2/index.js"></script>
<script type="text/javascript" src="js/jssdk2/index.js"></script> -->
<!-- 获取授权用户信息 本地token等操作 -->
<!-- <script type="text/javascript" src="js/jssdk2/index.js"></script> -->
<div id="app">
<div class="wrapper">
<div class="">
......
......@@ -34,9 +34,6 @@ var http2 = {
const data = SM.encrypt(JSON.stringify(params.reqParams), params.interfacePublicKey)
// const data = JSON.stringify(params.reqParams)
console.log('http2方法进来了', JSON.stringify(params.reqParams))
const headers = {
Authorization: "Bearer eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiI0ODA3ODFkZmQxYmE0MmM0OGQyZDQ5NTllYzcyYTUwNCIsInVzZXIiOiJqYyIsInN1YiI6ImpjIn0.WfLq11T7iWPiMuzqDY2N54aIqdv-ciYCe6pINqQAeBdqlMiJmkufsqlD2YMmUzsHA-o4WerkiSYnPzexEMiAJA"
}
const extraData = {
header: {
Authorization: "Bearer eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiI0ODA3ODFkZmQxYmE0MmM0OGQyZDQ5NTllYzcyYTUwNCIsInVzZXIiOiJqYyIsInN1YiI6ImpjIn0.WfLq11T7iWPiMuzqDY2N54aIqdv-ciYCe6pINqQAeBdqlMiJmkufsqlD2YMmUzsHA-o4WerkiSYnPzexEMiAJA"
......
......@@ -11,7 +11,21 @@ document.write('<link rel="stylesheet" type="text/css" href="' + contextPath + '
document.write('<link rel="stylesheet" type="text/css" href="' + contextPath + '/css/vant.css" />');
document.write('<link rel="stylesheet" type="text/css" href="' + contextPath + '/css/common.css?rev=' + jsVersion + '" />');
// js
/**
* 爱山东 jssdk相关引用
*/
document.write('<script type="text/javascript" src="https://isdapp.shandong.gov.cn/jmopen/jssdk/index.js"></script>\
<script type="text/javascript" src="' + contextPath + '/js/jssdk2/aes.js"></script>\
<script type="text/javascript" src="' + contextPath + '/js/jssdk2/sm2/build/SM.js"></script>\
<script type="text/javascript" src="//cdn.bootcdn.net/ajax/libs/eruda/2.4.1/eruda.js"></script>\
<script>eruda.init();</script>');
/**
* 项目业务相关 js
*/
// <script type="text/javascript" src="' + contextPath + '/js/vant.min.js"></script>\
document.write('<script type="text/javascript" src="' + contextPath + '/js/vue.min.js"></script>\
<script type="text/javascript" src="https://cdn.bootcdn.net/ajax/libs/vant/2.12.54/vant.min.js"></script>\
......@@ -19,10 +33,13 @@ document.write('<script type="text/javascript" src="' + contextPath + '/js/vue.m
<script type="text/javascript" src="' + contextPath + '/js/flexible.js"></script>\
<script type="text/javascript" src="' + contextPath + '/js/util.js?rev=' + jsVersion + '"></script>\
<script type="text/javascript" src="' + contextPath + '/js/common.js?rev=' + jsVersion + '"></script>\
<script type="text/javascript" src="' + contextPath + '/js/jssdk2/apiKeyMap.js?rev=' + jsVersion + '"></script>\
<script type="text/javascript" src="' + contextPath + '/js/http2.js?rev=' + jsVersion + '"></script>');
if (getPageN()) { // 加载同名js
document.write('<script type="text/javascript" src="./' + getPageN() + '.js?rev=' + jsVersion + '"></script>');
}
......
......@@ -5,7 +5,7 @@ const appword = "aKd20dbGdFvmuwrt"
let userType = "1" //用户类型 1个人 2法人
window.onload = function () {
getUserInfo()
// getUserInfo()
}
/**
......@@ -76,7 +76,7 @@ function getUserToken(ticket) {
params: params
}
vaildInterfacefn("jisnzjk", "ticketvalidate", JSON.stringify(interfaceContent), "1", "https://" + urlCreatesign, "https://" + urlGateway).then((value) => {
vaildInterfacefn("gqyjglptxiefn", "ticketvalidate", JSON.stringify(interfaceContent), "1", "https://" + urlCreatesign, "https://" + urlGateway).then((value) => {
const data = JSON.parse(value)
if (data.retcode == "000000") {
const userToken = JSON.parse(data.data).token
......@@ -112,7 +112,7 @@ function getUserInfoByToken(userToken) {
}
try {
vaildInterfacefn("jisnzjk", "findoutsideuserbytoken", JSON.stringify(interfaceContent), "2", "https://" + urlCreatesign, "https://" + urlGateway).then((value) => {
vaildInterfacefn("gqyjglptxiefn", "findoutsideuserbytoken", JSON.stringify(interfaceContent), "2", "https://" + urlCreatesign, "https://" + urlGateway).then((value) => {
const data = JSON.parse(value)
if (data.retcode == "000000") {
const userInfo = data.data
......@@ -138,7 +138,7 @@ function findCorUserByToken(userToken) {
servicename: "findCorUserByToken",
params: params
}
vaildInterfacefn("jisnzjk", "findcoruserytoken", JSON.stringify(interfaceContent), "2", "https://" + urlCreatesign, "https://" + urlGateway).then((value) => {
vaildInterfacefn("gqyjglptxiefn", "findcoruserytoken", JSON.stringify(interfaceContent), "2", "https://" + urlCreatesign, "https://" + urlGateway).then((value) => {
const data = JSON.parse(value)
if (data.retcode == "000000") {
......
const API_KEY_MAP = {
'yh-list': { // 隐患管理-列表
id: 'gqyjglptthHiddenDanger',
publicKey: '041a0802713d674bfc3db46293d83e2b3ebe99cd0ee9b5ae507a0aa07f41cd8bf1407d8c16fab3ceb28bfa233452417373ac0c7864e085895a27b4ebf14b2eb3b1',
privateKey: '73ae80b0f34740ce795821bf4354f1621e4ab7d01d9f3f7fc7c05e52c527c528'
},
'yh-list-detail': { // 隐患管理-修改
id: 'gqyjglptupdate',
publicKey: '04cc5dfef4a8f0bb28298d4b06d02d2c933791b09d4d746a3e4aa7119f4402b3eb3f0c5df31127e96cc46bf9675cad52b95e3af6d7345040a05c7d17ced8a80f8f',
privateKey: '2152ba9b1a9c6526fab2e6f5985da1c36ecc9476fd4ab4b19a43206836d8e496'
},
'dw-list': { // 危险作业备案管理-查询
id: 'gqyjglptpage',
publicKey: '04f09896234db417d7dcf1d7e56d69101590106b08d6ae752c2f59c8041ef5a9d4cc8535a9487806f5ed23ad6e9a62a9e031f6eb5d0181d007e73c685b4127f098',
privateKey: '0093df6762d7371cdc039ce5bc42d70ce411ea2c7cf6e9a269a3f4b974f30961f8'
},
'dw-list-detail': { // 危险作业备案管理-新增/修改
id: 'gqyjglptcreate',
publicKey: '043cbdee5e137b43241c72481f023f0c937b383586fdfdbf8dc012e6e1dc6e3ee1cdd5d6c48aef3453c4ca55eaae2d583e74eb6844254be0fe393dcaccb14af65f',
privateKey: '2f6c6b20e29ba96d03ea6dbc5975484cf96f99fcb99caf2cde1556ca68a31138'
},
'notice-list': { // 通知公告-列表
id: 'gqyjglptfindOwnTag',
publicKey: '049ba9d80cb4284f6cc9f55935b3cd57cec034b5f242c390bf70d2a62ee917cf525b83d524eb700c68af330c9e5bcb82bd1101370318cdce19418a342fa31217ed',
privateKey: '2152ba9b1a9c6526fab2e6f5985da1c36ecc9476fd4ab4b19a43206836d8e496'
},
'notice-list-detail': { // 通知公告-详情
id: 'gqyjglptfindOwn',
publicKey: '04f65369ca1f06c23dca1428414495078097aaeab5ff58561bcf307ecb5db5c81abe731e4428799217def11507053530193aaa165a51ece5356c3a661ec455386b',
privateKey: '00a47e6d4a77bd16d3e508c6d27c8349bd32a93a6033b8a920c4d55f5f2517a661'
},
'law-lv': { // 法律法规-分类列表
id: 'gqyjglptlawCategory',
publicKey: '0408156c9416ad5a092907640183a3f0cf235f4fe651c9e96f89093b1db148ff66c89fe63d9eb1620243e3e96bb7900c87e5551b033d49a09ac4018599fa72dbad',
privateKey: '00dbd58eb615663adf7d078c6532d0eff3f2713ea1fe85fc1ae132f9aa196a5bf0'
},
'law-list': { // 法律法规-根据分类查询列表
id: 'gqyjglptthLaw',
publicKey: '0458df2864b796fa483084190b0908c554eb848fd9117cb6dc88c7df21f07e2e8cf7face6b9a31afe56c6910a35308c5631491307f78c30ce90b399629597bcad9',
privateKey: '00b3872079b70e21605edf2d5a18706cf075985a954551afd2f3970d4fc9756107'
},
'law-list-detail': { // 法律法规-详情
id: 'gqyjglptfindLawDetailsMobile',
publicKey: '04032817278e7ddf328535df4d0a9180f4006a757c8d62aabd07b89eb380c353ce6e9b5882dddd18673e2adeae840a1058321624898397bf1237240d8c5e2fdadd',
privateKey: '5adadd253436c736bc5036bc1399b4110df4153ffd856a574774d0a5d165a7dd'
},
}
// aes解密
function aes_Decrypt(word, key) {
var key = CryptoJS.enc.Utf8.parse(key) //转为128bit
var srcs = CryptoJS.enc.Hex.parse(word) //转为16进制
var str = CryptoJS.enc.Base64.stringify(srcs) //变为Base64编码的字符串
var decrypt = CryptoJS.AES.decrypt(str, key, {
mode: CryptoJS.mode.ECB,
spadding: CryptoJS.pad.Pkcs7
})
return decrypt.toString(CryptoJS.enc.Utf8)
}
// sm2解密,需要创建加密应用时的私钥
function sm2_Decrypt(word, key) {
return SM.decrypt(word, key)
}
\ No newline at end of file
'use strict';
// 'use strict';
var contextPath = ''
var gemhoUtil = window.gemhoUtil || {}
console.log('gemhoUtil', gemhoUtil)
gemhoUtil.formatDate = function(date, type) {
var ymd =
`${date.getFullYear() + 1}-${((date.getMonth()+1)>9?'':'0')+(date.getMonth() + 1)}-${(date.getDate()>9?'':'0')+date.getDate()}`;
......@@ -210,7 +211,7 @@ gemhoUtil.navigatePage = function(path) {
* @param {Object} url 下载文件全路径
* https://h5.tfryb.com/hos-server/pub/jmas/jmasbucket//jmopen_files/webapp/jssdk/be0c4a53adf04f9db4e39a303af78689.docx
*/
gemhoUtil.downloadFile(url) {
gemhoUtil.downloadFile = function(url){
lightAppJssdk.download.downloadFiles({
filePath: 'https://h5.tfryb.com/hos-server/pub/jmas/jmasbucket//jmopen_files/webapp/jssdk/be0c4a53adf04f9db4e39a303af78689.docx',
success: function (data) {
......@@ -221,3 +222,21 @@ gemhoUtil.downloadFile(url) {
}
})
}
// aes解密
function aes_Decrypt(word, key) {
var key = CryptoJS.enc.Utf8.parse(key) //转为128bit
var srcs = CryptoJS.enc.Hex.parse(word) //转为16进制
var str = CryptoJS.enc.Base64.stringify(srcs) //变为Base64编码的字符串
var decrypt = CryptoJS.AES.decrypt(str, key, {
mode: CryptoJS.mode.ECB,
spadding: CryptoJS.pad.Pkcs7
})
return decrypt.toString(CryptoJS.enc.Utf8)
}
// sm2解密,需要创建加密应用时的私钥
function sm2_Decrypt(word, key) {
return SM.decrypt(word, key)
}
\ No newline at end of file
......@@ -50,11 +50,11 @@
</van-cell-group>
<van-cell-group>
<van-field v-model="form.hdInspectExpert" :disabled="true" label="检查人员" placeholder="" />
<van-field v-model="form.hdInspectExpert" :disabled="false" label="检查人员" placeholder="" />
</van-cell-group>
<van-cell-group :class="{'disable-van-cell': true}">
<van-cell>隐患类型:
<van-radio-group v-model="form.hdLevel" :disabled="true" direction="horizontal">
<van-radio-group v-model="form.hdLevel" :disabled="false" direction="horizontal">
<van-radio name="1">一般隐患</van-radio>
<van-radio name="2">重大隐患</van-radio>
</van-radio-group>
......@@ -86,13 +86,13 @@
</van-popup>
</van-cell-group>
<van-cell-group>
<van-field v-model="form.comment" :disabled="true" label="隐患描述" placeholder="" />
<van-field v-model="form.comment" :disabled="false" label="隐患描述" placeholder="" />
</van-cell-group>
<van-cell-group>
<van-field v-model="form.basis" :disabled="true" label="检查依据" placeholder="" />
<van-field v-model="form.basis" :disabled="false" label="检查依据" placeholder="" />
</van-cell-group>
<van-cell-group>
<van-field v-model="form.suggestion" :disabled="true" label="整改建议" placeholder="" />
<van-field v-model="form.suggestion" :disabled="false" label="整改建议" placeholder="" />
</van-cell-group>
<van-cell-group :class="{'disable-van-cell': true}">
<van-cell is-link @click="showPopup('showPopup4hdRectificationDate')">整改期限<span class="formValue">{{form.hdRectificationDate}}</span></van-cell>
......@@ -123,13 +123,13 @@
</van-cell-group>
<div v-if="form.hdStatus===1||form.hdStatus===3">
<van-cell-group>
<van-field v-model="form.hdInspectDate" :disabled="true" label="审核日期" placeholder="" />
<van-field v-model="form.hdInspectDate" :disabled="false" label="审核日期" placeholder="" />
</van-cell-group>
<van-cell-group>
<van-field v-model="form.hdAcceptancePerson" :disabled="true" label="审核人员" placeholder="" />
<van-field v-model="form.hdAcceptancePerson" :disabled="false" label="审核人员" placeholder="" />
</van-cell-group>
<van-cell-group>
<van-field v-model="form.hdRectificationRecord" :disabled="true" type="textarea" label="审核记录" autosize placeholder="" />
<van-field v-model="form.hdRectificationRecord" :disabled="false" type="textarea" label="审核记录" autosize placeholder="" />
</van-cell-group>
</div>
......
......@@ -86,6 +86,7 @@ window.addEventListener("load", function() {
this.editAble = true
this.resetData()
}
this.editAble = true
},
methods: {
......@@ -94,6 +95,9 @@ window.addEventListener("load", function() {
Object.assign(this.$data, this.$options.data.call(this));
},
showPopup(popupType){
if(this.editAble){
this[popupType] = true
}
},
detail(){
var hdId = localStorage.getItem('companyId')
......
......@@ -27,22 +27,48 @@ window.addEventListener("load", function() {
gemhoUtil.navigatePage('./yh-list-detail.html?companyId='+localStorage.getItem('companyId')+'&hdId='+item.hdId+'&type=edit')
},
getList(){
http.get('/api/thHiddenDanger',{
http2.post({
serviceId: API_KEY_MAP["yh-list"]['id'],
interfacePublicKey: API_KEY_MAP["yh-list"]["publicKey"],
interfacePrivateKey: API_KEY_MAP["yh-list"]["privateKey"],
reqParams: {
page: this.page++,// 每次请求增加下一页
size: this.size,
companyId: localStorage.getItem('companyId'),
county: localStorage.getItem('appCounty'),
sort: 'hdId,desc',
}).then((res)=>{
}
}, (res) => {
if(res){
console.log('接口回调数据', JSON.parse(res))
var result = JSON.parse(res)
this.loading = false; // 加载状态结束
this.list.push(...res.content);
this.total = res.totalElements
this.list.push(...result.content);
this.total = result.totalElements
if(this.page*this.size >= this.total){
this.finished = true; // 下滑不在刷新数据
}
}
})
// http2.get('/api/thHiddenDanger',{
// page: this.page++,// 每次请求增加下一页
// size: this.size,
// companyId: localStorage.getItem('companyId'),
// county: localStorage.getItem('appCounty'),
// sort: 'hdId,desc',
// }).then((res)=>{
// this.loading = false; // 加载状态结束
// this.list.push(...res.content);
// this.total = res.totalElements
// if(this.page*this.size >= this.total){
// this.finished = true; // 下滑不在刷新数据
// }
// })
}
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment