Compare commits

..

No commits in common. "37624e8ff698c39cf530142c1f461dc734269259" and "03038123a2650e26574ff0b7d80852e777403e34" have entirely different histories.

1 changed files with 3 additions and 4 deletions

View File

@ -20,11 +20,10 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region"> <f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items> <Items>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true" <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="true" BodyPadding="5px" IconFont="PlusCircle" Title="人脸识别" Layout="VBox" ShowHeader="true" BodyPadding="5px" IconFont="PlusCircle" Title="人脸识别"
TitleToolTip="人脸识别" AutoScroll="true"> TitleToolTip="人脸识别" AutoScroll="true">
<Items> <Items>
<f:ContentPanel ShowBorder="false" ShowHeader="false" ID="ContentPanel1" runat ="server" CssStyle="text-align:center" > <f:ContentPanel ShowBorder="false" ShowHeader="false" ID="ContentPanel1" runat ="server" BodyStyle="text-align:center">
<video id="video" width="480" height="640" autoplay></video> <video id="video" width="480" height="640" autoplay></video>
<canvas id="canvas" width="480" height="640" style="display:none" ></canvas> <canvas id="canvas" width="480" height="640" style="display:none" ></canvas>
<div> <div>
@ -125,7 +124,7 @@
var node = { var node = {
iframeUrl: './WeldMat/UsingSentMat/UsingMat.aspx?welderCode=' + data.d, iframeUrl: '~\\WeldMat\\UsingSentMat\\UsingMat.aspx?welderCode=' + data.d,
title: "焊材领用", title: "焊材领用",
id: "UsingMat" + getFormattedDate() id: "UsingMat" + getFormattedDate()
}; };