 qixinzhi
|
01585eff3c
|
* Move measurment to BI.
|
2023-08-22 02:09:34 +00:00 |
|
|
朱金勇
|
e636eaf108
|
- Remove array('' => '') for select.
|
2023-07-12 04:15:29 +00:00 |
|
|
Guanxiying
|
b6400ba020
|
* Fix sonar notice: statement will not be executed conditionally.
|
2023-06-01 09:26:04 +08:00 |
|
|
Guanxiying
|
c12fb73c0d
|
* Use 'w-160px' class instead of "width" attribute.
|
2023-05-31 23:40:56 +08:00 |
|
|
Guanxiying
|
e01d24354d
|
* Remove useless trailing whitespaces at the end of some lines.
# Please enter the commit message for your changes. Lines starting
diff --git a/module/measurement/view/definition.html.php b/module/measurement/view/definition.html.php
index 622f3b9a25..cfdeb7b27b 100644
--- a/module/measurement/view/definition.html.php
+++ b/module/measurement/view/definition.html.php
@@ -65,7 +65,7 @@ $(function()
if(method == 'C') return definition.del();
definition.setFormula(method,'method');
- })
+ })
$('#basicmeas').change(function()
{
@@ -106,7 +106,7 @@ var definition = {
{
var methodObj = $('#formula-box span');
var methods = [];
-
+
methodObj.each(function()
{
methods.push($(this).attr('data-method'));
diff --git a/module/measurement/view/editcollectconf.html.php b/module/measurement/view/editcollectconf.html.php
index 7b6f3cd1bc..4990f3e822 100644
--- a/module/measurement/view/editcollectconf.html.php
+++ b/module/measurement/view/editcollectconf.html.php
@@ -55,7 +55,7 @@ if($measurement->collectType == 'crontab')
<?php if($measurement->collectType == 'crontab') echo html::hidden('config[type]', $measurement->collectConf->type)?>
<?php if($measurement->collectType == 'action') echo html::hidden('config[type]', 'week')?>
</td>
-</tr>
+</tr>
<script>
$(function()
{
@@ -77,9 +77,8 @@ $(function()
$('#collectType').change();
$('ul.nav-tabs a').click(function()
- {
+ {
if($(this).data('type'))$('input[id*=type][id*=config]').val($(this).data('type'));
});
-
});
</script>
diff --git a/module/measurement/view/edittemplate.html.php b/module/measurement/view/edittemplate.html.php
index 21a1e44d68..a09a53399a 100644
--- a/module/measurement/view/edittemplate.html.php
+++ b/module/measurement/view/edittemplate.html.php
@@ -15,7 +15,7 @@
<th><?php echo $lang->measurement->content;?></th>
<td colspan='2' class='tips'>
<?php echo html::textarea('content', $template->content, "class='form-control'");?>
- <i class="icon icon-exclamation-sign icon-rotate-180"></i>
+ <i class="icon icon-exclamation-sign icon-rotate-180"></i>
<?php echo $lang->measurement->tips->click2InsertData;?>
</td>
</tr>
diff --git a/module/measurement/view/menu.html.php b/module/measurement/view/menu.html.php
index e78fb61fe8..440f194677 100644
--- a/module/measurement/view/menu.html.php
+++ b/module/measurement/view/menu.html.php
@@ -1,4 +1,4 @@
-<?php
+<?php
$this->app->loadLang('measurement');
js::set('methodName', $this->app->methodName);
?>
|
2023-05-31 23:39:44 +08:00 |
|
|
Guanxiying
|
0fa5c56e11
|
* Remove two useless trailing whitespaces.
|
2023-05-31 23:39:44 +08:00 |
|
|
Guanxiying
|
df27c69e9d
|
* Add meas phpTemplate.
|
2023-05-31 17:16:48 +08:00 |
|
|
GuanXiying
|
a15bb1ccaa
|
* Add setphpparams page.
|
2023-05-31 10:48:01 +08:00 |
|
|
Guanxiying
|
c1364eb313
|
* Adjust template for php meas.
|
2023-05-31 09:27:34 +08:00 |
|
|
Guanxiying
|
612fb59a85
|
* Fix url and data for getphpparams.
|
2023-05-31 09:27:34 +08:00 |
|
|
Guanxiying
|
aada692155
|
* Convert return of parseSqlFunction to string.
|
2023-05-31 09:27:34 +08:00 |
|
|
Guanxiying
|
89e87845ca
|
* Add exec php measurement function.
|
2023-05-31 09:27:34 +08:00 |
|
|
Guanxiying
|
43f4d77bcf
|
* Add getPhpMeasParams function.
|
2023-05-31 09:27:34 +08:00 |
|
|
Guanxiying
|
a61fdb6f99
|
* Finish createPhpFunction function.
|
2023-05-31 09:27:34 +08:00 |
|
|
Guanxiying
|
8c5ad0c0f5
|
* Convert post measurementID to int type.
|
2023-05-31 09:27:34 +08:00 |
|
|
Guanxiying
|
a2939cde28
|
* Add getPhpParams page.
|
2023-05-31 09:27:34 +08:00 |
|
|
Guanxiying
|
3bbad5e040
|
* Finish test and save php meas function.
|
2023-05-31 09:27:34 +08:00 |
|
|
Guanxiying
|
30cd5b68aa
|
- Delete unused functions.
|
2023-05-31 09:27:34 +08:00 |
|
|
Guanxiying
|
8f3cd7b5bc
|
* Refactor function for php meas.
|
2023-05-31 09:27:34 +08:00 |
|
|
Guanxiying
|
06ebf98136
|
* Add a "title" attribute to report iframe.
|
2023-05-31 09:27:34 +08:00 |
|
|
Guanxiying
|
fabeda06cb
|
* Adjust design php meas page.
|
2023-05-30 09:59:12 +08:00 |
|
|
Guanxiying
|
dfc75955ec
|
* Add functions for php measurement.
|
2023-05-30 09:59:11 +08:00 |
|
|
Guanxiying
|
b3a2a4ad2f
|
* Convert params from null to string.
|
2023-05-30 09:59:11 +08:00 |
|
|
Guanxiying
|
cf3f952c14
|
* Add design function.
|
2023-05-30 09:59:11 +08:00 |
|
|
Guanxiying
|
7a02d71931
|
* Add functions for php meas.
|
2023-05-30 09:59:10 +08:00 |
|
|
Guanxiying
|
596c2decb5
|
* Fix return type of getList and getReportContent.
|
2023-05-30 09:59:10 +08:00 |
|
|
sunguangming
|
55ca43f097
|
* Fix errors of sonar.
|
2023-05-29 15:08:47 +08:00 |
|
|
Guanxiying
|
30c94fd6a7
|
* Replace "die()" with "helper::end" and set default engine.
|
2023-05-25 17:07:17 +08:00 |
|
|
Guanxiying
|
0c1eac24c6
|
- Delete unused file.
|
2023-05-25 16:57:02 +08:00 |
|
|
Guanxiying
|
deec3895fc
|
+ Add meas modules.
|
2023-05-25 16:56:05 +08:00 |
|