Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss

sgj

8 天以前 22a4f2b58fa1baa233e621d1406df456b516b4b1

 fzzy-igdss-view/src/main/java/com/fzzy/igds/GatewaySer.view.xml

@@ -45,10 +45,10 @@
      <ToolBar>
        <ToolBarButton>
          <ClientEvent name="onClick">addData();</ClientEvent>
            <Property name="caption">新增</Property>
            <Property name="exClassName">btn1</Property>
            <Property name="width">100</Property>
            <Property name="iconClass">fa fa-plus</Property>
          <Property name="caption">新增</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="width">100</Property>
          <Property name="iconClass">fa fa-plus</Property>
        </ToolBarButton>
        <ToolBarButton>
          <ClientEvent name="onClick">&#xD;
@@ -215,8 +215,8 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">playUrl</Property>
                <Property name="property">playUrl</Property>
                <Property name="name">plateNumUrl</Property>
                <Property name="property">plateNumUrl</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -225,8 +225,8 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">snapUrl</Property>
                <Property name="property">snapUrl</Property>
                <Property name="name">playUrl</Property>
                <Property name="property">playUrl</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -235,8 +235,8 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">ptzUrl</Property>
                <Property name="property">ptzUrl</Property>
                <Property name="name">snapUrl</Property>
                <Property name="property">snapUrl</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -245,18 +245,8 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">remark</Property>
                <Property name="property">remark</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">createBy</Property>
                <Property name="property">createBy</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">createTime</Property>
                <Property name="property">createTime</Property>
                <Property name="name">ptzUrl</Property>
                <Property name="property">ptzUrl</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -264,6 +254,11 @@
                <Property name="property">updateBy</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">remark</Property>
                <Property name="property">remark</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">updateTime</Property>
                <Property name="property">updateTime</Property>