yf_elsa.cui 3 месяцев назад
Родитель
Сommit
f983fcaec4

+ 65 - 11
pages.json

@@ -24,6 +24,13 @@
 				"navigationStyle": "custom"
 			}
 		}, {
+			"path": "pages/cb/index/search", 
+			"style": {
+				"navigationBarTitleText": "设备搜索",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		}, {
 			"path": "pages/my/user-info/user-info",
 			"style": {
 				"navigationBarTitleText": "个人信息",
@@ -43,6 +50,14 @@
 			}
 
 		}, {
+			"path": "pages/cb/equip-detail/equip-detail-new",
+			"style": {
+				"navigationBarTitleText": "设备详情",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#f7f7f7"
+			}
+
+		}, {
 			"path": "pages/cb/cbd/equip-set/equip-set",
 			"style": {
 				"navigationBarTitleText": "设备控制",
@@ -312,7 +327,38 @@
 				"navigationStyle": "custom"
 			}
 
-		}, {
+		},{
+					"path": "pages/cb/cbd/equip-set/equip-set-new",
+					"style": {
+						"navigationBarTitleText": "设备控制",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "pages/cb/cbd/equip-set/photo",
+					"style": {
+						"navigationBarTitleText": "图片列表",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+
+				}, {
+					"path": "pages/cb/cbd/equip-set/photoResults",
+					"style": {
+						"navigationBarTitleText": "识别结果",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+
+				}, {
+					"path": "pages/cb/cbd/equip-set/historyfile",
+					"style": {
+						"navigationBarTitleText": "测报灯历史记录",
+						"enablePullDownRefresh": true,
+						"navigationStyle": "custom"
+					}
+
+				}, {
 			"path": "pages/cb/cbd/equip-set/addimg",
 			"style": {
 				"navigationBarTitleText": "手动添加",
@@ -321,9 +367,9 @@
 			}
 
 		}, {
-			"path": "pages/cb/cbd/equip-set/historyfile",
+			"path": "pages/cb/cbd/equip-set/newhistoryfile",
 			"style": {
-				"navigationBarTitleText": "测报灯历史记录",
+				"navigationBarTitleText": "数据详情",
 				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
@@ -602,6 +648,14 @@
                 "enablePullDownRefresh": false
             }
             
+        },{
+            "path" : "pages/cb/cbd/equip-set/new-analyse",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "分析",
+                "enablePullDownRefresh": false
+            }
+            
         }
         ,{
             "path" : "pages/cbqxyj/cbwarn",
@@ -914,8 +968,8 @@
 		"backgroundColor": "#FFFFFF"
 	},
 	"tabBar": {
-		"color": "#cdcdcd",
-		"selectedColor": "#56C979",
+		"color": "#5C5C5C",
+		"selectedColor": "#018B3F",
 		"borderStyle": "white",
 		"list": [{
 				"pagePath": "pages/index/index",
@@ -925,20 +979,20 @@
 			},
 			{
 				"pagePath": "pages/equipList/index",
-				"iconPath": "static/images/tabBar/shebeiliebiao.png",
-				"selectedIconPath": "static/images/tabBar/shebeiliebiaosel.png",
+				"iconPath": "static/images/tabBar/device.png",
+				"selectedIconPath": "static/images/tabBar/devicesel.png",
 				"text": "设备列表"
 			},
 			{
 				"pagePath": "pages/distribution/index",
-				"iconPath": "static/images/tabBar/shebeifenbu.png",
-				"selectedIconPath": "static/images/tabBar/shebeifenbusel.png",
+				"iconPath": "static/images/tabBar/fenbu.png",
+				"selectedIconPath": "static/images/tabBar/fenbusel.png",
 				"text": "设备分布"
 			},
 			{
 				"pagePath": "pages/my/index/index",
-				"iconPath": "static/images/tabBar/gerenzhongxin.png",
-				"selectedIconPath": "static/images/tabBar/gerenzhongxinsel.png",
+				"iconPath": "static/images/tabBar/user.png",
+				"selectedIconPath": "static/images/tabBar/usersel.png",
 				"text": "个人中心"
 			}
 		]

Разница между файлами не показана из-за своего большого размера
+ 2874 - 786
static/font/demo_index.html


Разница между файлами не показана из-за своего большого размера
+ 437 - 220
static/font/iconfont.css


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
static/font/iconfont.js


+ 633 - 3
static/font/iconfont.json

@@ -1,11 +1,641 @@
 {
-  "id": "1738837",
-  "name": "农业大数据",
-  "font_family": "iconfont",
+  "id": "4724605",
+  "name": "云飞-大数据平台",
+  "font_family": "yficonfont",
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
     {
+      "icon_id": "44736345",
+      "name": "离线",
+      "font_class": "lixian",
+      "unicode": "e669",
+      "unicode_decimal": 58985
+    },
+    {
+      "icon_id": "44736344",
+      "name": "在线",
+      "font_class": "zaixian",
+      "unicode": "e66a",
+      "unicode_decimal": 58986
+    },
+    {
+      "icon_id": "44675200",
+      "name": "复制",
+      "font_class": "fuzhi",
+      "unicode": "e667",
+      "unicode_decimal": 58983
+    },
+    {
+      "icon_id": "7448062",
+      "name": "短信未读",
+      "font_class": "duanxinweidu",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "7448063",
+      "name": "短信已读",
+      "font_class": "duanxinyidu",
+      "unicode": "e664",
+      "unicode_decimal": 58980
+    },
+    {
+      "icon_id": "44543631",
+      "name": "已读",
+      "font_class": "yidu",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "44540798",
+      "name": "放大图片",
+      "font_class": "fangdatupian",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "44500137",
+      "name": "新增",
+      "font_class": "xinzeng",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    },
+    {
+      "icon_id": "44438419",
+      "name": "深度思考",
+      "font_class": "shendusikao",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "44438418",
+      "name": "火苗",
+      "font_class": "huomiao",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "44355095",
+      "name": "deepseek智能ai",
+      "font_class": "zhinengai",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "18627219",
+      "name": "下载",
+      "font_class": "xiazai1",
+      "unicode": "e65a",
+      "unicode_decimal": 58970
+    },
+    {
+      "icon_id": "42227536",
+      "name": "robot-2-line",
+      "font_class": "robot-2-line",
+      "unicode": "e7a2",
+      "unicode_decimal": 59298
+    },
+    {
+      "icon_id": "11855978",
+      "name": "99 鼠标默认",
+      "font_class": "mouse",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "10147123",
+      "name": "info",
+      "font_class": "info",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "4710948",
+      "name": "抓手",
+      "font_class": "zhuashou",
+      "unicode": "e69f",
+      "unicode_decimal": 59039
+    },
+    {
+      "icon_id": "2581404",
+      "name": "散点",
+      "font_class": "middle",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "37758021",
+      "name": "散点",
+      "font_class": "small",
+      "unicode": "e769",
+      "unicode_decimal": 59241
+    },
+    {
+      "icon_id": "41269911",
+      "name": "散点图",
+      "font_class": "most",
+      "unicode": "e6a0",
+      "unicode_decimal": 59040
+    },
+    {
+      "icon_id": "1727478",
+      "name": "237拍照-线性",
+      "font_class": "paizhao-xianxing",
+      "unicode": "e8d1",
+      "unicode_decimal": 59601
+    },
+    {
+      "icon_id": "8566863",
+      "name": "风力",
+      "font_class": "fengli",
+      "unicode": "e6f8",
+      "unicode_decimal": 59128
+    },
+    {
+      "icon_id": "1106925",
+      "name": "晴天",
+      "font_class": "qingtian",
+      "unicode": "e654",
+      "unicode_decimal": 58964
+    },
+    {
+      "icon_id": "25716509",
+      "name": "风向",
+      "font_class": "fengxiang",
+      "unicode": "ea32",
+      "unicode_decimal": 59954
+    },
+    {
+      "icon_id": "30043859",
+      "name": "光伏组件数量",
+      "font_class": "guangfuzujianshuliang",
+      "unicode": "e7fd",
+      "unicode_decimal": 59389
+    },
+    {
+      "icon_id": "36284953",
+      "name": "蓄电池",
+      "font_class": "xudianchi",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "18169796",
+      "name": "SIM卡,手机卡,电话卡",
+      "font_class": "sim",
+      "unicode": "e946",
+      "unicode_decimal": 59718
+    },
+    {
+      "icon_id": "6115106",
+      "name": "全选",
+      "font_class": "quanxuan",
+      "unicode": "e8ed",
+      "unicode_decimal": 59629
+    },
+    {
+      "icon_id": "16364343",
+      "name": "下载",
+      "font_class": "xiazai",
+      "unicode": "e652",
+      "unicode_decimal": 58962
+    },
+    {
+      "icon_id": "936714",
+      "name": "80%电量",
+      "font_class": "80dianliang",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "1327253",
+      "name": "门",
+      "font_class": "men",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "4766957",
+      "name": "wifi",
+      "font_class": "wifi",
+      "unicode": "e7e0",
+      "unicode_decimal": 59360
+    },
+    {
+      "icon_id": "6129202",
+      "name": "161加热、火焰",
+      "font_class": "jiarehuoyan",
+      "unicode": "e7a3",
+      "unicode_decimal": 59299
+    },
+    {
+      "icon_id": "11710821",
+      "name": "排水",
+      "font_class": "paishui",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "39822674",
+      "name": "控制台",
+      "font_class": "console",
+      "unicode": "e86e",
+      "unicode_decimal": 59502
+    },
+    {
+      "icon_id": "10562329",
+      "name": "Wheat",
+      "font_class": "Wheat",
+      "unicode": "e6a1",
+      "unicode_decimal": 59041
+    },
+    {
+      "icon_id": "4784148",
+      "name": "预警",
+      "font_class": "yujing",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "5838825",
+      "name": "预警",
+      "font_class": "yujing1",
+      "unicode": "e87a",
+      "unicode_decimal": 59514
+    },
+    {
+      "icon_id": "1409834",
+      "name": "8测距",
+      "font_class": "ceju",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "991640",
+      "name": "最大化",
+      "font_class": "zuidahua",
+      "unicode": "e640",
+      "unicode_decimal": 58944
+    },
+    {
+      "icon_id": "26659380",
+      "name": "最小化",
+      "font_class": "zuixiaohua",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "10268565",
+      "name": "地点",
+      "font_class": "didian",
+      "unicode": "e67e",
+      "unicode_decimal": 59006
+    },
+    {
+      "icon_id": "577363",
+      "name": "首页-fill",
+      "font_class": "minggaoshouye",
+      "unicode": "e750",
+      "unicode_decimal": 59216
+    },
+    {
+      "icon_id": "6865347",
+      "name": "设置",
+      "font_class": "shezhi1",
+      "unicode": "e63b",
+      "unicode_decimal": 58939
+    },
+    {
+      "icon_id": "9059914",
+      "name": "协同指挥大屏",
+      "font_class": "xietongzhihuidaping",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "18169760",
+      "name": "数据库,数据",
+      "font_class": "database-full",
+      "unicode": "e940",
+      "unicode_decimal": 59712
+    },
+    {
+      "icon_id": "24161256",
+      "name": "工作管理-订单管理",
+      "font_class": "gongzuoguanli-dingdanguanli",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "1308387",
+      "name": "205用户_用户6",
+      "font_class": "205yonghu_yonghu6",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "1308390",
+      "name": "203用户_用户4",
+      "font_class": "203yonghu_yonghu4",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "5651488",
+      "name": "密码、锁",
+      "font_class": "mimasuo",
+      "unicode": "e678",
+      "unicode_decimal": 59000
+    },
+    {
+      "icon_id": "10593835",
+      "name": "用户-角色-用户名-单人_jurassic",
+      "font_class": "jurassic_user",
+      "unicode": "e6a4",
+      "unicode_decimal": 59044
+    },
+    {
+      "icon_id": "925483",
+      "name": "密码",
+      "font_class": "mima2",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "1118",
+      "name": "文件",
+      "font_class": "wenjian",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    },
+    {
+      "icon_id": "8652825",
+      "name": "通知",
+      "font_class": "tongzhi",
+      "unicode": "e64c",
+      "unicode_decimal": 58956
+    },
+    {
+      "icon_id": "1307",
+      "name": "应用中心",
+      "font_class": "yingyongzhongxin",
+      "unicode": "e62f",
+      "unicode_decimal": 58927
+    },
+    {
+      "icon_id": "20131431",
+      "name": "定位",
+      "font_class": "dingwei2",
+      "unicode": "e668",
+      "unicode_decimal": 58984
+    },
+    {
+      "icon_id": "24126008",
+      "name": "可视化全景",
+      "font_class": "keshihuaquanjing",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "79648",
+      "name": "三角1",
+      "font_class": "sanjiao1",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    },
+    {
+      "icon_id": "79650",
+      "name": "三角3",
+      "font_class": "sanjiao3",
+      "unicode": "e601",
+      "unicode_decimal": 58881
+    },
+    {
+      "icon_id": "845780",
+      "name": "钱 ",
+      "font_class": "qian",
+      "unicode": "e643",
+      "unicode_decimal": 58947
+    },
+    {
+      "icon_id": "18170113",
+      "name": "卡口视频摄像头,监控,桌面摄像头,网络摄像头",
+      "font_class": "ball-camera-full",
+      "unicode": "e965",
+      "unicode_decimal": 59749
+    },
+    {
+      "icon_id": "13136456",
+      "name": "修改",
+      "font_class": "xiugai",
+      "unicode": "e62e",
+      "unicode_decimal": 58926
+    },
+    {
+      "icon_id": "5930359",
+      "name": "温室、大棚",
+      "font_class": "wenshidapeng",
+      "unicode": "e665",
+      "unicode_decimal": 58981
+    },
+    {
+      "icon_id": "7562587",
+      "name": "出苗期",
+      "font_class": "chumiaoqi",
+      "unicode": "e62d",
+      "unicode_decimal": 58925
+    },
+    {
+      "icon_id": "18454498",
+      "name": "发票",
+      "font_class": "fapiao",
+      "unicode": "e6b6",
+      "unicode_decimal": 59062
+    },
+    {
+      "icon_id": "18555671",
+      "name": "监测",
+      "font_class": "jiance",
+      "unicode": "e6c3",
+      "unicode_decimal": 59075
+    },
+    {
+      "icon_id": "18735854",
+      "name": "实名",
+      "font_class": "shiming",
+      "unicode": "e6d3",
+      "unicode_decimal": 59091
+    },
+    {
+      "icon_id": "18736333",
+      "name": "大屏",
+      "font_class": "daping",
+      "unicode": "e6d8",
+      "unicode_decimal": 59096
+    },
+    {
+      "icon_id": "18772645",
+      "name": "水质",
+      "font_class": "shuizhi",
+      "unicode": "e6dc",
+      "unicode_decimal": 59100
+    },
+    {
+      "icon_id": "18928418",
+      "name": "数据监控",
+      "font_class": "shujujiankong",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
+    {
+      "icon_id": "18930973",
+      "name": "电脑",
+      "font_class": "diannao2",
+      "unicode": "e64a",
+      "unicode_decimal": 58954
+    },
+    {
+      "icon_id": "12550616",
+      "name": "箭头",
+      "font_class": "jiantou",
+      "unicode": "e639",
+      "unicode_decimal": 58937
+    },
+    {
+      "icon_id": "7045043",
+      "name": "水泵",
+      "font_class": "shuibeng",
+      "unicode": "e627",
+      "unicode_decimal": 58919
+    },
+    {
+      "icon_id": "8453443",
+      "name": "水量",
+      "font_class": "shuiliang",
+      "unicode": "e692",
+      "unicode_decimal": 59026
+    },
+    {
+      "icon_id": "9962819",
+      "name": "小麦经验灌溉参数",
+      "font_class": "xiaomaijingyanguangaicanshu",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
+    {
+      "icon_id": "2077541",
+      "name": "刷新",
+      "font_class": "shuaxin",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "11647823",
+      "name": "多层土壤墒情",
+      "font_class": "duocengturangshangqing",
+      "unicode": "eb61",
+      "unicode_decimal": 60257
+    },
+    {
+      "icon_id": "7335483",
+      "name": "土壤湿度",
+      "font_class": "turangshidu",
+      "unicode": "eb26",
+      "unicode_decimal": 60198
+    },
+    {
+      "icon_id": "7335487",
+      "name": "土壤温度",
+      "font_class": "turangwendu",
+      "unicode": "eb23",
+      "unicode_decimal": 60195
+    },
+    {
+      "icon_id": "7335491",
+      "name": "大气压力",
+      "font_class": "daqiyali",
+      "unicode": "eb27",
+      "unicode_decimal": 60199
+    },
+    {
+      "icon_id": "7335583",
+      "name": "空气温度",
+      "font_class": "kongqiwendu",
+      "unicode": "eb3a",
+      "unicode_decimal": 60218
+    },
+    {
+      "icon_id": "7335588",
+      "name": "空气湿度",
+      "font_class": "kongqishidu",
+      "unicode": "eb3b",
+      "unicode_decimal": 60219
+    },
+    {
+      "icon_id": "17814534",
+      "name": "充值",
+      "font_class": "chongzhi1",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "867786",
+      "name": "对勾",
+      "font_class": "duigou",
+      "unicode": "e712",
+      "unicode_decimal": 59154
+    },
+    {
+      "icon_id": "16480871",
+      "name": "灯泡",
+      "font_class": "dengpao",
+      "unicode": "e69e",
+      "unicode_decimal": 59038
+    },
+    {
+      "icon_id": "18928449",
+      "name": "平台",
+      "font_class": "pingtai",
+      "unicode": "e628",
+      "unicode_decimal": 58920
+    },
+    {
+      "icon_id": "18931223",
+      "name": "设置",
+      "font_class": "shezhi",
+      "unicode": "e679",
+      "unicode_decimal": 59001
+    },
+    {
+      "icon_id": "18931269",
+      "name": "首页",
+      "font_class": "shouye1",
+      "unicode": "e684",
+      "unicode_decimal": 59012
+    },
+    {
+      "icon_id": "18438522",
+      "name": "财务管理",
+      "font_class": "caiwuguanli",
+      "unicode": "e6b0",
+      "unicode_decimal": 59056
+    },
+    {
+      "icon_id": "18928432",
+      "name": "二维码",
+      "font_class": "erweima",
+      "unicode": "e626",
+      "unicode_decimal": 58918
+    },
+    {
+      "icon_id": "21273716",
+      "name": "cell-phone",
+      "font_class": "cell-phone",
+      "unicode": "e624",
+      "unicode_decimal": 58916
+    },
+    {
       "icon_id": "5064096",
       "name": "统计",
       "font_class": "tongji2",

BIN
static/font/iconfont.ttf


BIN
static/font/iconfont.woff


BIN
static/font/iconfont.woff2


+ 1 - 1
static/iconfont/iconfont.css

@@ -6,7 +6,7 @@
 
 .yficonfont {
   font-family: "yficonfont" !important;
-  font-size: 32rpx;
+  font-size: 28rpx;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

BIN
static/images/cb/gaofengqi.png


BIN
static/images/cb/shijianqi.png


BIN
static/images/cb/zhongjianqi.png


BIN
static/images/tabBar/shouye.png


BIN
static/images/tabBar/shouyesel.png