feat:fix bugs

web/client/src/layout/components/header/index.jsx

@@ -36,6 +36,7 @@ const Header = (props) => {
          if (v == 'after_sale') ['problem', 'facility', 'workOrder', 'means'].map(u => modal.push(u))
          if (v == 'resource_manage') ['facility', 'workOrder', 'means'].map(u => modal.push(u))
          if (v == 'customer_service') ['service', 'workOrder', 'means'].map(u => modal.push(u))
+         if (v == 'firmware_upgrade')  modal.push('device')
       })
       modal.push('control')
       modal = [...new Set(modal)]

web/client/src/sections/firmwareUpgrade/components/addFirmwareModal.jsx

@@ -57,6 +57,7 @@ const AddFirmwareModal = (props) => {
          .attach('file',blobData,removeFlag?fileObj.name:recordRow?recordRow.firmwareName:fileObj.name)
          .field('filePath',removeFlag?fileUrl:recordRow?recordRow.filepath:fileUrl)
          .field('userId', userId||'')
+         .field('firmwareName', res?.firmwareName||'')
          .field('comment',res?.remark||'')
          .field('device_meta_name', options?.find(item=>item.value===res?.deviceName)?.label||'')
          .query({ version:res?.versionNo,device_meta_id: res?.deviceName,token:'22767e1f-db8d-4a1d-87d4-56347cf21247'})
@@ -109,8 +110,8 @@ const AddFirmwareModal = (props) => {
             'remark':recordRow?.remark
          }}  getFormApi={formApi => api.current = formApi}   labelCol={{ span: 7,offset:1}}  wrapperCol={{span: 15,offset:1}} labelPosition='left' >
             <Form.Input   field='firmwareName' label='固件版本名称:' style={{with:'80%'}}  rules={[{ required: true, message: '固件版本名称必填' }]}></Form.Input>
-            <Form.Select  field='deviceName' label='设备型号:' placeholder='请选择设备型号' optionList={options}   rules={[{ required: true, message: '设备型号必填' }]}></Form.Select>
+            <Form.Select  disabled={recordRow?true:false} field='deviceName' label='设备型号:' placeholder='请选择设备型号' optionList={options}   rules={[{ required: true, message: '设备型号必填' }]}></Form.Select>
-            <Form.Input field='versionNo' label='版本号:'  rules={[{ required: true, message: '版本号必填' }]}></Form.Input>
+            <Form.Input disabled={recordRow?true:false} field='versionNo' label='版本号:'  rules={[{ required: true, message: '版本号必填' }]}></Form.Input>
             <Form.Upload  limit={1}
                            action={`/_upload/attachments`}
                            field='files'  label='文件上传'

web/client/src/sections/install/components/memberModal.jsx

@@ -42,9 +42,9 @@ function memberModal (props) {
          text: '拥有服务、工单、资料相关的权限'
       },
       {
-         label: '固件升级',
+         label: '设备维护',
          value: 'firmware_upgrade',
-         text: '拥有固件升级、固件包上传相关的权限'
+         text: '拥有固件升级相关的权限'
       },
    ]); //权限配置
    const [pomsList_, setPomsList_] = useState([])

web/client/src/sections/install/containers/roles.jsx

@@ -262,8 +262,8 @@ const Roles = (props) => {
       {
          title: (
             <div style={{ display: 'flex', alignItems: 'center' }}>
-               固件升级
+               设备维护
-               <Tooltip content={'拥有固件升级、固件包上传相关的权限'} style={{ lineHeight: 2 }}>
+               <Tooltip content={'拥有固件升级相关的权限'} style={{ lineHeight: 2 }}>
                   <img src="/assets/images/install/table_question.png" alt="" style={{ height: 14, width: 14, marginLeft: 4 }} />
                </Tooltip>
             </div>
@@ -561,7 +561,7 @@ const Roles = (props) => {
                         <Radio value='after_sale'>售后运维</Radio>
                         <Radio value='resource_manage'>资源管理者</Radio>
                         <Radio value='customer_service'>客户服务</Radio>
-                        <Radio value='firmware_upgrade'>固件升级</Radio>
+                        <Radio value='firmware_upgrade'>设备维护</Radio>
                      </RadioGroup>
                   </div>
                   <div>