From e44ecb571bb2df6390503f4303282e18db5d60ef Mon Sep 17 00:00:00 2001 From: lgq <1015864684@qq.com> Date: 星期一, 20 四月 2026 13:43:52 +0800 Subject: [PATCH] 1.修复安全入仓联动控制按钮无权限问题 2.增加安全入仓联动控制配置项，默认不启用 3.修改气体浓度验证选项默认不启用 4.增加门禁web页面源码 Changes to be committed: new file: "face_webserver/ modified: vf107/src/config.json modified: vf107/src/service/grainService.js modified: vf107/src/view/config/menu/doorControlView.js modified: vf107/src/view/mainView.js --- vf107/.temp/md5s.json | 74 +++++++++++++++++++++++------------- 1 files changed, 47 insertions(+), 27 deletions(-) diff --git a/vf107/.temp/md5s.json b/vf107/.temp/md5s.json index 5355e9c..e3b7657 100644 --- a/vf107/.temp/md5s.json +++ b/vf107/.temp/md5s.json @@ -45,7 +45,7 @@ "dxmodules\\dxCommonUtils.js": "9d408cedb29cce9838c10ae5d1a8c2aa", "dxmodules\\dxConfig.js": "24072559b3cb1ec5c206cb358eaaaaae", "dxmodules\\dxDisplay.js": "5c80ee7de62e3f7b08eed6e3e0a8b3c1", - "dxmodules\\dxDriver.js": "1e27304f7ecc691ac66293cd065e6a14", + "dxmodules\\dxDriver.js": "63c8348a2a4a31911ce8a1626aa8f5c4", "dxmodules\\dxEventBus.js": "075ac9f2d465c92a9446ea07a6e2bfe6", "dxmodules\\dxFacial.js": "08f40369fd06cb3f5f69cd035d4ecab2", "dxmodules\\dxFacialBarcode.js": "67508897203cf7382f4bb20c4044dc17", @@ -60,17 +60,17 @@ "dxmodules\\dxMap.js": "61c9b76b7e05e4e8bebeccd1dfaaa963", "dxmodules\\dxMqttClient.js": "d18248384c1ecee412c1f1ba86c233ac", "dxmodules\\dxNetwork.js": "e377baf713245bf54012d56ea15b48d2", - "dxmodules\\dxNfc.js": "feb5bc21d4b13ab9736de1941290312d", "dxmodules\\dxNfcCard.js": "689161d840c1ee82107e55b3e43da5c3", "dxmodules\\dxNtp.js": "54a83064faa67f8f4991e1da56a3caf4", "dxmodules\\dxOs.js": "8171120055734e75dd6c878862ae965a", - "dxmodules\\dxOta.js": "a4bf84aaead7298c5da10161644f2b1f", + "dxmodules\\dxOta.js": "2dd095485717018eb451e5110aca4934", "dxmodules\\dxPwm.js": "d8238b43ef7c0d77a33108290394e12c", "dxmodules\\dxQrRule.js": "bfa9e2b4725c4fa358a2988f63c67210", "dxmodules\\dxSqliteDB.js": "4762a29fb74d837d43d1d19415f77536", "dxmodules\\dxStd.js": "322e8885cd0c7d2d9137b47fec8c8b00", "dxmodules\\dxTimeZones.js": "c05c66e1fc1dfea0aca722f148190148", "dxmodules\\dxUart.js": "0cb032a9f73a894b601ff7fef1c648e7", + "dxmodules\\dxUi.js": "ca489da8327242bbbae73b7d10b35bf4", "dxmodules\\dxVgBle.js": "348e4999a1c77d85bfc962c6fbdcc742", "dxmodules\\dxWatchdog.js": "4833387ea9787b18a8c75a4ffc57b35e", "dxmodules\\dxWorkerPool.js": "77ec46afea15eac3ff99c41fb23f43ff", @@ -100,6 +100,7 @@ "dxmodules\\libvbar-m-dxcommonutils.so": "c72011e82a558a4e84819645700ec879", "dxmodules\\libvbar-m-dxdisplay.so": "4de71b250645bcf8e63da84015976196", "dxmodules\\libvbar-m-dxfacial.so": "a401e8e0460a881d748bba0cf235a5a9", + "dxmodules\\libvbar-m-dxhttp.so": "1ec2f9ccc26aebc390944340afde6044", "dxmodules\\libvbar-m-dxhttpclient.so": "9d2ce48027e5afcb1e85b5703a5f1f53", "dxmodules\\libvbar-m-dxhttpserver.so": "7238d45c439402b79b696067b3eb2ec8", "dxmodules\\libvbar-m-dxkey.so": "e9efc4894bcd538c2a59d048ca57c70a", @@ -110,12 +111,30 @@ "dxmodules\\libvbar-m-dxos.so": "b46dd08ab1769f5c246c284f83311294", "dxmodules\\libvbar-m-dxsqlitedb.so": "7581e5d8a56f6d9c23885e4ceb57e4a2", "dxmodules\\libvbar-m-dxuart.so": "e59a58bddafa0d7fa8d13387feb59946", + "dxmodules\\libvbar-m-dxui.so": "ca22e1a0c52977749a32b2cc70e942a9", "dxmodules\\libvbar-m-dxwatchdog.so": "9854b627923ad943b2b34250ba717505", "dxmodules\\libvbar-m-eid.so": "a4d1b2fa880f6d67e805dfca07f26523", "dxmodules\\libvbar-m-key.so": "a51d6ce68a66e21865a47cf5a350ce80", "dxmodules\\libvbar-m-net.so": "e058b3e454d27044d6544dbfe13a3254", "dxmodules\\libvbar-p-nfc.so": "1b3af2b46962720f8f13a7c275576049", "dxmodules\\libzbar.so": "dc72c4323c8b5616037b8ebf32740665", + "dxmodules\\uiBase.js": "997eb4fc071f7ff5e686b3e0fa1cad34", + "dxmodules\\uiButton.js": "f2baccc3c77cfcc0a57f5177acfcbb13", + "dxmodules\\uiButtons.js": "d3551f30ae0f00f10e02a9249a5ebbba", + "dxmodules\\uiCheckbox.js": "8dc6e7ef17751ef8cf738deba18b6416", + "dxmodules\\uiDropdown.js": "e8183f20d4a50bc99c2bb40e4c510d7b", + "dxmodules\\uiFont.js": "c73571e2b0bfa41aeead4f7ebc370e33", + "dxmodules\\uiImage.js": "af13c919b495e04690ad8f335821735c", + "dxmodules\\uiKeyboard.js": "d910d634f87c07ecdb2626aa7a5ad223", + "dxmodules\\uiLabel.js": "9ce527eccd0893fb37c3b8ed1bf14d05", + "dxmodules\\uiLine.js": "b96254f972313441d924e30c3d6c5716", + "dxmodules\\uiList.js": "1c69ce505c3627bdb2c88cf05fc1c59b", + "dxmodules\\uiSlider.js": "74c3e79d2a812e78f50c83663b1d513a", + "dxmodules\\uiStyle.js": "28f5345016754323a1dc38bfd0f74e70", + "dxmodules\\uiSwitch.js": "e43e240b86a749754d8c5199bb2ad482", + "dxmodules\\uiTextarea.js": "ca55782581a1a58ad266dfaa5247051d", + "dxmodules\\uiUtils.js": "56e6983fc8ef84646665c5548fcf54e9", + "dxmodules\\uiView.js": "efe5bac101af8e25ccede4b0adb748ec", "dxmodules\\vbar_version": "ecaec8f34eac0b8b086a1638030427bc", "dxmodules\\vgUartWorker.js": "fc3e9e0051836d5063c0eecf555d9521", "dxmodules\\zoneinfo\\Africa\\Abidjan": "74c6fb9ae4ea68d0012c1f6ad42b5848", @@ -2446,7 +2465,7 @@ "resource\\image\\voiceBroadcast.png": "e6f1a31ba7159962d18b77deef71c106", "resource\\image\\wifi.png": "fd668b648ac984ed92fad8e40e151283", "resource\\image\\wifi_dark.png": "37505f892ac6a43cb8dc5ea685de9740", - "resource\\langPack.js": "956b0d902f723e4817319436ee7df117", + "resource\\langPack.js": "72c5238aa93a1dc6a79b9466b5ebcf44", "resource\\wav\\alarm.wav": "fe9d43cfb930f873973cc31fd6e8c132", "resource\\wav\\AR\\calibration_1s.wav": "a5ed7bdf10f5c0bec1f964cbaf8d7c59", "resource\\wav\\AR\\calibration_2s.wav": "1a533e06dd209b7b87d48947357a0ca0", @@ -2651,23 +2670,24 @@ "src\\common\\utils\\stringUtils.js": "425d9cd0390ab8a60f1507544c2cb00a", "src\\common\\utils\\tokenUtil.js": "b7abd3698644aadb7d3e936fb6f7fc8b", "src\\common\\utils\\utils.js": "bbee074a060e962a570dddc4d586504d", - "src\\config.json": "6619f6367ac0230030de3131160a2178", - "src\\controller.js": "3ca7b098eaf218df5e911fea64113d11", - "src\\driver.js": "94ef548d913eb6ba832e87e1748f2bc2", - "src\\main.js": "e5958b02098ba5d92c159970c2e9bd63", - "src\\screen.js": "b8a256f4f3ba51b4c1e49fcb69e06b28", - "src\\service\\accessService.js": "304718a9a06ded28947373c3d9a21295", - "src\\service\\api.js": "def5b52441ccc827913a73478cc7c32a", + "src\\config.json": "53cf90582fedb3aca8e3ac2848386f36", + "src\\controller.js": "35dd417593c4510119576717c717e20b", + "src\\driver.js": "b0c3958d69f7e0021a70d8537077ff5d", + "src\\main.js": "d455a38100d386fc2eed8bef4c92e7ba", + "src\\screen.js": "01812eb2816143c98595939d2c54f2ff", + "src\\service\\accessService.js": "e242b879cf8d1e4f326aee9168e9d4d5", + "src\\service\\api.js": "24a45cb2acc4306a1f4dd54de559f9f0", "src\\service\\codeService.js": "e3f53b983c37a91d85a3de95fab7745d", - "src\\service\\configService.js": "d1c3c533c1d451c2eaf46758b4efeb19", + "src\\service\\configService.js": "c45b2005ba236b74be9f04ab76635abf", + "src\\service\\demo.js": "1f9a570135f63aa5b607743bb5a9e7f4", "src\\service\\faceService.js": "cfc3cf7d510f2ba6d6fcedb1251e0795", "src\\service\\fingerService.js": "0fee47e46ded411c2da21eb508d8f9ba", "src\\service\\gpiokeyService.js": "7aeb81b1577df935f147f3817a0a144b", - "src\\service\\grainService.js": "3ec28482d55059fd09d091145fad041c", - "src\\service\\httpService.js": "567d6f52d5392e3d95a54264e631944e", - "src\\service\\mqttService.js": "eafd4b82b1d5a7d02b32d046bf492ac9", + "src\\service\\grainService.js": "940788cbc2aea5b20789b752641df6a7", + "src\\service\\httpService.js": "6c62661a42e45226f3f82df3d7e0a37e", + "src\\service\\mqttService.js": "b7f598ec25422433bccd821b8b29d5f3", "src\\service\\nfcService.js": "fff19d7f08d3a499455ed93a5376c0fd", - "src\\service\\sqliteService.js": "9dd93a7afd36b50e6be015e950aaff83", + "src\\service\\sqliteService.js": "f1816a98a378b3ed2fbd759f6965a8df", "src\\service\\uartBleService.js": "f8816894598283c7114b4d8708bb65aa", "src\\service\\uartCodeService.js": "ed1952645c055885c78bc6c02699906f", "src\\service\\weComService.js": "14896c15403107f7225fce6db9b8a049", @@ -2681,21 +2701,21 @@ "src\\view\\config\\menu\\deviceInfo\\dataCapacityInfoView.js": "81fbf258e0ba70c126f850658981469e", "src\\view\\config\\menu\\deviceInfo\\systemInfoView.js": "95a96c6d8586410be1fe085dfa61db9f", "src\\view\\config\\menu\\deviceInfoView.js": "b703a2f9053c1b089294b3dffdf6a449", - "src\\view\\config\\menu\\doorControlView.js": "2b29eff26537ab92171a40110b8e8c0e", + "src\\view\\config\\menu\\doorControlView.js": "f2476da5f529cac859dd24776b210bf6", "src\\view\\config\\menu\\helpView.js": "b3cf2078efe3a274740276b550b68b63", "src\\view\\config\\menu\\localUser\\faceEnterView.js": "f6dc4e020a4eddba902820d4b2444ee3", "src\\view\\config\\menu\\localUser\\fingerApplyView.js": "b2b5a46109f7ac768ae6d18131a33fbe", "src\\view\\config\\menu\\localUser\\fingerEnterView.js": "46dd45fe0e8d06410a5f2bcbeb7be5ad", - "src\\view\\config\\menu\\localUser\\localUserAddView.js": "8266626bf9cadde968e2b439ef9073b0", - "src\\view\\config\\menu\\localUserView.js": "f7881e4a47fe06648d0934f286d59775", - "src\\view\\config\\menu\\networkSettingView.js": "7cb7b7ef6c1d49f819f509de43e49a56", - "src\\view\\config\\menu\\recordQuery\\recordQueryDetailView.js": "79e15d726de5146bab15a3dba533a82b", + "src\\view\\config\\menu\\localUser\\localUserAddView.js": "e9991161a3e5d4344b22f7c4ad3dac4c", + "src\\view\\config\\menu\\localUserView.js": "2533606f36feba75efe922cc6b6f883a", + "src\\view\\config\\menu\\networkSettingView.js": "740f7a643a0fb4c3caa3eb85482d85cc", + "src\\view\\config\\menu\\recordQuery\\recordQueryDetailView.js": "b3ef27a7b02bc59a5c2aa4d977efc30d", "src\\view\\config\\menu\\recordQueryView.js": "f640c2f2d560213c44633d7ea36c6960", - "src\\view\\config\\menu\\systemSetting\\displaySettingView.js": "1a376eaccd07b12bd80773be83e080fc", + "src\\view\\config\\menu\\systemSetting\\displaySettingView.js": "c92914b05b2353c446fa66c519b95f2f", "src\\view\\config\\menu\\systemSetting\\faceRecognitionSettingView.js": "8ac866907bd817d51cde8d757e33b852", "src\\view\\config\\menu\\systemSetting\\passLogSettingView.js": "b3fb57b54b5079075c331aceab74a052", "src\\view\\config\\menu\\systemSetting\\passwordManagementView.js": "720e32768be124d5591cc0914c9ba340", - "src\\view\\config\\menu\\systemSetting\\passwordOpenDoorSettingView.js": "a56728c84d37129fbae06c3a23b01092", + "src\\view\\config\\menu\\systemSetting\\passwordOpenDoorSettingView.js": "36107f1e81acd1f711fcb44b246981a5", "src\\view\\config\\menu\\systemSetting\\swipeCardRecognitionSettingView.js": "d23ab8015ac4dc7f316fc7ca4b852f6f", "src\\view\\config\\menu\\systemSetting\\timeSettingView.js": "7c5744868ad7e40b3d9ce0708e3f7b85", "src\\view\\config\\menu\\systemSettingView.js": "91aa4b58c5da0ba01e7a56ee348fee11", @@ -2705,7 +2725,7 @@ "src\\view\\gasDetailView.js": "e7f705f9b89459726064e51d57ed9d7c", "src\\view\\i18n.js": "94f43798d35026189125bf2534d1bffd", "src\\view\\idleView.js": "a1a6f9fb0ec44c59330a7461298aec46", - "src\\view\\mainView.js": "0c49e5905a87a5cfd33062df8531e421", + "src\\view\\mainView.js": "1a0d51f7ece88d821f4ba9938a505cd9", "src\\view\\pinyin\\dict.js": "a7812c30b956099fd248271ad6fd5ac9", "src\\view\\pinyin\\pinyin.js": "84e7c2ac116f5c22cf07b563ba230c68", "src\\view\\pwdView.js": "e46813353af5b4cd9f9b776328aa1987", @@ -2714,8 +2734,8 @@ "src\\view\\wechatBindView.js": "6d0239d71de3c1cf4c2e0817cd65ce3f", "src\\view\\wechatFaceView.js": "65f5edfbe0ef402c66bd62bd3eebec49", "src\\view\\wechatNetView.js": "84d8dd397ed6483a25ab99174e652362", - "src\\worker\\mqttWorker.js": "2dda93d129f1edd9f8a52aceddb0079d", - "src\\worker\\netWorker.js": "e38b00c21c77dc5b98425f12068f85ff", - "src\\worker\\passRecordWorker.js": "ad27fa58b7de2b8155bb3517e601bef4", + "src\\worker\\mqttWorker.js": "611a50d831add8ca508fc69dbef69905", + "src\\worker\\netWorker.js": "6ee5ea8dedc2a330974d72a448175d45", + "src\\worker\\passRecordWorker.js": "8b2ce900d926878f65db8fdc69b1eb3a", "src\\worker\\screenWorker.js": "57a6f54f05c57e186e44892c97e36647" } \ No newline at end of file -- Gitblit v1.9.3