';
html += ciyfn.tdshow(dat.idcard, table.field.idcard.ext, dat, table.once, table.json, true);
diff --git a/web/admin/ap/demo.php b/web/admin/ap/demo.php
index fde1dfd..7692086 100644
--- a/web/admin/ap/demo.php
+++ b/web/admin/ap/demo.php
@@ -157,6 +157,11 @@ class demo {
$url = $post->get('url');
$weightg = $post->getint('weightg');
$eartmpr = $post->getint('eartmpr');
+ $qian = $post->getint('qian');
+ $meishi = $post->getint('meishi');
+ $weight = $post->getint('weight');
+ $height = $post->getint('height');
+ $skt = $post->getint('skt');
$idcard = $post->get('idcard');
$content = $post->get('content');
$md = $post->get('md');
@@ -205,6 +210,11 @@ class demo {
$updata['url'] = $url;
$updata['weightg'] = $weightg;
$updata['eartmpr'] = $eartmpr;
+ $updata['qian'] = $qian;
+ $updata['meishi'] = $meishi;
+ $updata['weight'] = $weight;
+ $updata['height'] = $height;
+ $updata['skt'] = $skt;
$updata['idcard'] = $idcard;
$updata['addtimes'] = tostamp();
$updata['content'] = $content;
@@ -215,14 +225,18 @@ class demo {
if ($db->update($csql, $updata) === false)
throw new \Exception('更新失败:' . $db->error);
} else {
- $updata['auditstatus'] = 20;
+ $updata['id'] = 0;
+ $updata['auditstatus'] = 0;
+ $updata['audituser'] = 0;
+ $updata['audittimes'] = 0;
+ $updata['auditmsg'] = '';
$updata['addtimes'] = tostamp();
if ($db->insert($csql, $updata) === false)
throw new \Exception('新增失败:' . $db->error);
$id = $db->insert_id();
}
$updata['id'] = $id;
- savelogdb($db, $rsuser['id'], 'ap_demo', $datarow, $updata);
+ //savelogdb($db, $rsuser['id'], 'ap_demo', $datarow, $updata);
$db->commit();
} catch (\Exception $ex) {
$db->rollback();
@@ -358,6 +372,11 @@ class demo {
$fields[] = array('style' => 'l', 'width' => 150, 'field' => 'url', 'name' => '链接');
$fields[] = array('style' => 'r', 'width' => 100, 'field' => 'weightg', 'name' => '体重');
$fields[] = array('style' => 'r', 'width' => 100, 'field' => 'eartmpr', 'name' => '耳温');
+ $fields[] = array('style' => 'r', 'width' => 100, 'field' => 'qian', 'name' => '中式钱');
+ $fields[] = array('style' => 'r', 'width' => 100, 'field' => 'meishi', 'name' => '美式钱');
+ $fields[] = array('style' => 'r', 'width' => 100, 'field' => 'weight', 'name' => '重量');
+ $fields[] = array('style' => 'r', 'width' => 100, 'field' => 'height', 'name' => '长度');
+ $fields[] = array('style' => 'r', 'width' => 100, 'field' => 'skt', 'name' => '科学数');
$fields[] = array('style' => 'l', 'width' => 150, 'field' => 'idcard', 'name' => '身份证号');
$fields[] = array('style' => 'l', 'width' => 100, 'field' => 'addtimes', 'name' => '添加时间');
$fields[] = array('style' => 'l', 'width' => 150, 'field' => 'content', 'name' => '介绍');
@@ -432,6 +451,14 @@ class demo {
$val = number_format($val / 1000, 3) . 'KG';
if ($field == 'eartmpr')
$val = number_format($val / 1000, 1) . '℃';
+ if ($field == 'qian')
+ $val = number_format($val / 100, 2) . '元';
+ if ($field == 'weight')
+ $val = number_format($val / 1000, 3) . 'KG';
+ if ($field == 'height')
+ $val = number_format($val / 1000, 3) . '米';
+ if ($field == 'skt')
+ $val = number_format($val / 1000, 3) . 'SKT';
if ($field == 'addtimes')
$val = ($val == 0 ? '--' : date('Y-m-d H:i', $val));
$dat[] = $val;
@@ -445,7 +472,7 @@ class demo {
$param['titleheight'] = '25'; //列头高度
$param['landscape'] = true; //横向打印
$param['fixtopage'] = true; //打印整个工作表
- $param['toptitle'] = 'Demo数据报表';
+ $param['toptitle'] = '复杂功能数据报表';
$str = \ciy\excel::general_excel_xml($param);
$filename = '';
if (empty($filename))
@@ -502,6 +529,11 @@ class demo {
$headsn[] = '链接.url';
$headsn[] = '体重.weightg';
$headsn[] = '耳温.eartmpr';
+ $headsn[] = '中式钱.qian';
+ $headsn[] = '美式钱.meishi';
+ $headsn[] = '重量.weight';
+ $headsn[] = '长度.height';
+ $headsn[] = '科学数.skt';
$headsn[] = '身份证号.idcard';
$headsn[] = '介绍.content';
$xlsidx = 1;
@@ -886,6 +918,61 @@ class demo {
$value = (int)((float)$showdat * 1000);
$showdat .= '℃';
}
+ } else if ($name == '中式钱') {
+ if (empty($showdat)) {
+ $value = 0;
+ } else {
+ $showdat = str_replace(',', '', str_replace('元', '', $showdat));
+ if (!is_numeric($showdat))
+ $errmsg = $name . '不是数字';
+ else
+ $value = (int)((float)$showdat * 100);
+ $showdat .= '元';
+ }
+ } else if ($name == '美式钱') {
+ if (empty($showdat)) {
+ $value = 0;
+ } else {
+ $showdat = str_replace(',', '', str_replace('¤', '', $showdat));
+ if (!is_numeric($showdat))
+ $errmsg = $name . '不是数字';
+ else
+ $value = (int)((float)$showdat * 100);
+ $showdat .= '¤';
+ }
+ } else if ($name == '重量') {
+ if (empty($showdat)) {
+ $value = 0;
+ } else {
+ $showdat = str_replace(',', '', str_replace('KG', '', $showdat));
+ if (!is_numeric($showdat))
+ $errmsg = $name . '不是数字';
+ else
+ $value = (int)((float)$showdat * 1000);
+ $showdat .= 'KG';
+ }
+ } else if ($name == '长度') {
+ if (empty($showdat)) {
+ $value = 0;
+ } else {
+ $showdat = str_replace(',', '', str_replace('米', '', $showdat));
+ if (!is_numeric($showdat))
+ $errmsg = $name . '不是数字';
+ else
+ $value = (int)((float)$showdat * 1000);
+ $showdat .= '米';
+ }
+ } else if ($name == '科学数') {
+ if (empty($showdat)) {
+ $value = 0;
+ } else {
+ $showdat = str_replace(',', '', str_replace('SKT', '', $showdat));
+ if (!is_numeric($showdat))
+ $errmsg = $name . '不是数字';
+ else
+ $value = (int)((float)$showdat * 1000);
+ $showdat .= 'SKT';
+ }
} else if ($name == '身份证号') {
if (empty($showdat)) {
$value = '';
@@ -967,6 +1054,11 @@ class demo {
$updata['url'] = $post->get('url_' . $i);
$updata['weightg'] = $post->get('weightg_' . $i);
$updata['eartmpr'] = $post->get('eartmpr_' . $i);
+ $updata['qian'] = $post->get('qian_' . $i);
+ $updata['meishi'] = $post->get('meishi_' . $i);
+ $updata['weight'] = $post->get('weight_' . $i);
+ $updata['height'] = $post->get('height_' . $i);
+ $updata['skt'] = $post->get('skt_' . $i);
$updata['idcard'] = $post->get('idcard_' . $i);
$updata['content'] = $post->get('content_' . $i);
$csql = new \ciy\sql('ap_demo');
diff --git a/web/admin/demo/form_inputbet.html b/web/admin/demo/form_inputbet.html
index fded088..e6e8d81 100644
--- a/web/admin/demo/form_inputbet.html
+++ b/web/admin/demo/form_inputbet.html
@@ -26,6 +26,14 @@