Skip to content

G
GaoQuYingJiH5-ASD
Commit 034023ed authored by lei's avatar lei
Browse files
Options

add:隐患列表接口

parent b9776da9
Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 194 deletions
sdk/axios_http.js
View file @ 034023ed
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* 请求拦截、相应拦截、错误统一处理 * 请求拦截、相应拦截、错误统一处理
*/ */
// 环境的切换 // 环境的切换
axios.defaults.baseURL = 'http://192.168.2.16:8080' axios.defaults.baseURL = 'http://192.168.2.37:8080'
axios.defaults.timeout = 50000 axios.defaults.timeout = 50000
// post请求头 // post请求头
// axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8' // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
......
src/_shanghu_detail.js
View file @ 034023ed
// 在原有Vue实例中添加 var VUE = null
new Vue({ window.addEventListener('load', function () {
el: '#app', // 在原有Vue实例中添加
data() { new Vue({
return { el: '#app',
formData: { data() {
principal: '', return {
phone: '', formData: {
area: '', principal: '',
businessHours: '', phone: '',
type: '', // 新增类型字段 area: '',
sjName1: '威海市宝威酒店有限公司', businessHours: '',
sjName2: 'XXX', type: '', // 新增类型字段
sjName3: '0631-522221212', sjName1: '威海市宝威酒店有限公司',
sjName4: '威海市XXXXXXXXX', sjName2: 'XXX',
sjName5: '小餐饮', sjName3: '0631-522221212',
}, sjName4: '威海市XXXXXXXXX',
showTypePicker: false, sjName5: '小餐饮',
typeOptions: ['小餐饮', '酒店', '商场', '学校', '医疗机构'], },
} showTypePicker: false,
}, typeOptions: ['小餐饮', '酒店', '商场', '学校', '医疗机构'],
computed: {}, }
methods: { },
// 新增选择确认方法 computed: {},
onConfirmType(value) { methods: {
this.formData.type = value; // 新增选择确认方法
this.showTypePicker = false; onConfirmType(value) {
}, this.formData.type = value
viewDetail(id) { this.showTypePicker = false
console.log('查看详情:', id); },
// 这里添加跳转逻辑 viewDetail(id) {
} console.log('查看详情:', id)
} // 这里添加跳转逻辑
}); < },
/script> < },
script > })
const QR_IMAGE_URL = 'http://pic.616pic.com/ys_img/00/10/41/bL9gkesSxm.jpg'; })
let canvasReady = false; const QR_IMAGE_URL = 'http://pic.616pic.com/ys_img/00/10/41/bL9gkesSxm.jpg'
// 记录已加载的图片数量 let canvasReady = false
let loadedImages = 0; let loadedImages = 0
const canvas = document.getElementById('mainCanvas'); // 将canvas初始化代码包裹在DOMContentLoaded事件中
const ctx = canvas.getContext('2d'); document.addEventListener('DOMContentLoaded', function () {
// 加载二维码图片 const canvas = document.getElementById('mainCanvas')
const img = new Image(); if (!canvas) {
img.crossOrigin = "Anonymous"; // 处理跨域问题 console.error('未找到mainCanvas元素')
img.src = '../image/code/erweima.png'; // QR_IMAGE_URL; return
}
const ctx = canvas.getContext('2d')
const img4erweima = new Image();
img4erweima.crossOrigin = "Anonymous"; // 处理跨域问题 // 设置canvas尺寸（根据实际需求调整）
img4erweima.src = QR_IMAGE_URL; // QR_IMAGE_URL; canvas.width = 300 // 新增宽度设置
canvas.height = 300 // 新增高度设置
img.onload = function() {
loadedImages++; // 加载二维码图片
drawImages(); const img = new Image()
}; img.crossOrigin = 'Anonymous' // 处理跨域问题
img.src = '../image/code/erweima.png' // QR_IMAGE_URL;
img4erweima.onload = function() {
loadedImages++; const img4erweima = new Image()
drawImages(); img4erweima.crossOrigin = 'Anonymous' // 处理跨域问题
}; img4erweima.src = QR_IMAGE_URL // QR_IMAGE_URL;
img.onload = function () {
function drawImages() { loadedImages++
if (loadedImages === 2) { drawImages()
// 画布的宽度和高度 }
const canvasWidth = canvas.width;
const canvasHeight = canvas.height; img4erweima.onload = function () {
loadedImages++
// 图片的原始宽度和高度 drawImages()
const imgWidth = img.width; }
const imgHeight = img.height;
function drawImages() {
// 计算宽度和高度的缩放比例 if (loadedImages === 2) {
const scaleX = canvasWidth / imgWidth; // 画布的宽度和高度
const scaleY = canvasHeight / imgHeight; const canvasWidth = canvas.width
const canvasHeight = canvas.height
// 取较小的缩放比例作为最终的缩放比例
const scale = Math.min(scaleX, scaleY); // 图片的原始宽度和高度
const imgWidth = img.width
// 计算缩放后的图片宽度和高度 const imgHeight = img.height
const scaledWidth = imgWidth * scale;
const scaledHeight = imgHeight * scale; // 计算宽度和高度的缩放比例
const scaleX = canvasWidth / imgWidth
// 计算图片在画布上的绘制位置，使其居中显示 const scaleY = canvasHeight / imgHeight
const x = (canvasWidth - scaledWidth) / 2;
const y = (canvasHeight - scaledHeight) / 2; // 取较小的缩放比例作为最终的缩放比例
const scale = Math.min(scaleX, scaleY)
// 绘制图片到 canvas 上
ctx.drawImage(img, x, y, scaledWidth, scaledHeight); // 计算缩放后的图片宽度和高度
const scaledWidth = imgWidth * scale
// 绘制前景图标 const scaledHeight = imgHeight * scale
const fgIconSize = 150; // 假设前景图标显示的尺寸
const fgX = (canvasWidth - fgIconSize) / 2; // 计算图片在画布上的绘制位置，使其居中显示
const fgY = (canvasHeight - fgIconSize) / 2; const x = (canvasWidth - scaledWidth) / 2
const y = (canvasHeight - scaledHeight) / 2
// 绘制二维码
ctx.drawImage(img4erweima, fgX, fgY, fgIconSize, fgIconSize); // 绘制图片到 canvas 上
ctx.drawImage(img, x, y, scaledWidth, scaledHeight)
canvasReady = true;
} // 绘制前景图标
} const fgIconSize = 150 // 假设前景图标显示的尺寸
const fgX = (canvasWidth - fgIconSize) / 2
const fgY = (canvasHeight - fgIconSize) / 2
// 绘制二维码
ctx.drawImage(img4erweima, fgX, fgY, fgIconSize, fgIconSize)
canvasReady = true
}
}
})
function saveCanvas() { function saveCanvas() {
if (!canvasReady) return; if (!canvasReady) return
const canvas = document.getElementById('mainCanvas'); const canvas = document.getElementById('mainCanvas')
const dataURL = canvas.toDataURL('image/png'); const dataURL = canvas.toDataURL('image/png')
console.log(dataURL, '图片下载') console.log(dataURL, '图片下载')
lightAppJssdk.media.savePhoto({ lightAppJssdk.media.savePhoto({
arg: dataURL, arg: dataURL,
success: function(data) { success: function (data) {
alert(JSON.stringify(data)); alert(JSON.stringify(data))
}, },
fail: function(data) { fail: function (data) {
alert(data); alert(data)
} },
}); })
} }
\ No newline at end of file
src/_yh-check.html
View file @ 034023ed
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
<!-- Tab栏 --> <!-- Tab栏 -->
<van-tabs v-model:active="activeTab" title-active-color="#1989fa" line-height="2px" <van-tabs v-model:active="activeTab" title-active-color="#1989fa" line-height="2px"
style="margin-bottom: 15px;"> style="margin-bottom: 15px;">
<van-tab title="全部"></van-tab> <van-tab title="全部" name=""></van-tab>
<van-tab title="待审核"></van-tab> <van-tab title="待审核" name="2"></van-tab>
<van-tab title="待整改"></van-tab> <van-tab title="待整改" name="0"></van-tab>
<van-tab title="已整改"></van-tab> <van-tab title="已整改" name="1"></van-tab>
<van-tab title="整改逾期"></van-tab> <van-tab title="整改逾期" name="3"></van-tab>
</van-tabs> </van-tabs>
<!-- 隐患列表 --> <!-- 隐患列表 -->
...@@ -56,13 +56,13 @@ ...@@ -56,13 +56,13 @@
{{ item.status }} {{ item.status }}
</van-tag> </van-tag>
<span <span
style="color: #737373; font-size: 0.28rem;margin-left: -1.6rem;">检查时间：{{ item.date }}</span> style="color: #737373; font-size: 0.28rem;margin-left: -1.6rem;">检查时间：{{ item.checkDate }}</span>
<van-icon name="arrow" class="navToBtn" @click="viewDetail(item.id)" /> <van-icon name="arrow" class="navToBtn" @click="viewDetail(item.id)" />
</div> </div>
<!-- 第三行：商家和箭头 --> <!-- 第三行：商家和箭头 -->
<div style="display: flex; justify-content: space-between; align-items: center;"> <div style="display: flex; justify-content: space-between; align-items: center;">
<span style="color: #666; font-size: 0.28rem;">商家名称：威海市宝威酒店有限公司{{ item.shop }}</span> <span style="color: #666; font-size: 0.28rem;">所属任务：{{ item.typeName }}</span>
</div> </div>
</div> </div>
</van-cell> </van-cell>
......
src/_yh-check.js
View file @ 034023ed
var VUE = null var VUE = null
window.addEventListener("load", function() { window.addEventListener('load', function () {
VUE = new Vue({ VUE = new Vue({
// 在原有Vue实例中添加 // 在原有Vue实例中添加
el: '#app', el: '#app',
data() { data() {
return { return {
shanghuName: '', shanghuName: '',
// 新增子Tab数据 // 新增子Tab数据
subActiveTab: 0, subActiveTab: 0,
hazardList: [{ hazardList: [
id: 1, {
description: '消防通道被货物堵塞，存在严重安全隐患', id: 1,
status: '待审核', description: '消防通道被货物堵塞，存在严重安全隐患',
date: '2024-03-15', status: '待审核',
shop: 'XX餐饮店', date: '2024-03-15',
type: 2 shop: 'XX餐饮店',
}, type: 2,
{ },
id: 2, {
description: '消防通道被货物堵塞，存在严重安全隐患', id: 2,
status: '待整改', description: '消防通道被货物堵塞，存在严重安全隐患',
date: '2024-03-15', status: '待整改',
shop: 'XX餐饮店', date: '2024-03-15',
type: 2 shop: 'XX餐饮店',
}, type: 2,
// 更多示例数据... },
], // 更多示例数据...
activeTab: 0, ],
} activeTab: '',
}, }
computed: { },
filteredHazards() { computed: {
const statusMap = ['全部', '待审核', '待整改', '已整改']; filteredHazards() {
return this.hazardList.filter(item => const statusMap = ['全部', '待审核', '待整改', '已整改']
this.subActiveTab === 0 ? true : item.status === statusMap[this.subActiveTab] return this.hazardList.filter((item) =>
); this.subActiveTab === 0
} ? true
}, : item.status === statusMap[this.subActiveTab]
methods: { )
onSearch() { },
console.log('xxxx') },
}, created() {
// 新增选择确认方法 this.init()
onConfirmType(value) { },
this.formData.type = value; methods: {
this.showTypePicker = false; init() {
}, this.getHazardList()
onConfirmTime(time) { },
this.formData.businessHours = time; onSearch() {
this.showTimePicker = false; console.log('xxxx')
}, },
statusTagType(status) { // 新增选择确认方法
const types = { onConfirmType(value) {
'待审核': 'warning', this.formData.type = value
'待整改': 'primary', this.showTypePicker = false
'已整改': 'success', },
'整改逾期': 'danger', statusTagType(status) {
}; const types = {
return types[status] || ''; 待审核: 'warning',
}, 待整改: 'primary',
viewDetail(id) { 已整改: 'success',
console.log('查看详情:', id); 整改逾期: 'danger',
// 这里添加跳转逻辑 }
} return types[status] || ''
} },
}); viewDetail(id) {
}) console.log('查看详情:', id)
\ No newline at end of file // 这里添加跳转逻辑
},
//获取隐患列表数据
getHazardList() {
http
.get('/gq/hiddenDanger/list?merId=1&status=' + this.activeTab)
.then((res) => {
console.log(res)
})
},
},
})
})
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