coolcare-lite-scada-component 1.0.39 → 1.0.41

package/es/components/ModalChoosePoint/index.js

@@ -13,8 +13,6 @@ import React from "react";
 import { useCallback, useEffect, useState } from 'react';
 import { Modal, Button, Form, Space, message, Select } from 'antd';
 import { GetDevicePage, GetDevicePoint } from "../../services/gateway/Device";
-import { GetColdChainPermissionDevicePage } from "../../services/project/ProjectUserPermission";
-import { useModel } from 'umi';
 var Option = Select.Option;
 var tailLayout = {
   wrapperCol: {
@@ -41,15 +39,6 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     pointList = _useState4[0],
     setPointList = _useState4[1];
-  var _useModel = useModel('@@initialState', function (model) {
-      var _model$initialState, _model$initialState2;
-      return {
-        platform: (_model$initialState = model.initialState) === null || _model$initialState === void 0 ? void 0 : _model$initialState.platform,
-        currentProject: (_model$initialState2 = model.initialState) === null || _model$initialState2 === void 0 ? void 0 : _model$initialState2.currentProject
-      };
-    }),
-    platform = _useModel.platform,
-    currentProject = _useModel.currentProject;
   var closeModal = function closeModal() {
     onCancel === null || onCancel === void 0 ? void 0 : onCancel();
   };
@@ -98,45 +87,29 @@ var ModalChoosePoint = function ModalChoosePoint(_ref) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           _context2.prev = 0;
-          if (!(platform === 'project')) {
-            _context2.next = 7;
-            break;
-          }
-          _context2.next = 4;
-          return GetColdChainPermissionDevicePage({
-            companyId: companyId,
-            projectId: currentProject === null || currentProject === void 0 ? void 0 : currentProject.projectId,
-            isPermission: true
-          });
-        case 4:
-          res = _context2.sent;
-          _context2.next = 10;
-          break;
-        case 7:
-          _context2.next = 9;
+          _context2.next = 3;
           return GetDevicePage({
             companyId: companyId
           });
-        case 9:
+        case 3:
           res = _context2.sent;
-        case 10:
           if (res.success) {
             setDeviceList(((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || []);
           } else {
             message.error(res.message);
           }
-          _context2.next = 16;
+          _context2.next = 10;
           break;
-        case 13:
-          _context2.prev = 13;
+        case 7:
+          _context2.prev = 7;
           _context2.t0 = _context2["catch"](0);
           message.error('获取设备列表失败');
-        case 16:
+        case 10:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[0, 13]]);
-  })), [companyId, platform, currentProject]);
+    }, _callee2, null, [[0, 7]]);
+  })), [companyId]);
 
   /** 提交表单且数据验证成功后回调事件 */
   var onFinish = /*#__PURE__*/function () {

package/es/element/utils/pointWrite.js

@@ -104,93 +104,100 @@ 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:
+          if (!((_query$premission = query.premission) === null || _query$premission === void 0 ? void 0 : _query$premission.split(',').includes('49'))) {
+            _context3.next = 6;
             break;
           }
+          message.error('您没有点位写入权限');
           return _context3.abrupt("return");
-        case 4:
-          // 如果没有 deviceId（device 场景下），则从 url query 里获取
+        case 6:
+          // 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 = 10;
           return fetchDeviceInfo(deviceId);
-        case 7:
+        case 10:
           deviceInfo = _context3.sent;
           if (deviceInfo) {
-            _context3.next = 10;
+            _context3.next = 13;
             break;
           }
           return _context3.abrupt("return", false);
-        case 10:
+        case 13:
           if ([0, 1].includes(deviceInfo.protocol)) {
-            _context3.next = 13;
+            _context3.next = 16;
             break;
           }
           message.info('暂不支持该协议网关的写入');
           return _context3.abrupt("return", false);
-        case 13:
+        case 16:
           if (params.pointId) {
-            _context3.next = 18;
+            _context3.next = 21;
             break;
           }
-          _context3.next = 16;
+          _context3.next = 19;
           return getDevicePoint(deviceId, params.identifierName);
-        case 16:
+        case 19:
           pointInfo = _context3.sent;
           if (pointInfo) {
             pointId = pointInfo.pointId;
           }
-        case 18:
+        case 21:
           writeFunction = deviceInfo.protocol === 0 ? ModbusMqttWritePointData : CommonMqttWritePointData;
-          _context3.prev = 19;
-          _context3.next = 22;
+          _context3.prev = 22;
+          _context3.next = 25;
           return writeFunction(_defineProperty({}, pointId, value));
-        case 22:
+        case 25:
           res = _context3.sent;
           if (!(res.data === '指令已下发')) {
-            _context3.next = 26;
+            _context3.next = 29;
             break;
           }
           message.success('指令已下发');
           return _context3.abrupt("return", true);
-        case 26:
+        case 29:
           if (res.success) {
-            _context3.next = 29;
+            _context3.next = 32;
             break;
           }
           message.error(res.message);
           return _context3.abrupt("return", false);
-        case 29:
+        case 32:
           if (!(res.data && pointId in res.data)) {
-            _context3.next = 32;
+            _context3.next = 35;
             break;
           }
           message.error('写入失败');
           return _context3.abrupt("return", false);
-        case 32:
-          _context3.next = 38;
+        case 35:
+          _context3.next = 41;
           break;
-        case 34:
-          _context3.prev = 34;
-          _context3.t0 = _context3["catch"](19);
+        case 37:
+          _context3.prev = 37;
+          _context3.t0 = _context3["catch"](22);
           console.error(_context3.t0);
           return _context3.abrupt("return", false);
-        case 38:
+        case 41:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[19, 34]]);
+    }, _callee3, null, [[22, 37]]);
   }));
   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.39",
+  "version": "1.0.41",
   "scripts": {
     "start": " umi dev",
     "build:prod": "UMI_ENV=prod umi build",