Merge remote-tracking branch 'origin/master'

sgj

2026-01-05 7b973b3b9b723f48c54f2c0c5083886573224541

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

@@ -133,7 +133,7 @@
        <Property></Property>
        <Property name="label">所属库区</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getDeptByUserType&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">kqmc</Property>
        </Property>
@@ -479,6 +479,29 @@
        <Property name="readOnly">true</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtPull">
      <Property name="creationType">com.fzzy.igds.domain.Camera</Property>
      <PropertyDef name="deptId">
        <Property></Property>
        <Property name="label">同步库区</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getDeptByUserType&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">kqmc</Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="playType">
        <Property></Property>
        <Property name="label">播放方式</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerPlayType&quot;).getResult()}</Property>
          <Property name="keyProperty">dictValue</Property>
          <Property name="valueProperty">dictLabel</Property>
        </Property>
        <Property name="required">true</Property>
      </PropertyDef>
    </DataType>
  </Model>
  <View layout="padding:10">
    <ClientEvent name="onClick">&#xD;
@@ -549,6 +572,10 @@
    <DataSet id="dsParam">
      <ClientEvent name="onReady">self.insert({});</ClientEvent>
      <Property name="dataType">dtSecCameraParam</Property>
    </DataSet>
    <DataSet id="dsPull">
      <ClientEvent name="onReady">self.insert({});</ClientEvent>
      <Property name="dataType">dtPull</Property>
    </DataSet>
    <Container>
      <Property name="className">c-param</Property>
@@ -640,6 +667,13 @@
          <Property name="width">100</Property>
          <Property name="action">refreshCache</Property>
        </ToolBarButton>
        <ToolBarButton>
          <ClientEvent name="onClick">view.get(&quot;#dialogPull&quot;).show();</ClientEvent>
          <Property name="caption">同步监控</Property>
          <Property name="exClassName">btn2</Property>
          <Property name="iconClass">fa fa-random</Property>
          <Property name="width">100</Property>
        </ToolBarButton>
      </ToolBar>
      <DataGrid id="dataGridCamera" layoutConstraint="padding:8">
        <ClientEvent name="onDataRowClick">view.get(&quot;#dataGridCamera&quot;).set(&quot;selection&quot;,arg.data);</ClientEvent>
@@ -723,10 +757,10 @@
    </Container>
    <Dialog id="dialogMain" layout="regionPadding:8">
      <Property name="iconClass">fa fa-tasks</Property>
      <Property name="width">60%</Property>
      <Property name="width">80%</Property>
      <Property name="caption">监控信息</Property>
      <Property name="closeable">false</Property>
      <Property name="height">88%</Property>
      <Property name="height">90%</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
@@ -967,6 +1001,62 @@
      </Children>
      <Tools/>
    </Dialog>
    <Dialog id="dialogPull" layout="regionPadding:8">
      <Property name="iconClass">fa fa-tasks</Property>
      <Property name="width">35%</Property>
      <Property name="caption">同步监控信息</Property>
      <Property name="closeable">false</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsPull.data:#&quot;);&#xD;
if(data.validate() != 'ok'){&#xD;
    $notify(&quot;数据校验失败！！&quot;);&#xD;
    return;&#xD;
}&#xD;
view.get(&quot;#ajaxRemoteMedia&quot;).set(&quot;parameter&quot;,data).execute(function(result){&#xD;
    if(result){&#xD;
        $alert(result);&#xD;
    }else{&#xD;
        self.get(&quot;parent&quot;).hide();&#xD;
        query();&#xD;
    }&#xD;
});</ClientEvent>
          <Property name="caption">同步</Property>
          <Property name="iconClass">fa fa-check-circle</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="width">120</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dsMain.data:#&quot;);&#xD;
            if(cur) cur.cancel();&#xD;
            self.get(&quot;parent&quot;).hide();</ClientEvent>
          <Property name="caption">取消</Property>
          <Property name="exClassName">btn3</Property>
          <Property name="iconClass">fa fa-times-circle</Property>
          <Property name="width">120</Property>
        </Button>
      </Buttons>
      <Children>
        <AutoForm>
          <Property name="dataSet">dsPull</Property>
          <Property name="cols">*</Property>
          <Property name="labelWidth">100</Property>
          <Property name="labelAlign">right</Property>
          <Property name="labelSeparator">：</Property>
          <AutoFormElement>
            <Property name="name">deptId</Property>
            <Property name="property">deptId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">playType</Property>
            <Property name="property">playType</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="uaAction">
      <Property name="dataResolver">secCameraPR#saveCamera</Property>
      <UpdateItem>
@@ -978,6 +1068,13 @@
      <Property name="confirmMessage">确定要删除吗？</Property>
      <Property name="service">secCameraPR#delCamera</Property>
    </AjaxAction>
    <UpdateAction id="ajaxRemoteMedia">
      <Property name="dataResolver">secCameraPR#flushByMedia</Property>
      <UpdateItem>
        <Property name="dataSet">dsPull</Property>
        <Property name="dataPath">[#current]</Property>
      </UpdateItem>
    </UpdateAction>
    <Dialog id="dialogVideo">
      <Property name="width">1320</Property>
      <Property name="caption">视频预览</Property>