Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web

src/components/CustomPages/FM/RoleEditPage.js

@@ -724,6 +724,21 @@ class RoleEditPage extends React.Component {
                 }
               </Form.Item>
             </Col>
+            <Col span={12}>
+              <Form.Item label={'默认角色'} help={'若【是】导入用户时会默认添加此角色'}>
+                {
+                  getFieldDecorator('ISDEFAULT', {
+                    validateTrigger: 'onBlur',
+                    initialValue: (this.state.data.ISDEFAULT ? this.state.data.ISDEFAULT.toString() : 'false'),
+                  })(
+                    <Select placeholder='数据类型'>
+                      <Option value='false'>否</Option>
+                      <Option value='true'>是</Option>
+                    </Select>
+                  )
+                }
+              </Form.Item>
+            </Col>
             <Col span={12}>
               <Form.Item label={'备注'}>
                 {

src/config.js

@@ -60,7 +60,7 @@ const config = {
     hmiUrl: "http://121.41.2.71:8098/",
     webSocketHost: 'ws://121.41.2.71:3140/',
     picServerHost: 'http://121.41.2.71:5000/webImg',
-    videoServerHost: 'http://121.41.2.71:5000/webImg',
+    videoServerHost: 'https://sps.cxtc.com:3199',
     dataVUrl: "http://121.41.2.71:3167/home",
     version: version,
     guideSeverHost: "http://121.41.2.71/jyapk/",