ops / monitor-ui · Commits

Go to a project

Authored by qinchao
Commit 8b7ea97b59aab1b885580d337f901407ad66742a 1 parent b1752eeb

校验

Inline Side-by-side
Showing 2 changed files with 9 additions and 8 deletions
@@ -184,9 +184,10 @@ @@ -184,9 +184,10 @@
184 <script src="<%=basePath%>js/bootstrap.min.js"></script> 184 <script src="<%=basePath%>js/bootstrap.min.js"></script>
185 <script src="<%=basePath%>js/select2.min.js"></script> 185 <script src="<%=basePath%>js/select2.min.js"></script>
186 <script src="<%=basePath%>js/custom.js"></script> 186 <script src="<%=basePath%>js/custom.js"></script>
187 -<script src="<%=basePath%>script/build/node_project.js?v=20180323"></script>  
188 <script src="<%=basePath %>/js/unicorn.js"></script> 187 <script src="<%=basePath %>/js/unicorn.js"></script>
  188 +<script src="<%=basePath %>js/bootstrap-plugin/bootstrap.dialog.js" charset="UTF-8" type="text/javascript"></script>
189 <script src="<%=basePath %>script/common/genarate_left_panel.js?v=<%=ProjectConstant.MENU_VERSION %>"></script> 189 <script src="<%=basePath %>script/common/genarate_left_panel.js?v=<%=ProjectConstant.MENU_VERSION %>"></script>
  190 +<script src="<%=basePath%>script/build/node_project.js?v=20180326"></script>
190 191
191 <script type="text/javascript"> 192 <script type="text/javascript">
192 $("#li_project").addClass("active open"); 193 $("#li_project").addClass("active open");
@@ -100,7 +100,7 @@ function comfirmSubmit() { @@ -100,7 +100,7 @@ function comfirmSubmit() {
100 var environment = $("input[name='environments']:checked").val(); 100 var environment = $("input[name='environments']:checked").val();
101 var project = $("input[name='project']:checked").val(); 101 var project = $("input[name='project']:checked").val();
102 if (!project) { 102 if (!project) {
103 - alert("请选择项目"); 103 + localAlert("参数错误", "请选择项目");
104 return; 104 return;
105 } 105 }
106 var hosts = new Array(); 106 var hosts = new Array();
@@ -117,12 +117,12 @@ function comfirmSubmit() { @@ -117,12 +117,12 @@ function comfirmSubmit() {
117 if ("Deploy" == operate) {//发布 117 if ("Deploy" == operate) {//发布
118 var branch = $("input[name='branch']").val(); 118 var branch = $("input[name='branch']").val();
119 if (branch == "") { 119 if (branch == "") {
120 - alert("请填写分支名称"); 120 + localAlert("参数错误", "请填写分支名称");
121 return; 121 return;
122 } 122 }
123 var workid = $("input[name='workid']").val(); 123 var workid = $("input[name='workid']").val();
124 if (workid == "") { 124 if (workid == "") {
125 - alert("请填写关联工单号"); 125 + localAlert("参数错误", "请填写关联工单号");
126 return; 126 return;
127 } 127 }
128 128
@@ -137,7 +137,7 @@ function comfirmSubmit() { @@ -137,7 +137,7 @@ function comfirmSubmit() {
137 }, 137 },
138 success: function (dataResp) { 138 success: function (dataResp) {
139 if (dataResp==null||dataResp.code != 200) { 139 if (dataResp==null||dataResp.code != 200) {
140 - alert(dataResp.message); 140 + localAlert("校验不通过",dataResp.message);
141 return; 141 return;
142 } else { 142 } else {
143 $("input[name='branch_name']").val(branch); 143 $("input[name='branch_name']").val(branch);
@@ -146,18 +146,18 @@ function comfirmSubmit() { @@ -146,18 +146,18 @@ function comfirmSubmit() {
146 } 146 }
147 }, 147 },
148 error: function (e) { 148 error: function (e) {
149 - alert("从后台获取数据出错"); 149 + localAlert("错误","从后台获取数据出错");
150 } 150 }
151 }); 151 });
152 } else {//回滚 152 } else {//回滚
153 var rollbackfile = $("#rollbackList option:selected").val(); 153 var rollbackfile = $("#rollbackList option:selected").val();
154 if (typeof(rollbackfile) == "undefined" || rollbackfile == "") { 154 if (typeof(rollbackfile) == "undefined" || rollbackfile == "") {
155 - alert("请选择回滚版本"); 155 + localAlert("参数错误","请选择回滚版本");
156 return; 156 return;
157 } 157 }
158 var workid = $("input[name='workid']").val(); 158 var workid = $("input[name='workid']").val();
159 if (workid == "") { 159 if (workid == "") {
160 - alert("请填写关联工单号"); 160 + localAlert("参数错误","请填写关联工单号");
161 return; 161 return;
162 } 162 }
163 $("input[name='workid_name']").val(workid); 163 $("input[name='workid_name']").val(workid);