coolcare-lite-scada-component 1.0.40 → 1.0.42

package/es/element/utils/pointWrite.js

@@ -104,93 +104,101 @@ export function pointWrite(_x4) {
 }
 function _pointWrite() {
   _pointWrite = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-    var deviceId, value, pointId, query, deviceInfo, pointInfo, writeFunction, res;
+    var _query$premission;
+    var query, deviceId, value, pointId, deviceInfo, pointInfo, writeFunction, res;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          // eslint-disable-next-line prefer-const
-          deviceId = params.deviceId, value = params.value, pointId = params.pointId;
-          query = queryToObject(window.location.href); // 产品组态不能点位写入
+          query = queryToObject(window.location.href);
           if (!(query.scene === 'product')) {
-            _context3.next = 4;
+            _context3.next = 3;
+            break;
+          }
+          return _context3.abrupt("return");
+        case 3:
+          console.log(query.premission);
+          if (!((_query$premission = query.premission) === null || _query$premission === void 0 ? void 0 : _query$premission.split(',').includes('49'))) {
+            _context3.next = 7;
             break;
           }
+          message.error('您没有点位写入权限');
           return _context3.abrupt("return");
-        case 4:
-          // 如果没有 deviceId（device 场景下），则从 url query 里获取
+        case 7:
+          // eslint-disable-next-line prefer-const
+          deviceId = params.deviceId, value = params.value, pointId = params.pointId; // 如果没有 deviceId（device 场景下），则从 url query 里获取
           if (!deviceId) {
             if (query.scene === 'device') {
               deviceId = parseInt(query.deviceId, 10);
             }
           }
-          _context3.next = 7;
+          _context3.next = 11;
           return fetchDeviceInfo(deviceId);
-        case 7:
+        case 11:
           deviceInfo = _context3.sent;
           if (deviceInfo) {
-            _context3.next = 10;
+            _context3.next = 14;
             break;
           }
           return _context3.abrupt("return", false);
-        case 10:
+        case 14:
           if ([0, 1].includes(deviceInfo.protocol)) {
-            _context3.next = 13;
+            _context3.next = 17;
             break;
           }
           message.info('暂不支持该协议网关的写入');
           return _context3.abrupt("return", false);
-        case 13:
+        case 17:
           if (params.pointId) {
-            _context3.next = 18;
+            _context3.next = 22;
             break;
           }
-          _context3.next = 16;
+          _context3.next = 20;
           return getDevicePoint(deviceId, params.identifierName);
-        case 16:
+        case 20:
           pointInfo = _context3.sent;
           if (pointInfo) {
             pointId = pointInfo.pointId;
           }
-        case 18:
+        case 22:
           writeFunction = deviceInfo.protocol === 0 ? ModbusMqttWritePointData : CommonMqttWritePointData;
-          _context3.prev = 19;
-          _context3.next = 22;
+          _context3.prev = 23;
+          _context3.next = 26;
           return writeFunction(_defineProperty({}, pointId, value));
-        case 22:
+        case 26:
           res = _context3.sent;
           if (!(res.data === '指令已下发')) {
-            _context3.next = 26;
+            _context3.next = 30;
             break;
           }
           message.success('指令已下发');
           return _context3.abrupt("return", true);
-        case 26:
+        case 30:
           if (res.success) {
-            _context3.next = 29;
+            _context3.next = 33;
             break;
           }
           message.error(res.message);
           return _context3.abrupt("return", false);
-        case 29:
+        case 33:
           if (!(res.data && pointId in res.data)) {
-            _context3.next = 32;
+            _context3.next = 36;
             break;
           }
           message.error('写入失败');
           return _context3.abrupt("return", false);
-        case 32:
-          _context3.next = 38;
+        case 36:
+          _context3.next = 42;
           break;
-        case 34:
-          _context3.prev = 34;
-          _context3.t0 = _context3["catch"](19);
+        case 38:
+          _context3.prev = 38;
+          _context3.t0 = _context3["catch"](23);
           console.error(_context3.t0);
           return _context3.abrupt("return", false);
-        case 38:
+        case 42:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[19, 34]]);
+    }, _callee3, null, [[23, 38]]);
   }));
   return _pointWrite.apply(this, arguments);
 }

package/es/typings.d.ts

@@ -59,6 +59,8 @@ type EditorQuery =
       companyId: string;
       /** 项目 id */
       projectId?: string;
+      // 权限
+      premission?: string;
     };
 
 type PlayerQuery =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coolcare-lite-scada-component",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "scripts": {
     "start": " umi dev",
     "build:prod": "UMI_ENV=prod umi build",