diff --git a/pages.json b/pages.json index fdff102..80fb6e9 100644 --- a/pages.json +++ b/pages.json @@ -107,7 +107,7 @@ }, { - "path": "pages/210/deviceControl/index", + "path": "pages/210/HBY210", "style": { "navigationStyle": "custom" } diff --git a/pages/210/deviceControl/index.vue b/pages/210/HBY210.vue similarity index 93% rename from pages/210/deviceControl/index.vue rename to pages/210/HBY210.vue index ae8897b..80d417d 100644 --- a/pages/210/deviceControl/index.vue +++ b/pages/210/HBY210.vue @@ -69,69 +69,14 @@ - - + - - - + + + {{ item.title }} {{ item.subTitle }} @@ -239,6 +184,29 @@ + + + + + 报警声音 + + + + + 点击选择上传文件 + + + + 删除文件 + + + + + + + + + @@ -340,7 +308,7 @@ } from '@/api/6170/deviceControl.js' import { getDeviceId - } from '../../../store/BLETools'; + } from '../../store/BLETools'; import { baseURL, getToken, @@ -352,31 +320,39 @@ selectedIndex: -1, // Track currently selected index modeItems: [{ image: "/static/images/210/lj.png", + activeImage: "/static/images/210/lj-HL.png", title: "联机设备", subTitle: "" }, { - image: "/static/images/common/path7.png", - title: "开机画面", + image: "/static/images/210/bj.png", + activeImage: "/static/images/210/bj-HL.png", + title: "报警声音", subTitle: "上传" }, + { image: "/static/images/210/zd.png", + activeImage: "/static/images/210/zd-HL.png", title: "自动报警", subTitle: "" }, { - image: "/static/images/210/zd-HL.png", + image: "/static/images/210/zd.png", + activeImage: "/static/images/210/zd-HL.png", title: "手动报警", subTitle: "" }, + { - image: "/static/images/210/bj.png", - title: "报警声音", + image: "/static/images/common/path7.png", + activeImage: "/static/images/210/path-HL.png", + title: "开机画面", subTitle: "上传" }, { image: "/static/images/210/time.png", + activeImage: "/static/images/210/time-HL.png", title: "报警时长", subTitle: "30秒" } @@ -424,6 +400,7 @@ radioSelected: 0, // -1表示未选中任何项 deviceType: '', popupType: '', //弹框类型 + lightModeC: false } }, methods: { @@ -432,6 +409,10 @@ this.lightModeA = false; this.lightModeB = false; }, + // 上传文件 + uploadFile(){}, + // 删除文件 + deleteQ(){}, // 打开弹框 showPopup(type) { this.currentPopup = { @@ -455,13 +436,16 @@ this.selectMode(); break; case 1: - this.uploadStartup(); + this.soundAlarm(); break; case 2: - this.automaticAlarm(); + this.manualAlarm(); break; case 3: - this.manualAlarm(); + this.automaticAlarm(); + break; + case 4: + this.uploadStartup(); break; case 5: this.alarmTime(); @@ -486,6 +470,10 @@ url: '/pages/common/map/index' }) }, + // 报警声音 + soundAlarm() { + this.lightModeC = true + }, // 联机设备 selectMode() { uni.navigateTo({ @@ -888,7 +876,8 @@ .mode-v1.active-mode .battery-v2 { color: #BBE600 !important; } - .mode-v1.active-mode .mode-v3{ + + .mode-v1.active-mode .mode-v3 { color: #BBE600 !important; } @@ -1291,6 +1280,18 @@ margin-bottom: 50rpx; } + .upload_flex { + display: flex; + cursor: pointer; + align-items: center; + margin-bottom:20rpx; + } + .uploadIMG{ + width:68rpx; + height:68rpx; + margin-right: 20rpx; + } + .item { padding: 10px; margin: 5px 0; diff --git a/pages/6155/deviceDetail.vue b/pages/6155/deviceDetail.vue index d07fd03..39647e1 100644 --- a/pages/6155/deviceDetail.vue +++ b/pages/6155/deviceDetail.vue @@ -579,7 +579,7 @@ these.$set(these.formData, key, json[key]); } else { console.log(`字段 ${key} 不在 formData 中，跳过更新`); - } + } }); // 强制触发视图更新，确保电量显示同步 diff --git a/static/images/add.png b/static/images/add.png deleted file mode 100644 index dc8e6e9..0000000 Binary files a/static/images/add.png and /dev/null differ diff --git a/static/images/bip.6.png b/static/images/bip.6.png deleted file mode 100644 index 546a98e..0000000 Binary files a/static/images/bip.6.png and /dev/null differ diff --git a/static/images/bluetooth.png b/static/images/bluetooth.png deleted file mode 100644 index 9b71738..0000000 Binary files a/static/images/bluetooth.png and /dev/null differ diff --git a/static/images/bs.png b/static/images/bs.png deleted file mode 100644 index cb7ab86..0000000 Binary files a/static/images/bs.png and /dev/null differ diff --git a/static/images/cires.png b/static/images/cires.png deleted file mode 100644 index 2262055..0000000 Binary files a/static/images/cires.png and /dev/null differ diff --git a/static/images/cp.png b/static/images/cp.png deleted file mode 100644 index aa3c28e..0000000 Binary files a/static/images/cp.png and /dev/null differ diff --git a/static/images/del.png b/static/images/del.png deleted file mode 100644 index e9ed9e7..0000000 Binary files a/static/images/del.png and /dev/null differ diff --git a/static/images/delel.png b/static/images/delel.png deleted file mode 100644 index d93d845..0000000 Binary files a/static/images/delel.png and /dev/null differ diff --git a/static/images/delete-icon.png b/static/images/delete-icon.png deleted file mode 100644 index 611fc9f..0000000 Binary files a/static/images/delete-icon.png and /dev/null differ diff --git a/static/images/delete.png b/static/images/delete.png deleted file mode 100644 index abec352..0000000 Binary files a/static/images/delete.png and /dev/null differ diff --git a/static/images/dell.png b/static/images/dell.png deleted file mode 100644 index 481d448..0000000 Binary files a/static/images/dell.png and /dev/null differ diff --git a/static/images/device.png b/static/images/device.png deleted file mode 100644 index a2834d6..0000000 Binary files a/static/images/device.png and /dev/null differ diff --git a/static/images/dl.png b/static/images/dl.png deleted file mode 100644 index 51acb69..0000000 Binary files a/static/images/dl.png and /dev/null differ diff --git a/static/images/fg.png b/static/images/fg.png deleted file mode 100644 index 9d70e59..0000000 Binary files a/static/images/fg.png and /dev/null differ diff --git a/static/images/gprs.png b/static/images/gprs.png deleted file mode 100644 index ff458e8..0000000 Binary files a/static/images/gprs.png and /dev/null differ diff --git a/static/images/jg.png b/static/images/jg.png deleted file mode 100644 index b4b5eb5..0000000 Binary files a/static/images/jg.png and /dev/null differ diff --git a/static/images/login.png b/static/images/login.png deleted file mode 100644 index 7946216..0000000 Binary files a/static/images/login.png and /dev/null differ diff --git a/static/images/logo.png b/static/images/logo.png deleted file mode 100644 index cd54a42..0000000 Binary files a/static/images/logo.png and /dev/null differ diff --git a/static/images/more.png b/static/images/more.png deleted file mode 100644 index 8c11ae0..0000000 Binary files a/static/images/more.png and /dev/null differ diff --git a/static/images/nz.png b/static/images/nz.png deleted file mode 100644 index 34e4b8e..0000000 Binary files a/static/images/nz.png and /dev/null differ diff --git a/static/images/path.png b/static/images/path.png deleted file mode 100644 index 272e52f..0000000 Binary files a/static/images/path.png and /dev/null differ diff --git a/static/images/path1.png b/static/images/path1.png deleted file mode 100644 index 6e4e332..0000000 Binary files a/static/images/path1.png and /dev/null differ diff --git a/static/images/path2.png b/static/images/path2.png deleted file mode 100644 index c89c52f..0000000 Binary files a/static/images/path2.png and /dev/null differ diff --git a/static/images/path3.png b/static/images/path3.png deleted file mode 100644 index 2e3c9f9..0000000 Binary files a/static/images/path3.png and /dev/null differ diff --git a/static/images/path5.png b/static/images/path5.png deleted file mode 100644 index 01545c5..0000000 Binary files a/static/images/path5.png and /dev/null differ diff --git a/static/images/path7.png b/static/images/path7.png deleted file mode 100644 index b2f321e..0000000 Binary files a/static/images/path7.png and /dev/null differ diff --git a/static/images/scan.png b/static/images/scan.png deleted file mode 100644 index 6778ddc..0000000 Binary files a/static/images/scan.png and /dev/null differ diff --git a/static/images/scane.png b/static/images/scane.png deleted file mode 100644 index 7200867..0000000 Binary files a/static/images/scane.png and /dev/null differ diff --git a/static/images/sendSucc.png b/static/images/sendSucc.png deleted file mode 100644 index a9cba80..0000000 Binary files a/static/images/sendSucc.png and /dev/null differ diff --git a/static/images/set.png b/static/images/set.png deleted file mode 100644 index 99615ab..0000000 Binary files a/static/images/set.png and /dev/null differ diff --git a/static/images/sett.png b/static/images/sett.png deleted file mode 100644 index 968dbae..0000000 Binary files a/static/images/sett.png and /dev/null differ diff --git a/static/images/settt.png b/static/images/settt.png deleted file mode 100644 index d18bea6..0000000 Binary files a/static/images/settt.png and /dev/null differ diff --git a/static/images/shape.png b/static/images/shape.png deleted file mode 100644 index 516c72a..0000000 Binary files a/static/images/shape.png and /dev/null differ diff --git a/static/images/share.png b/static/images/share.png deleted file mode 100644 index 508adef..0000000 Binary files a/static/images/share.png and /dev/null differ diff --git a/static/images/sm.png b/static/images/sm.png deleted file mode 100644 index f524ea9..0000000 Binary files a/static/images/sm.png and /dev/null differ diff --git a/static/images/sp.png b/static/images/sp.png deleted file mode 100644 index 57623b7..0000000 Binary files a/static/images/sp.png and /dev/null differ diff --git a/static/images/success.png b/static/images/success.png deleted file mode 100644 index 54f939a..0000000 Binary files a/static/images/success.png and /dev/null differ diff --git a/static/images/svg.png b/static/images/svg.png deleted file mode 100644 index 8cbde60..0000000 Binary files a/static/images/svg.png and /dev/null differ diff --git a/static/images/type.png b/static/images/type.png deleted file mode 100644 index 8f5b8c9..0000000 Binary files a/static/images/type.png and /dev/null differ diff --git a/static/images/upload.png b/static/images/upload.png deleted file mode 100644 index 6075702..0000000 Binary files a/static/images/upload.png and /dev/null differ diff --git a/static/images/upload_ax.png b/static/images/upload_ax.png deleted file mode 100644 index 7fd894e..0000000 Binary files a/static/images/upload_ax.png and /dev/null differ diff --git a/static/images/user.png b/static/images/user.png deleted file mode 100644 index dd45e76..0000000 Binary files a/static/images/user.png and /dev/null differ diff --git a/static/images/video.png b/static/images/video.png deleted file mode 100644 index b1d51f2..0000000 Binary files a/static/images/video.png and /dev/null differ diff --git a/static/images/wm.png b/static/images/wm.png deleted file mode 100644 index 3daf6f9..0000000 Binary files a/static/images/wm.png and /dev/null differ diff --git a/static/images/xy.png b/static/images/xy.png deleted file mode 100644 index 911353a..0000000 Binary files a/static/images/xy.png and /dev/null differ diff --git a/static/images/ys.png b/static/images/ys.png deleted file mode 100644 index 03645ac..0000000 Binary files a/static/images/ys.png and /dev/null differ diff --git a/utils/request.js b/utils/request.js index 6faf71e..a25cc90 100644 --- a/utils/request.js +++ b/utils/request.js @@ -1,5 +1,5 @@ import config from '../config/index.js'; -export const env = 'development'; //production development //开发of线上 改这里就行 +export const env = 'production'; //production development //开发of线上 改这里就行 const BASE = config[env]; const request = (options) => { console.log("options" + JSON.stringify(options), BASE.BASE_URL)