From 560ecf763cb18bb9a9e1cf683a5a4ee8411f2e87 Mon Sep 17 00:00:00 2001
From: wr1207 <wyun001@163.com>
Date: 星期二, 17 十月 2023 11:44:33 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai
---
mobile/css/style.css | 3 ---
mobile/js/widget_search_view.js | 12 ++++++++++++
mobile/index.html | 2 +-
mobile/road_search.html | 7 ++++---
mobile/road.html | 23 -----------------------
5 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/mobile/css/style.css b/mobile/css/style.css
index ef5fb0b..9146986 100644
--- a/mobile/css/style.css
+++ b/mobile/css/style.css
@@ -565,9 +565,6 @@
width: 60px;
height: 60px;
padding: 4px;
- background: #fff;
- border-radius: 4px;
- box-shadow: 0 2px 6px rgba(0, 0, 0, .15);
}
.login-head>p {
diff --git a/mobile/index.html b/mobile/index.html
index 680f8a9..16e479f 100644
--- a/mobile/index.html
+++ b/mobile/index.html
@@ -35,7 +35,7 @@
<div class="login-head">
<img src="../img/logo.png" class="login-logo" />
涓婃捣甯傞亾璺氦閫氱幆澧冪洃娴嬪钩鍙�
- <p>璁╀笂娴风殑閬撹矾鐜鏇村姞缇庡ソ</p>
+ <p>涓烘寔缁敼鍠勭┖姘旇川閲忚�屽姫鍔�</p>
</div>
<div class="login-form" id="road">
<form id="myform">
diff --git a/mobile/js/widget_search_view.js b/mobile/js/widget_search_view.js
index 57dd46a..f6c5e42 100644
--- a/mobile/js/widget_search_view.js
+++ b/mobile/js/widget_search_view.js
@@ -107,6 +107,18 @@
$("#newname_a").html('鍚嶇О');
}
options.forEach(element => $("#qindex_selection").append("<option value='" + element + "'>" + element + "</option>"));
+ $("#qindex_selection").find("option[value=pm25]").text("PM鈧�.鈧�");
+ $("#qindex_selection").find("option[value=pm10]").text("PM鈧佲個");
+ $("#qindex_selection").find("option[value=no]").text("NO");
+ $("#qindex_selection").find("option[value=nox]").text("NO鈧�");
+ $("#qindex_selection").find("option[value=no2]").text("NO鈧�");
+ $("#qindex_selection").find("option[value=co]").text("CO");
+ $("#qindex_selection").find("option[value=so2]").text("SO鈧�");
+ $("#qindex_selection").find("option[value=o3]").text("O鈧�");
+ $("#qindex_selection").find("option[value=o31]").text("O鈧冣倎");
+ $("#qindex_selection").find("option[value=o38]").text("O鈧冣倛");
+ $("#qindex_selection").find("option[value=aqi]").text("AQI");
+ $("#qindex_selection").find("option[value=tsp]").text("TSP");
}
function reloadData(page) {
diff --git a/mobile/road.html b/mobile/road.html
index e7b2151..0e7162f 100644
--- a/mobile/road.html
+++ b/mobile/road.html
@@ -33,33 +33,10 @@
</div>
<div class="main map-panel" id="a1">
- <!--閬撹矾鏌ヨ 寮�濮�-->
<div class="map-panel-item">
<iframe src="road_search.html"></iframe>
</div>
- <!--閬撹矾鏌ヨ 缁撴潫-->
-
- <!--閬撹矾灞曠ず 寮�濮�-->
- <div class="map-panel-item">
- <iframe src="road_show.html"></iframe>
- </div>
- <!--閬撹矾灞曠ず 缁撴潫-->
</div>
-
- <!--footbar 寮�濮�-->
- <!-- <div class="footbar">
- <ul btn='btn' data-target="#a1">
- <li class="active"><i class="fa fa-search"></i> 閬撹矾鏌ヨ</li>
- <li><i class="fa fa-road"></i> 閬撹矾灞曠ず</li>
- </ul>
- </div> -->
- <!--footbar 缁撴潫-->
-
- <!--tabbar 寮�濮�-->
- <!-- <ul class="tabbar">
- <li class="active"><i class="fa fa-search"></i> 閬撹矾鏌ヨ</li>
- <li><i class="fa fa-road"></i> 閬撹矾灞曠ず</li>
- </ul> -->
<div class="footbar">
<ul>
<li>
diff --git a/mobile/road_search.html b/mobile/road_search.html
index ac869d2..3559c4c 100644
--- a/mobile/road_search.html
+++ b/mobile/road_search.html
@@ -151,7 +151,7 @@
<thead>
<tr style="background:#304b80; color: #fff;">
<th width="50">搴忓彿</th>
- <th width="80">
+ <th width="90">
<select id="regionSelect" style="width: 100%; background: #304b80; border: none;">
<option value="">涓婃捣甯�</option>
<option value="榛勬郸鍖�">榛勬郸鍖�</option>
@@ -172,8 +172,8 @@
<option value="鏅檧鍖�">鏅檧鍖�</option>
</select>
</th>
- <th style="width: calc(100% - 212px); overflow: hidden; text-overflow: ellipsis;" id="newname_a">鍚嶇О</th>
- <th width="80"><select style="width: 100%; background: #304b80; border: none;" id="qindex_selection"></select></th>
+ <th style="width: calc(100% - 232px); overflow: hidden; text-overflow: ellipsis;" id="newname_a">鍚嶇О</th>
+ <th width="90"><select style="width: 100%; background: #304b80; border: none;" id="qindex_selection"></select></th>
</tr>
</thead>
<tbody class="am-u-sm-12" id="searchInfo" style="cursor: pointer;">
@@ -189,6 +189,7 @@
</div>
</div>
<script type="text/javascript" src="js/widget_search_view.js"></script>
+
<!--閬撹矾鏌ヨ 缁撴潫-->
</body>
--
Gitblit v1.9.1