From 7571c6eaeec9a2742dc4faa12fa311bfec1bfdf6 Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Mon, 11 Nov 2019 17:43:18 +0800
Subject: update

---
 .../main/resources/templates/js/modules/detect/metaMapping.js | 11 +----------
 .../resources/templates/modules/detect/addTypeTemplate.html   |  4 ++--
 .../main/resources/templates/modules/detect/deteType2.html    |  2 +-
 .../main/resources/templates/modules/detect/metaMapping.html  |  4 ++--
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/nezha-admin/src/main/resources/templates/js/modules/detect/metaMapping.js b/nezha-admin/src/main/resources/templates/js/modules/detect/metaMapping.js
index 6ceb091d..6b617c01 100644
--- a/nezha-admin/src/main/resources/templates/js/modules/detect/metaMapping.js
+++ b/nezha-admin/src/main/resources/templates/js/modules/detect/metaMapping.js
@@ -61,8 +61,6 @@ $(function () {
             $("#jqGrid").closest(".ui-jqgrid-bdiv").css({"overflow-x": "hidden"});
             // var gridName = "jqGrid";
             // Merger(gridName, 'type');
-            console.log($(".costomTable").parent().css("padding-left", "0px"))
-            console.log($(".costomTable").parent().css("padding-right", "0px"))
         },
         onSelectAll: function (rowids, status) {
             if (status) {
@@ -195,7 +193,6 @@ var vm = new Vue({
             });
         },
         save: function () {
-            console.log('save--')
             if (vm.validate()) { //在下方定义的validate方法
                 return;
             }
@@ -204,7 +201,6 @@ var vm = new Vue({
             vm.saveOrUpdate(url, method);
         },
         update: function () {
-            console.log('update--')
             if (vm.validate()) { //在下方定义的validate方法
                 return;
             }
@@ -235,7 +231,6 @@ var vm = new Vue({
             if (types == null) {
                 return;
             }
-            console.log("types-->" + JSON.stringify(types))
             confirm("<@spring.message 'common.confirmDelete'/>", function () {
                 $.ajax({
                     url: baseURL + "/deteType/deleteDic",
@@ -261,7 +256,7 @@ var vm = new Vue({
             vm.touchMappings();
             var elementError = false;
             var componets = vm.$refs.metaMapping;
-            if (typeof componets != 'undefined' && componets.length > 1) {
+            if (typeof componets != 'undefined' && componets.length > 0) {
 
                 for (var i = 0; i < componets.length; i++) {
                     var componet = componets[i];
@@ -275,8 +270,6 @@ var vm = new Vue({
                 vm.mappingRequired = false;
                 elementError = true;
             }
-            console.log(vm.$v.metaMappings.$error + '|' + elementError)
-            console.log(vm.$v.metaMappings)
             return vm.$v.metaMappings.$error || elementError;
         },
         formatmetaMappingToSimple: function () {
@@ -505,8 +498,6 @@ Vue.component("meta-mapping", {
         delSelf: function (e) {
             var temp = this;
             var p = temp.metaMapping;
-            console.log('p-->')
-            console.log(p)
             if (typeof p.new != 'undefined' && p.new != null && p.new) {
                 temp.$emit("del-mapping", this.index);
             } else {
diff --git a/nezha-admin/src/main/resources/templates/modules/detect/addTypeTemplate.html b/nezha-admin/src/main/resources/templates/modules/detect/addTypeTemplate.html
index 16590cc9..72e7c259 100644
--- a/nezha-admin/src/main/resources/templates/modules/detect/addTypeTemplate.html
+++ b/nezha-admin/src/main/resources/templates/modules/detect/addTypeTemplate.html
@@ -374,10 +374,10 @@
             </div>
             <form class="form-inline">
 				<div class="add-box_cell add-box_cell_45">
-                	<input type="text" :id="'r-param-name-input-'+index" :class="{'form-control--error':$v.deteParam.name.$dirty&&(!$v.deteParam.name.required||!$v.deteParam.name.inPageNameRepeat)}" class="form-control add-box_input"  placeholder="请输入名称" v-model="$v.deteParam.name.$model">
+                	<input type="text" :id="'r-param-name-input-'+index" :class="{'form-control--error':$v.deteParam.name.$dirty&&(!$v.deteParam.name.required||!$v.deteParam.name.inPageNameRepeat)}" class="form-control add-box_input"  placeholder="<@spring.message 'common.input'/><@spring.message 'common.name'/>" v-model="$v.deteParam.name.$model">
 				</div>
 				<div class="add-box_cell add-box_cell_45">
-                    <input type="text" :id="'r-param-defval-input-'+index" :class="{'form-control--error':$v.deteParam.defVal.$dirty&&!$v.deteParam.defVal.required}" class="form-control add-box_input"  placeholder="请输入默认值" v-model="$v.deteParam.defVal.$model">
+                    <input type="text" :id="'r-param-defval-input-'+index" :class="{'form-control--error':$v.deteParam.defVal.$dirty&&!$v.deteParam.defVal.required}" class="form-control add-box_input"  placeholder="<@spring.message 'common.input'/><@spring.message 'common.defVal'/>" v-model="$v.deteParam.defVal.$model">
 				</div>
                 <span class="add-box_ops">
 					<i @click="submitSelf" class="fa fa-check" ></i>
diff --git a/nezha-admin/src/main/resources/templates/modules/detect/deteType2.html b/nezha-admin/src/main/resources/templates/modules/detect/deteType2.html
index 4885091d..154c0a8d 100644
--- a/nezha-admin/src/main/resources/templates/modules/detect/deteType2.html
+++ b/nezha-admin/src/main/resources/templates/modules/detect/deteType2.html
@@ -499,7 +499,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <div class="col-sm-2 control-label"><@spring.message 'deteType.defVal'/>:</div>
+                            <div class="col-sm-2 control-label"><@spring.message 'common.defVal'/>:</div>
                             <div class="col-sm-9">
                                 <input type="text"  class="form-control" :class="{'form-control--error': ($v.deteType.deteTypeParams.$each[index].defVal.$dirty && !$v.deteType.deteTypeParams.$each[index].defVal.required)}"  v-model.trim="$v.deteType.deteTypeParams.$each[index].defVal.$model" value="{{item.defVal}}"/>
                                 <span class="required-symbol">*</span>
diff --git a/nezha-admin/src/main/resources/templates/modules/detect/metaMapping.html b/nezha-admin/src/main/resources/templates/modules/detect/metaMapping.html
index 172dda1f..11b63c29 100644
--- a/nezha-admin/src/main/resources/templates/modules/detect/metaMapping.html
+++ b/nezha-admin/src/main/resources/templates/modules/detect/metaMapping.html
@@ -120,10 +120,10 @@
         <div class="add-box_row" v-show="editSwitch" :id="editPreKey+'-'+index">
             <form class="form-inline">
                 <div class="add-box_cell add-box_cell_45">
-                    <input type="text" :id="'r-mapping-val-input-'+index" :class="{'form-control--error':$v.metaMapping.val.$dirty&&(!$v.metaMapping.val.required||!$v.metaMapping.val.inPageValRepeat)}" class="form-control add-box_input"  placeholder="请输入名称" v-model="$v.metaMapping.val.$model">
+                    <input type="text" :id="'r-mapping-val-input-'+index" :class="{'form-control--error':$v.metaMapping.val.$dirty&&(!$v.metaMapping.val.required||!$v.metaMapping.val.inPageValRepeat)}" class="form-control add-box_input"  placeholder="<@spring.message 'common.input'/><@spring.message 'metaMapping.key'/>" v-model="$v.metaMapping.val.$model">
                 </div>
                 <div class="add-box_cell add-box_cell_45">
-                    <input type="text" :id="'r-mapping-mapping-input-'+index" :class="{'form-control--error':$v.metaMapping.mapping.$dirty&&(!$v.metaMapping.mapping.required||!$v.metaMapping.mapping.inPageMappingRepeat)}" class="form-control add-box_input"  placeholder="请输入默认值" v-model="$v.metaMapping.mapping.$model">
+                    <input type="text" :id="'r-mapping-mapping-input-'+index" :class="{'form-control--error':$v.metaMapping.mapping.$dirty&&(!$v.metaMapping.mapping.required||!$v.metaMapping.mapping.inPageMappingRepeat)}" class="form-control add-box_input"  placeholder="<@spring.message 'common.input'/><@spring.message 'metaMapping.val'/>" v-model="$v.metaMapping.mapping.$model">
                 </div>
                 <span class="add-box_ops">
 					<i @click="submitSelf" class="fa fa-check" ></i>
-- 
cgit v1.2.3