add:隐患列表接口

sdk/axios_http.js

@@ -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
 // post请求头
 // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'

src/_shanghu_detail.js

-// 在原有Vue实例中添加
-new Vue({
+var VUE = null
+window.addEventListener('load', function () {
+  // 在原有Vue实例中添加
+  new Vue({
     el: '#app',
     data() {
       return {
@@ -23,99 +25,107 @@ new Vue({
     methods: {
       // 新增选择确认方法
       onConfirmType(value) {
-			this.formData.type = value;
-			this.showTypePicker = false;
+        this.formData.type = value
+        this.showTypePicker = false
       },
       viewDetail(id) {
-			console.log('查看详情:', id);
+        console.log('查看详情:', id)
         // 这里添加跳转逻辑
+      },
+    },
+  })
+})
+const QR_IMAGE_URL = 'http://pic.616pic.com/ys_img/00/10/41/bL9gkesSxm.jpg'
+let canvasReady = false
+let loadedImages = 0
+
+// 将canvas初始化代码包裹在DOMContentLoaded事件中
+document.addEventListener('DOMContentLoaded', function () {
+  const canvas = document.getElementById('mainCanvas')
+  if (!canvas) {
+    console.error('未找到mainCanvas元素')
+    return
   }
+  const ctx = canvas.getContext('2d')
+
+  // 设置canvas尺寸（根据实际需求调整）
+  canvas.width = 300 // 新增宽度设置
+  canvas.height = 300 // 新增高度设置
+
+  // 加载二维码图片
+  const img = new Image()
+  img.crossOrigin = 'Anonymous' // 处理跨域问题
+  img.src = '../image/code/erweima.png' // QR_IMAGE_URL;
+
+  const img4erweima = new Image()
+  img4erweima.crossOrigin = 'Anonymous' // 处理跨域问题
+  img4erweima.src = QR_IMAGE_URL // QR_IMAGE_URL;
+
+  img.onload = function () {
+    loadedImages++
+    drawImages()
   }
-}); <
-/script> <
-script >
-	const QR_IMAGE_URL = 'http://pic.616pic.com/ys_img/00/10/41/bL9gkesSxm.jpg';
-let canvasReady = false;
-// 记录已加载的图片数量
-let loadedImages = 0;
-
-const canvas = document.getElementById('mainCanvas');
-const ctx = canvas.getContext('2d');
-// 加载二维码图片
-const img = new Image();
-img.crossOrigin = "Anonymous"; // 处理跨域问题
-img.src = '../image/code/erweima.png'; // QR_IMAGE_URL;
-
-
-const img4erweima = new Image();
-img4erweima.crossOrigin = "Anonymous"; // 处理跨域问题
-img4erweima.src = QR_IMAGE_URL; // QR_IMAGE_URL;
-
-img.onload = function() {
-	loadedImages++;
-	drawImages();
-};
-
-img4erweima.onload = function() {
-	loadedImages++;
-	drawImages();
-};
-
-
-function drawImages() {
+
+  img4erweima.onload = function () {
+    loadedImages++
+    drawImages()
+  }
+
+  function drawImages() {
     if (loadedImages === 2) {
       // 画布的宽度和高度
-		const canvasWidth = canvas.width;
-		const canvasHeight = canvas.height;
+      const canvasWidth = canvas.width
+      const canvasHeight = canvas.height
 
       // 图片的原始宽度和高度
-		const imgWidth = img.width;
-		const imgHeight = img.height;
+      const imgWidth = img.width
+      const imgHeight = img.height
 
       // 计算宽度和高度的缩放比例
-		const scaleX = canvasWidth / imgWidth;
-		const scaleY = canvasHeight / imgHeight;
+      const scaleX = canvasWidth / imgWidth
+      const scaleY = canvasHeight / imgHeight
 
       // 取较小的缩放比例作为最终的缩放比例
-		const scale = Math.min(scaleX, scaleY);
+      const scale = Math.min(scaleX, scaleY)
 
       // 计算缩放后的图片宽度和高度
-		const scaledWidth = imgWidth * scale;
-		const scaledHeight = imgHeight * scale;
+      const scaledWidth = imgWidth * scale
+      const scaledHeight = imgHeight * scale
 
       // 计算图片在画布上的绘制位置，使其居中显示
-		const x = (canvasWidth - scaledWidth) / 2;
-		const y = (canvasHeight - scaledHeight) / 2;
+      const x = (canvasWidth - scaledWidth) / 2
+      const y = (canvasHeight - scaledHeight) / 2
 
       // 绘制图片到 canvas 上
-		ctx.drawImage(img, x, y, scaledWidth, scaledHeight);
+      ctx.drawImage(img, x, y, scaledWidth, scaledHeight)
 
       // 绘制前景图标
-		const fgIconSize = 150; // 假设前景图标显示的尺寸
-		const fgX = (canvasWidth - fgIconSize) / 2;
-		const fgY = (canvasHeight - fgIconSize) / 2;
+      const fgIconSize = 150 // 假设前景图标显示的尺寸
+      const fgX = (canvasWidth - fgIconSize) / 2
+      const fgY = (canvasHeight - fgIconSize) / 2
 
       // 绘制二维码
-		ctx.drawImage(img4erweima, fgX, fgY, fgIconSize, fgIconSize);
+      ctx.drawImage(img4erweima, fgX, fgY, fgIconSize, fgIconSize)
 
-		canvasReady = true;
+      canvasReady = true
     }
-}
+  }
+})
 
 function saveCanvas() {
-	if (!canvasReady) return;
+  if (!canvasReady) return
 
-	const canvas = document.getElementById('mainCanvas');
-	const dataURL = canvas.toDataURL('image/png');
+  const canvas = document.getElementById('mainCanvas')
+  const dataURL = canvas.toDataURL('image/png')
   console.log(dataURL, '图片下载')
 
   lightAppJssdk.media.savePhoto({
     arg: dataURL,
-		success: function(data) {
-			alert(JSON.stringify(data));
+    success: function (data) {
+      alert(JSON.stringify(data))
     },
-		fail: function(data) {
-			alert(data);
-		}
-	});
+    fail: function (data) {
+      alert(data)
+    },
+  })
 }

src/_yh-check.html

@@ -28,11 +28,11 @@
 				<!-- Tab栏 -->
 				<van-tabs v-model:active="activeTab" title-active-color="#1989fa" line-height="2px"
 					style="margin-bottom: 15px;">
-					<van-tab title="全部"></van-tab>
-					<van-tab title="待审核"></van-tab>
-					<van-tab title="待整改"></van-tab>
-					<van-tab title="已整改"></van-tab>
-					<van-tab title="整改逾期"></van-tab>
+					<van-tab title="全部" name=""></van-tab>
+					<van-tab title="待审核"  name="2"></van-tab>
+					<van-tab title="待整改"  name="0"></van-tab>
+					<van-tab title="已整改"  name="1"></van-tab>
+					<van-tab title="整改逾期"  name="3"></van-tab>
 				</van-tabs>
 
 				<!-- 隐患列表 -->
@@ -56,13 +56,13 @@
 									{{ item.status }}
 								</van-tag>
 								<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)" />
 							</div>
 				
 							<!-- 第三行：商家和箭头 -->
 							<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>
 					</van-cell>

src/_yh-check.js

 var VUE = null
-window.addEventListener("load", function() {
+window.addEventListener('load', function () {
   VUE = new Vue({
     // 在原有Vue实例中添加
     el: '#app',
@@ -8,13 +8,14 @@ window.addEventListener("load", function() {
         shanghuName: '',
         // 新增子Tab数据
         subActiveTab: 0,
-				hazardList: [{
+        hazardList: [
+          {
             id: 1,
             description: '消防通道被货物堵塞，存在严重安全隐患',
             status: '待审核',
             date: '2024-03-15',
             shop: 'XX餐饮店',
-						type: 2
+            type: 2,
           },
           {
             id: 2,
@@ -22,47 +23,59 @@ window.addEventListener("load", function() {
             status: '待整改',
             date: '2024-03-15',
             shop: 'XX餐饮店',
-						type: 2
+            type: 2,
           },
           // 更多示例数据...
         ],
-				activeTab: 0,
+        activeTab: '',
       }
     },
     computed: {
       filteredHazards() {
-				const statusMap = ['全部', '待审核', '待整改', '已整改'];
-				return this.hazardList.filter(item =>
-					this.subActiveTab === 0 ? true : item.status === statusMap[this.subActiveTab]
-				);
-			}
+        const statusMap = ['全部', '待审核', '待整改', '已整改']
+        return this.hazardList.filter((item) =>
+          this.subActiveTab === 0
+            ? true
+            : item.status === statusMap[this.subActiveTab]
+        )
+      },
+    },
+    created() {
+      this.init()
     },
     methods: {
+      init() {
+        this.getHazardList()
+      },
       onSearch() {
         console.log('xxxx')
       },
       // 新增选择确认方法
       onConfirmType(value) {
-				this.formData.type = value;
-				this.showTypePicker = false;
-			},
-			onConfirmTime(time) {
-				this.formData.businessHours = time;
-				this.showTimePicker = false;
+        this.formData.type = value
+        this.showTypePicker = false
       },
       statusTagType(status) {
         const types = {
-					'待审核': 'warning',
-					'待整改': 'primary',
-					'已整改': 'success',
-					'整改逾期': 'danger',
-				};
-				return types[status] || '';
+          待审核: 'warning',
+          待整改: 'primary',
+          已整改: 'success',
+          整改逾期: 'danger',
+        }
+        return types[status] || ''
       },
       viewDetail(id) {
-				console.log('查看详情:', id);
+        console.log('查看详情:', id)
         // 这里添加跳转逻辑
-			}
-		}
-	});
+      },
+      //获取隐患列表数据
+      getHazardList() {
+        http
+          .get('/gq/hiddenDanger/list?merId=1&status=' + this.activeTab)
+          .then((res) => {
+            console.log(res)
+          })
+      },
+    },
+  })
 })