提交

package-lock.json

@@ -5,9 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "dplayer": "^1.27.0",
         "ezuikit-js": "^0.6.3",
-        "hls.js": "^1.2.3",
         "i": "^0.3.7",
         "moment": "^2.29.4",
         "npm": "^8.19.2",
@@ -90,97 +88,16 @@
         "pkcs7": "^1.0.4"
       }
     },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-    },
-    "node_modules/axios": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz",
-      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
-      "dependencies": {
-        "follow-redirects": "^1.14.9",
-        "form-data": "^4.0.0"
-      }
-    },
-    "node_modules/balloon-css": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmmirror.com/balloon-css/-/balloon-css-1.2.0.tgz",
-      "integrity": "sha512-urXwkHgwp6GsXVF+it01485Z2Cj4pnW02ICnM0TemOlkKmCNnDLmyy+ZZiRXBpwldUXO+aRNr7Hdia4CBvXJ5A=="
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/dom-walk": {
       "version": "0.1.2",
       "resolved": "https://registry.npmmirror.com/dom-walk/-/dom-walk-0.1.2.tgz",
       "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
     },
-    "node_modules/dplayer": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmmirror.com/dplayer/-/dplayer-1.27.0.tgz",
-      "integrity": "sha512-6vdSgljqGISj6CEivcB1wzLpOkFnl+BMd4c+0Ila0jQuv2iWAZbLwhkrDDVlRLDihUQznMH2OCV09sSOG6Q1BQ==",
-      "dependencies": {
-        "axios": "0.27.2",
-        "balloon-css": "^1.0.3",
-        "promise-polyfill": "8.2.3",
-        "rxjs": "^7.5.6"
-      }
-    },
     "node_modules/ezuikit-js": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/ezuikit-js/-/ezuikit-js-0.6.3.tgz",
       "integrity": "sha512-nFaQXHALzGgXop4aZ23g96EmKT+IRfvibx4I4jLIcNAjXWI+PZk3g/365end7trMY646+5BeP0kn9CXzHH9s1g=="
     },
-    "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/global": {
       "version": "4.4.0",
       "resolved": "https://registry.npmmirror.com/global/-/global-4.4.0.tgz",
@@ -190,11 +107,6 @@
         "process": "^0.11.10"
       }
     },
-    "node_modules/hls.js": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmmirror.com/hls.js/-/hls.js-1.2.3.tgz",
-      "integrity": "sha512-CC/vHi82ldiiydIhliNI3whlcepRXxI2jdpd/KKb6lyEv+74e7lXs4cGk5PHfTLxZMKOj6+m5LX9VAbvV/r7AQ=="
-    },
     "node_modules/i": {
       "version": "0.3.7",
       "resolved": "https://registry.npmmirror.com/i/-/i-0.3.7.tgz",
@@ -228,25 +140,6 @@
         "global": "^4.4.0"
       }
     },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/min-document": {
       "version": "2.19.0",
       "resolved": "https://registry.npmmirror.com/min-document/-/min-document-2.19.0.tgz",
@@ -2668,11 +2561,6 @@
         "node": ">= 0.6.0"
       }
     },
-    "node_modules/promise-polyfill": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-8.2.3.tgz",
-      "integrity": "sha512-Og0+jCRQetV84U8wVjMNccfGCnMQ9mGs9Hv78QFe+pSDD3gWTpz0y+1QCuxy5d/vBFuZ3iwP2eycAkvqIMPmWg=="
-    },
     "node_modules/regenerator-runtime": {
       "version": "0.13.9",
       "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
@@ -2686,14 +2574,6 @@
         "individual": "^2.0.0"
       }
     },
-    "node_modules/rxjs": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmmirror.com/rxjs/-/rxjs-7.5.6.tgz",
-      "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
     "node_modules/safe-json-parse": {
       "version": "4.0.0",
       "resolved": "https://registry.npmmirror.com/safe-json-parse/-/safe-json-parse-4.0.0.tgz",
@@ -2702,11 +2582,6 @@
         "rust-result": "^1.0.0"
       }
     },
-    "node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
     "node_modules/url-toolkit": {
       "version": "2.2.5",
       "resolved": "https://registry.npmmirror.com/url-toolkit/-/url-toolkit-2.2.5.tgz",
@@ -2806,74 +2681,16 @@
         "pkcs7": "^1.0.4"
       }
     },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
-    },
-    "axios": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmmirror.com/axios/-/axios-0.27.2.tgz",
-      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
-      "requires": {
-        "follow-redirects": "^1.14.9",
-        "form-data": "^4.0.0"
-      }
-    },
-    "balloon-css": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmmirror.com/balloon-css/-/balloon-css-1.2.0.tgz",
-      "integrity": "sha512-urXwkHgwp6GsXVF+it01485Z2Cj4pnW02ICnM0TemOlkKmCNnDLmyy+ZZiRXBpwldUXO+aRNr7Hdia4CBvXJ5A=="
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
-    },
     "dom-walk": {
       "version": "0.1.2",
       "resolved": "https://registry.npmmirror.com/dom-walk/-/dom-walk-0.1.2.tgz",
       "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
     },
-    "dplayer": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmmirror.com/dplayer/-/dplayer-1.27.0.tgz",
-      "integrity": "sha512-6vdSgljqGISj6CEivcB1wzLpOkFnl+BMd4c+0Ila0jQuv2iWAZbLwhkrDDVlRLDihUQznMH2OCV09sSOG6Q1BQ==",
-      "requires": {
-        "axios": "0.27.2",
-        "balloon-css": "^1.0.3",
-        "promise-polyfill": "8.2.3",
-        "rxjs": "^7.5.6"
-      }
-    },
     "ezuikit-js": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/ezuikit-js/-/ezuikit-js-0.6.3.tgz",
       "integrity": "sha512-nFaQXHALzGgXop4aZ23g96EmKT+IRfvibx4I4jLIcNAjXWI+PZk3g/365end7trMY646+5BeP0kn9CXzHH9s1g=="
     },
-    "follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
-    },
-    "form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      }
-    },
     "global": {
       "version": "4.4.0",
       "resolved": "https://registry.npmmirror.com/global/-/global-4.4.0.tgz",
@@ -2883,11 +2700,6 @@
         "process": "^0.11.10"
       }
     },
-    "hls.js": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmmirror.com/hls.js/-/hls.js-1.2.3.tgz",
-      "integrity": "sha512-CC/vHi82ldiiydIhliNI3whlcepRXxI2jdpd/KKb6lyEv+74e7lXs4cGk5PHfTLxZMKOj6+m5LX9VAbvV/r7AQ=="
-    },
     "i": {
       "version": "0.3.7",
       "resolved": "https://registry.npmmirror.com/i/-/i-0.3.7.tgz",
@@ -2918,19 +2730,6 @@
         "global": "^4.4.0"
       }
     },
-    "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "requires": {
-        "mime-db": "1.52.0"
-      }
-    },
     "min-document": {
       "version": "2.19.0",
       "resolved": "https://registry.npmmirror.com/min-document/-/min-document-2.19.0.tgz",
@@ -4555,11 +4354,6 @@
       "resolved": "https://registry.npmmirror.com/process/-/process-0.11.10.tgz",
       "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
     },
-    "promise-polyfill": {
-      "version": "8.2.3",
-      "resolved": "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-8.2.3.tgz",
-      "integrity": "sha512-Og0+jCRQetV84U8wVjMNccfGCnMQ9mGs9Hv78QFe+pSDD3gWTpz0y+1QCuxy5d/vBFuZ3iwP2eycAkvqIMPmWg=="
-    },
     "regenerator-runtime": {
       "version": "0.13.9",
       "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
@@ -4573,14 +4367,6 @@
         "individual": "^2.0.0"
       }
     },
-    "rxjs": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmmirror.com/rxjs/-/rxjs-7.5.6.tgz",
-      "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==",
-      "requires": {
-        "tslib": "^2.1.0"
-      }
-    },
     "safe-json-parse": {
       "version": "4.0.0",
       "resolved": "https://registry.npmmirror.com/safe-json-parse/-/safe-json-parse-4.0.0.tgz",
@@ -4589,11 +4375,6 @@
         "rust-result": "^1.0.0"
       }
     },
-    "tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
     "url-toolkit": {
       "version": "2.2.5",
       "resolved": "https://registry.npmmirror.com/url-toolkit/-/url-toolkit-2.2.5.tgz",

pages/aftersale/index.vue

@@ -6,7 +6,8 @@
 			<view class="form-title">
 				基本信息
 			</view>
-			<input class="form-input" v-model="aftersale.device_id" placeholder="请输入设备ID" type="text" />
+			<input class="form-input" v-model="aftersale.device_id" placeholder="设备ID" type="text" />
+			<input class="form-input" v-model="aftersale.device_name" placeholder="设备名称" type="text" />
 			<input class="form-input" v-model="aftersale.user" placeholder="请输入联系人名称" type="text" />
 			<input class="form-input" v-model="aftersale.phone" placeholder="请输入联系人电话" type="text" />
 			<input class="form-input" v-model="aftersale.addr" placeholder="请输入联系人地址" type="text" />
@@ -65,6 +66,7 @@
 				// 上报信息
 				aftersale: {
 					device_id: '',
+					device_name:'',
 					errordesc: "", //描述信息
 					errorimg: "", //图片链接,多张图片用 , 进行隔开
 					errorvideo: "", //视频链接
@@ -76,7 +78,8 @@
 			}
 		},
 		onLoad(options) {
-			this.aftersale.device_id=options.deviceId
+			this.aftersale.device_id=options.deviceId;
+			this.aftersale.device_name=options.name;
 		},
 		methods: {
 			/**

pages/aftersale/list.vue

@@ -8,9 +8,9 @@
 		<!-- 设备列表 -->
 		<block v-for="(item,index) in deviceList" :key="index">
 	        <!-- 气象站 墒情站 -->
-			<view class="ui-card forecast-item" @click="openDeviceDetails(item.equip_id)" v-if="deviceTab==1 || deviceTab==3">
+			<view class="ui-card forecast-item" @click="openDeviceDetails(item.equip_id,item.equip_name)" v-if="deviceTab==1 || deviceTab==3">
 				<view class="flex-1 info">
-					<view class="font-16 title" :class="item.is_online==1?'on':'off'">设备名称：{{item.device_name}}</view>
+					<view class="font-16 title" :class="item.is_online==1?'on':'off'">设备名称：{{item.equip_name}}</view>
 					<view class="text">设备ID：{{item.equip_id}}</view>
 					<view class="text text-ellipsis">地址：{{item.address}}</view>
 					<view class="text">最新上报时间：{{item.uptime | timeFrom}}</view>
@@ -18,7 +18,7 @@
 				<view class="aftersale-tips">故障上报</view>
 			</view>
 			<!-- 测报灯 -->
-			<view class="ui-card forecast-item" @click="openDeviceDetails(item.imei)" v-if="deviceTab==4">
+			<view class="ui-card forecast-item" @click="openDeviceDetails(item.imei,item.device_name)" v-if="deviceTab==4">
 				<view class="flex-1 info">
 					<view class="font-16 title" :class="item.is_online==1?'on':'off'">设备名称：{{item.device_name?item.device_name:'测报灯'}}</view>
 					<view class="text">设备ID：{{item.imei}}</view>
@@ -27,7 +27,7 @@
 				<view class="aftersale-tips">故障上报</view>
 			</view>
 			<!-- 监控 -->
-			<view class="ui-card forecast-item" @click="openDeviceDetails(item.device_id)" v-if="deviceTab==2">
+			<view class="ui-card forecast-item" @click="openDeviceDetails(item.device_id,item.device_name)" v-if="deviceTab==2">
 				<view class="flex-1 info">
 					<view class="font-16 title" :class="item.status==1?'on':'off'">设备名称：{{item.device_name}}</view>
 					<view class="text">设备ID：{{item.device_id}}</view>
@@ -109,9 +109,9 @@
 			 * 打开设备故障上报
 			 * @param {Object} deviceId 设备号
 			 */
-			openDeviceDetails(deviceId) {
+			openDeviceDetails(deviceId,deviceName) {
 				uni.navigateTo({
-					url: `index?deviceId=${deviceId}`
+					url: `index?deviceId=${deviceId}&name=${deviceName}`
 				})
 			},
 			// 获取设备列表

pages/pest/index.vue

@@ -71,7 +71,7 @@
 			},
 			// 获取虫害or病害 列表
 			async getPestList() {
-				console.log("dsdfs");
+
 				const {
 					disease_nums,
 					pest_nums,