Skip to content

G
GaoQuYingJiH5-ASD
Commit 36bc6488 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

优化rev1

parent 0eb4a091
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 379 deletions
css/index.css deleted 100644 → 0
View file @ 0eb4a091
body {
min-width: 320px;
max-width: 750px;
width: 10rem;
margin: 0 auto;
line-height: 1.5;
font-family: Arial, Helvetica;
background: #f2f2f2;
}
/* 如果屏幕超过了750px,就按照750px显示 */
@media screen and (min-width: 750px) {
html {
/* 提高权重 */
font-size: 75px!important;
}
}
a {
text-decoration: none;
font-size: .3333rem;
}
.search-content {
display: flex;
position: fixed;
top: 0;
left: 50%;
transform: translateX(-50%);
width: 10rem;
height: 1.1733rem;
background-color: #ffc001;
}
.search-content .classify {
width: .5867rem;
height: .9333rem;
margin: .16rem .3333rem .1333rem;
background: url(../images/classify.png) no-repeat;
background-size: .5867rem .9333rem;
}
.search-content .search {
flex: 1;
}
.search-content .search input {
outline: none;
border: 0;
width: 100%;
height: .88rem;
font-size: .3333rem;
background-color: #fff2cc;
margin-top: .1333rem;
border-radius: .44rem;
color: #757575;
padding-left: .7333rem;
}
.search-content .login {
width: 1rem;
height: .9333rem;
margin: .1333rem;
color: #fff;
text-align: center;
line-height: .9333rem;
}
\ No newline at end of file
index.html
View file @ 36bc6488
...@@ -53,13 +53,6 @@ ...@@ -53,13 +53,6 @@
<script type="text/javascript" src="sdk/jssdk2/index.js"></script> <script type="text/javascript" src="sdk/jssdk2/index.js"></script>
<div id="app"> <div id="app">
<div class="wrapper"> <div class="wrapper">
<!-- <div class="">
<van-image
width="100"
height="100"
src="https://img01.yzcdn.cn/vant/cat.jpeg"
/>
</div> -->
<div class="item"> <div class="item">
<p class="bgImg" @click="nav('yh-list')"> <p class="bgImg" @click="nav('yh-list')">
<span>隐患管理</span> <span>隐患管理</span>
...@@ -77,8 +70,6 @@ ...@@ -77,8 +70,6 @@
</p> </p>
</div> --> </div> -->
<!-- <div class="item"> <!-- <div class="item">
<p class="bgImg" @click="nav('emergency')"> <p class="bgImg" @click="nav('emergency')">
<span>应急演练</span> <span>应急演练</span>
......
sdk/http.js
View file @ 36bc6488
/** axios封装 /** 爱山东网管请求封装
* 请求拦截、相应拦截、错误统一处理 * 请求拦截、相应拦截、错误统一处理
*/ */
// 环境的切换
axios.defaults.baseURL = 'http://192.168.3.37:8036'
axios.defaults.timeout = 50000
// post请求头
// axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
axios.defaults.headers.post['Content-Type'] = 'application/json'
axios.defaults.headers.common['systemId'] = '1'
axios.defaults.headers.common['Authorization'] = localStorage.getItem('Authorization')
// 请求拦截器
axios.interceptors.request.use(config => { var http2 = {
console.log('request拦截器', config) post: function(params, fn) {
vant.Toast.loading({ /**
message: '加载中...', * 网关验签接口
forbidClick: true, * @param {1} = appid应用唯一标识
loadingType: 'spinner', * @param {2} = interfaceid接口唯一标识
}); * @param {3} = data接口参数,请使用json格式, 例如:{"siteid":"2","cateid":"1"}
return config * @param {4} = fromport端口来源"0"：PC；"1"：APP；"2"：支付宝；"3"：微信
}) * @param {5} = extraData 额外参数,附件,请求头一类的参数
*
// 响应拦截器 */
axios.interceptors.response.use((res) => { const data = SM.encrypt(JSON.stringify(params.reqParams), params.interfacePublicKey)
// 成功的响应数据 服务器的相关的数据返回来之后，响应拦截器能够检测到，可以做一些事
console.log('http2方法进来了~普通请求参数', JSON.stringify(params.reqParams))
vant.Toast.clear()
return res; const extraData = { // 公共请求头设置
}, (error) => { header: {
// 响应失败的时候的回调函数 // Authorization: "Bearer eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiI0ODA3ODFkZmQxYmE0MmM0OGQyZDQ5NTllYzcyYTUwNCIsInVzZXIiOiJqYyIsInN1YiI6ImpjIn0.WfLq11T7iWPiMuzqDY2N54aIqdv-ciYCe6pINqQAeBdqlMiJmkufsqlD2YMmUzsHA-o4WerkiSYnPzexEMiAJA"
return Promise.reject(new Error(error)) Authorization: localStorage.getItem('token')
}) },
}
if(params.fileList){ // 用于接口传递的额外参数 如文件流等){
var http = { extraData.fileList = params.fileList
get: function(url, params) { }
return new Promise((resolve, reject) => { console.log('http2方法进来了~extraData', extraData)
axios
.get(url, { // vaildInterfacefn("gqyjglptxiefn", params.serviceId, data, "1", "https://" + urldomaincreatesign, "https://" + urldomaingateway).then((value) => {
params: params vaildInterfacefn("gqyjglptxiefn", params.serviceId, data, "1", extraData).then((value) => {
}) console.log('vaildInterfacefn响应', value)
.then(res => { /**
resolve(res.data) * code: 200
}) data: "048b04671ad85e52e" // value 值就是接口返回的data值
.catch(err => { msg: "请求成功"
reject(err.data) success: true
}) */
}) if(!value){
}, vant.Dialog.alert({
post: function(url, params) { title: '信息提示',
return new Promise((resolve, reject) => { //message: '网络错误',
axios message: '请求异常'
.post(url, params)
.then(res => {
let response = res.data
console.log('res.statusCode', response)
if (response.statusCode >= 300 || response.status >= 300) {
// alert('系统发生错误')
vant.Dialog.alert({
title: '信息提示',
message: response.message,
})
return
}
resolve(res.data)
})
.catch(err => {
reject(err.data)
})
})
},
delete: function(url, params) {
return new Promise((resolve, reject) => {
axios({
url,
method: 'post',
data: params,
headers: {
// 'Content-Type': 'application/json', // 'multipart/form-data;',
'Authorization': localStorage.getItem('Authorization'),
'requestType': 'delete'
},
})
.then(res => {
let response = res.data
console.log('res.statusCode', response)
if (response.statusCode >= 300 || response.status >= 300) {
// alert('系统发生错误')
vant.Dialog.alert({
title: '信息提示',
message: response.message,
})
return
}
resolve(res.data)
}) })
.catch(err => { return
reject(err.data) }
if(value.code === '400' || value.code === '401'){
vant.Dialog.alert({
title: '信息提示',
message: value.msg,
}) })
return
}
let sm2_encrypt_result = value // 后台返回待解密内容
let sm2_decrypt_result = sm2_Decrypt(sm2_encrypt_result, params.interfacePrivateKey)
console.log('vaildInterfacefn响应解密', sm2_decrypt_result)
fn && fn(sm2_decrypt_result)
}) })
}, },
put: function(url, params) {
return new Promise((resolve, reject) => {
axios({
url,
method: 'post',
data: params,
headers: {
// 'Content-Type': 'application/json', // 'multipart/form-data;',
'Authorization': localStorage.getItem('Authorization'),
'requestType': 'put'
},
})
.then(res => {
let response = res.data
console.log('res.statusCode', response)
if (response.statusCode >= 300 || response.status >= 300) {
// alert('系统发生错误')
vant.Dialog.alert({
title: '信息提示',
message: response.message,
})
return
}
resolve(res.data)
})
.catch(err => {
reject(err.data)
})
})
},
postFile: function(url, params) {
return new Promise((resolve, reject) => {
axios({
url,
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json', // 'multipart/form-data;',
'Authorization': localStorage.getItem('Authorization')
},
}).then(res => {
let response = res.data
console.log('res.statusCode', response)
if (response.statusCode >= 300 || response.status >= 300) {
// alert('系统发生错误')
vant.Dialog.alert({
title: '信息提示',
message: response.message,
})
return
}
resolve(res.data)
})
.catch(err => {
reject(err.data)
})
})
},
downloadFile: function(url, params) {
console.log('downloadfILE', params)
return new Promise((resolve, reject) => {
axios({
url,
method: 'get',
// data: params,
params: params,
headers: {
// 'Content-Type': 'application/json', // 'multipart/form-data;',
'Authorization': localStorage.getItem('Authorization')
},
responseType: 'blob' //在请求中加上这一行，特别重要
}).then(res => {
// 返回格式是文件流格式
// 在请求拿到文件流res以后，使用a标签下载
let fileData = res.data
let blob = new Blob([fileData], {
type: 'application/msword;charset=UTF-8'
}
/* , {
type: `application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=utf-8;`
} */
)
var a = document.createElement('a');
document.body.appendChild(a);
a.style = 'display: none';
var url = window.URL.createObjectURL(blob);
a.href = url;
a.setAttribute('download', 'YH-' + gemhoUtil.getTargetDateYMD().replaceAll('-',
'') + '.docx')
a.click();
a.remove();
window.URL.revokeObjectURL(url);
})
.catch(err => {
reject(err.data)
})
})
},
} }
\ No newline at end of file
sdk/http2.js deleted 100644 → 0
View file @ 0eb4a091
/** 爱山东网管请求封装
* 请求拦截、相应拦截、错误统一处理
*/
// const appmark = "sdzwapp"
// localStorage.setItem('appCounty', '371071000000')
// var token =
// "Bearer eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiJiOGQ4OTIxNTY2ODA0ZjliOWIwMTlhZGEzZDFkNTg5MCIsInVzZXIiOiJkYWJhbyIsInN1YiI6ImRhYmFvIn0.LFyN4rsVDvT4ZA2_hDl4kDre6KdFm-p4HLVtYAreLxM5i_Y7GOKqb4S_4oWnseDJ0x8PZ4n7UN8J2p91X6VmyA";
// localStorage.setItem('Authorization', token)
var http2 = {
post: function(params, fn) {
/**
* 网关验签接口
* @param {1} = appid应用唯一标识
* @param {2} = interfaceid接口唯一标识
* @param {3} = interfacecontent接口参数,请使用json格式, 例如:{"siteid":"2","cateid":"1"}
* @param {4} = fromport端口来源"0"：PC；"1"：APP；"2"：支付宝；"3"：微信
* @param {5} = signurl签名接口地址
* @param {6} = gatewayurl网关接口地址
* @param {7} = extraData 额外参数,附件,请求头一类的参数
*
*/
const interfaceContent = {
// app_id: appmark,
// servicename: param.serviceId, // "ticketValidate",
params: SM.decrypt(JSON.stringify(params.reqParams), params.interfacePublicKey)
}
const data = SM.encrypt(JSON.stringify(params.reqParams), params.interfacePublicKey)
// const data = JSON.stringify(params.reqParams)
console.log('http2方法进来了~普通请求参数', JSON.stringify(params.reqParams))
const extraData = { // 公共请求头设置
header: {
// Authorization: "Bearer eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiI0ODA3ODFkZmQxYmE0MmM0OGQyZDQ5NTllYzcyYTUwNCIsInVzZXIiOiJqYyIsInN1YiI6ImpjIn0.WfLq11T7iWPiMuzqDY2N54aIqdv-ciYCe6pINqQAeBdqlMiJmkufsqlD2YMmUzsHA-o4WerkiSYnPzexEMiAJA"
Authorization: localStorage.getItem('token')
},
}
if(params.fileList){ // 用于接口传递的额外参数 如文件流等){
extraData.fileList = params.fileList
}
console.log('http2方法进来了~extraData', extraData)
// vaildInterfacefn("jisnzjk", "ticketvalidate", JSON.stringify(interfaceContent), "1", "https://" + urldomaincreatesign, "https://" + urldomaingateway).then((value) => {
// vaildInterfaceWithHeadersfn(appid, interfaceid, interfacecontent, fromport, headers, signurl, gatewayurl)
// vaildInterfaceWithHeadersfn("gqyjglptxiefn", params.serviceId, data, "1", headers, "https://" + urldomaincreatesign, "https://" + urldomaingateway).then((value) => {
// vaildInterfacefn("gqyjglptxiefn", params.serviceId, data, "1", "https://" + urldomaincreatesign, "https://" + urldomaingateway).then((value) => {
vaildInterfacefn("gqyjglptxiefn", params.serviceId, data, "1", extraData).then((value) => {
console.log('vaildInterfacefn响应', value)
/**
* code: 200
data: "048b04671ad85e52e" // value 值就是接口返回的data值
msg: "请求成功"
success: true
*/
if(!value){
vant.Dialog.alert({
title: '信息提示',
message: '请求异常'//'网络错误',
})
return
}
if(value.code === '400' || value.code === '401'){
vant.Dialog.alert({
title: '信息提示',
message: value.msg,
})
return
}
let sm2_encrypt_result = value
let sm2_decrypt_result = sm2_Decrypt(sm2_encrypt_result, params.interfacePrivateKey)
console.log('vaildInterfacefn响应解密', sm2_decrypt_result)
fn && fn(sm2_decrypt_result)
})
},
}
\ No newline at end of file
sdk/includeHead.js
View file @ 36bc6488
...@@ -33,7 +33,7 @@ document.write('<script type="text/javascript" src="' + contextPath + '/sdk/vue. ...@@ -33,7 +33,7 @@ document.write('<script type="text/javascript" src="' + contextPath + '/sdk/vue.
<script type="text/javascript" src="' + contextPath + '/sdk/flexible.js"></script>\ <script type="text/javascript" src="' + contextPath + '/sdk/flexible.js"></script>\
<script type="text/javascript" src="' + contextPath + '/sdk/util.js?rev=' + jsVersion + '"></script>\ <script type="text/javascript" src="' + contextPath + '/sdk/util.js?rev=' + jsVersion + '"></script>\
<script type="text/javascript" src="' + contextPath + '/sdk/jssdk2/apiKeyMap.js?rev=' + jsVersion + '"></script>\ <script type="text/javascript" src="' + contextPath + '/sdk/jssdk2/apiKeyMap.js?rev=' + jsVersion + '"></script>\
<script type="text/javascript" src="' + contextPath + '/sdk/http2.js?rev=' + jsVersion + '"></script>'); <script type="text/javascript" src="' + contextPath + '/sdk/http.js?rev=' + jsVersion + '"></script>');
......
sdk/util.js
View file @ 36bc6488
// 'use strict';
var contextPath = ''
var gemhoUtil = window.gemhoUtil || {} var gemhoUtil = window.gemhoUtil || {}
console.log('gemhoUtil', gemhoUtil)
gemhoUtil.formatDate = function(date, type) { gemhoUtil.formatDate = function(date, type) {
var ymd = var ymd =
`${date.getFullYear() + 1}-${((date.getMonth()+1)>9?'':'0')+(date.getMonth() + 1)}-${(date.getDate()>9?'':'0')+date.getDate()}`; `${date.getFullYear() + 1}-${((date.getMonth()+1)>9?'':'0')+(date.getMonth() + 1)}-${(date.getDate()>9?'':'0')+date.getDate()}`;
...@@ -203,7 +200,7 @@ gemhoUtil.navigatePage = function(path) { ...@@ -203,7 +200,7 @@ gemhoUtil.navigatePage = function(path) {
if (!path) { if (!path) {
return; return;
} }
var url = contextPath; var url = '';
if (path.indexOf('?') > -1) { // 带有参数 if (path.indexOf('?') > -1) { // 带有参数
url += path + '&rev=' + (+new Date()) url += path + '&rev=' + (+new Date())
} else { } else {
......
src/yh-list-detail.html
View file @ 36bc6488
...@@ -89,6 +89,9 @@ ...@@ -89,6 +89,9 @@
</van-cell-group> </van-cell-group>
<van-cell-group v-if="disabled" :class="{'disable-van-cell': true}"> <van-cell-group v-if="disabled" :class="{'disable-van-cell': true}">
<van-cell>整改照片 <van-cell>整改照片
<h5 v-if="form.hdStatus == 3 || form.hdStatus == 2" style="color:indianred;font-size: 12px;">
整改图片已提交审核, 审核通过后显示
</h5>
<div style="width: 2.5rem;"> <div style="width: 2.5rem;">
<van-image <van-image
width="100" width="100"
...@@ -107,7 +110,7 @@ ...@@ -107,7 +110,7 @@
</van-cell-group> </van-cell-group>
<div v-if="form.hdStatus===1||form.hdStatus===3"> <div v-if="form.hdStatus===1||form.hdStatus===3">
<van-cell-group> <van-cell-group>
<van-field v-model="form.hdInspectDate" :disabled="true" label="审核日期" /> <van-field v-model="form.hdRectificationDate" :disabled="true" label="审核日期" />
</van-cell-group> </van-cell-group>
<van-cell-group> <van-cell-group>
<van-field v-model="form.hdAcceptancePerson" :disabled="true" label="审核人员" /> <van-field v-model="form.hdAcceptancePerson" :disabled="true" label="审核人员" />
......
src/yh-list-detail.js
View file @ 36bc6488
...@@ -42,15 +42,14 @@ window.addEventListener("load", function() { ...@@ -42,15 +42,14 @@ window.addEventListener("load", function() {
mounted() { mounted() {
if(gemhoUtil.getParameter('type') === 'detail'){ if(gemhoUtil.getParameter('type') === 'detail'){
this.disabled = true this.disabled = true
this.detail()
}else if(gemhoUtil.getParameter('type') === 'edit'){ }else if(gemhoUtil.getParameter('type') === 'edit'){
this.disabled = false this.disabled = false
this.detail()
} }
this.detail()
}, },
computed:{ computed:{
hdLevelText(){ hdLevelText(){
return this.form.hdLevel===1?'一般隐患': '重大隐患' return this.form.hdLevel===1 ? '一般隐患' : '重大隐患'
} }
}, },
methods: { methods: {
...@@ -69,8 +68,6 @@ window.addEventListener("load", function() { ...@@ -69,8 +68,6 @@ window.addEventListener("load", function() {
page: 0,// 每次请求增加下一页 page: 0,// 每次请求增加下一页
size: 1, size: 1,
hdId: gemhoUtil.getParameter('hdId'), hdId: gemhoUtil.getParameter('hdId'),
// companyId: localStorage.getItem('companyId'),
// county: localStorage.getItem('appCounty'),
sort: 'hdId,desc', sort: 'hdId,desc',
} }
}, (res) => { }, (res) => {
...@@ -132,7 +129,7 @@ window.addEventListener("load", function() { ...@@ -132,7 +129,7 @@ window.addEventListener("load", function() {
console.log('响应结果', result) console.log('响应结果', result)
vant.Toast.clear() // vant.Toast.clear()
vant.Toast({ vant.Toast({
message: '操作完成', message: '操作完成',
}) })
......
src/yh-list.html
View file @ 36bc6488
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
</p> </p>
<div class="list-function-btn-wrapper pd-01rem"> <div class="list-function-btn-wrapper pd-01rem">
<van-button v-if="item.hdStatus===1||item.hdStatus===3" type="info" size="mini" @click="detail(item)">查看</van-button> <van-button v-if="item.hdStatus===1||item.hdStatus===3" type="info" size="mini" @click="detail(item)">查看</van-button>
<!-- <van-button v-if="item.hdStatus===0||item.hdStatus===2" type="info" size="mini" @click="edit(item)">提交</van-button> --> <van-button v-if="item.hdStatus===0||item.hdStatus===2" type="info" size="mini" @click="edit(item)">提交</van-button>
<van-button type="info" size="mini" @click="edit(item)">提交</van-button> <!-- <van-button type="info" size="mini" @click="edit(item)">提交</van-button> -->
</div> </div>
</div> </div>
</van-cell> </van-cell>
......
src/yh-list.js
View file @ 36bc6488
...@@ -31,6 +31,7 @@ window.addEventListener("load", function() { ...@@ -31,6 +31,7 @@ window.addEventListener("load", function() {
return return
} }
this.loading = true this.loading = true
http2.post({ http2.post({
serviceId: API_KEY_MAP["yh-list"]['id'], serviceId: API_KEY_MAP["yh-list"]['id'],
interfacePublicKey: API_KEY_MAP["yh-list"]["publicKey"], interfacePublicKey: API_KEY_MAP["yh-list"]["publicKey"],
...@@ -38,17 +39,11 @@ window.addEventListener("load", function() { ...@@ -38,17 +39,11 @@ window.addEventListener("load", function() {
reqParams: { reqParams: {
page: this.page++,// 每次请求增加下一页 page: this.page++,// 每次请求增加下一页
size: this.size, size: this.size,
// companyId: localStorage.getItem('companyId'),
// county: localStorage.getItem('appCounty'),
sort: 'hdId,desc', sort: 'hdId,desc',
} }
}, (res) => { }, (res) => {
if(res){ if(res){
console.log('接口回调数据', JSON.parse(res))
var result = JSON.parse(res) var result = JSON.parse(res)
this.loading = false; // 加载状态结束
this.list.push(...result.content); this.list.push(...result.content);
this.total = result.totalElements this.total = result.totalElements
...@@ -58,23 +53,6 @@ window.addEventListener("load", function() { ...@@ -58,23 +53,6 @@ window.addEventListener("load", function() {
this.loading = false this.loading = false
} }
}) })
// 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