Merge remote-tracking branch 'origin/master'

psdc-ui/src/views/system/device/index.vue

@@ -300,7 +300,6 @@ const data = reactive({
   timingList:[],
   queryParams: '',
   queryParams1: {
-    "deviceId": 0,
     "deviceModel": "温度传感器"
   },
   sceneCode:null,
@@ -503,11 +502,8 @@ function cancel2() {
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download("system/device/index/daochuDevs", {
-    ...JSON.stringify({
-      "deviceId": 0,
-      "deviceModel": null
-    }),
+  console.log(data.sceneCode)
+  proxy.download("system/device/index/daochuDevs",{
   },`device_${new Date().getTime()}.xlsx`);
 };
 /** 新增策略处理 */