Modify rule manager common component
authorLiYi <li.yi101@zte.com.cn>
Wed, 8 Mar 2017 02:16:23 +0000 (10:16 +0800)
committer6092002077 <li.yi101@zte.com.cn>
Wed, 8 Mar 2017 02:16:23 +0000 (10:16 +0800)
modify json file license

Issue-ID:CLIENT-164

Change-Id: I14819be526be3a1762d29045a6646cdcb54643af
Signed-off-by: YILI <li.yi101@zte.com.cn>
alarm-analysis/src/main/webapp/config/webpack.common.js
alarm-analysis/src/main/webapp/config/webpack.dev.js
alarm-analysis/src/main/webapp/i18n/en-US.json
alarm-analysis/src/main/webapp/i18n/zh-CN.json
alarm-analysis/src/main/webapp/package.json
alarm-analysis/src/main/webapp/tsconfig.json
alarm-analysis/src/main/webapp/typings.json

index bedcb7c..34ce92d 100644 (file)
@@ -20,15 +20,14 @@ var helpers = require('./helpers');
 \r
 module.exports = {\r
     entry: {\r
-        'polyfills': './src/polyfills.ts',   \r
-        'vendor': './src/vendor.ts',        \r
-        'app': './src/main.ts'               \r
+        'polyfills': './alarm/polyfills.ts',  \r
+        'vendor': './alarm/vendor.ts',        \r
+        'app': './alarm/main.ts'              \r
     },\r
 \r
     resolve: {\r
-        extensions: ['', '.js', '.ts']        \r
+        extensions: ['', '.js', '.ts']      \r
     },\r
-    require:"../public/common/js/popModal.js",\r
 \r
     module: {\r
         loaders: [\r
@@ -38,37 +37,32 @@ module.exports = {
 \r
             },\r
             \r
-            {   \r
+            {  \r
                 test: /\.html$/,\r
                 loader: 'html'\r
             },\r
             {   \r
                 test: /\.(png|jpe?g|gif|ico|svg)$/,\r
-                include: [helpers.root('public', 'images'),helpers.root('public', 'component/thirdparty/uniform/images'),\r
-                    helpers.root('public', 'framework/img'),\r
-                    helpers.root('public', 'component/thirdparty/zTree/css/zTreeStyle/img'),\r
-                    helpers.root('public', 'component/thirdparty/icheck/skins/line'),\r
-                    helpers.root('public', 'component/thirdparty/icheck/skins/square'),\r
-                    helpers.root('public', 'component/'),\r
+                include: [helpers.root('public', 'thirdparty'),helpers.root('public', 'framework'),\r
+                helpers.root('public', 'thirdparty/images'),helpers.root('public', 'framework/browser/thirdparty/images')\r
                 ],\r
                 loader: 'file?name=public/images/[name].[hash].[ext]'\r
             },\r
             {   \r
                 test: /\.(svg|woff|woff2|ttf|eot)$/,\r
-                include: [helpers.root('public', 'fonts'),helpers.root('public', 'component/css/ZteIctIcons/fonts'),\r
-                    helpers.root('public', 'component/thirdparty/bootstrap/fonts')\r
+                include: [helpers.root('public', 'thirdparty')\r
                 ],\r
                 loader: 'file?name=public/fonts/[name].[hash].[ext]'\r
             },\r
-            {   \r
+            {  \r
                 test: /\.css$/,\r
-                exclude: [helpers.root('src', 'app'),helpers.root('public', 'component/thirdparty/icheck/skins/line')\r
+                exclude: [helpers.root('alarm', 'app'),helpers.root('public', 'component/thirdparty/icheck/skins/line')\r
             ],\r
                 loader: ExtractTextPlugin.extract('style', 'css?sourceMap')\r
             },\r
             {\r
                 test: /\.css$/,\r
-                include: helpers.root('src', 'app'),\r
+                include: helpers.root('alarm', 'app'),\r
                 loader: 'raw'\r
             }\r
         ]\r
@@ -80,7 +74,8 @@ module.exports = {
         }),\r
 \r
         new HtmlWebpackPlugin({\r
-            template: 'src/index.html',\r
+            template: 'alarm/index.html'\r
         })\r
+        \r
     ]\r
 };\r
index ec32a22..235a3ac 100644 (file)
@@ -32,7 +32,7 @@ module.exports = webpackMerge(commonConfig, {
 \r
      devServer: {\r
       port: 9527,\r
-      host: '10.74.24.33',\r
+      host: '10.74.24.30',\r
       historyApiFallback: true,\r
       watchOptions: {\r
         aggregateTimeout: 300,\r
index 64f7e58..2486638 100644 (file)
@@ -1,18 +1,4 @@
-/* Copyright 2017 ZTE Corporation.
- *
- *Licensed under the Apache License, Version 2.0 (the "License");
- *you may not use this file except in compliance with the License.
- *You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- {
+{
   "common_status":"Status",
   "common_keyword":"Keyword",
   "field_rule_name":"Rulename",
   "message_add_rule_success":"Add Success",
   "exception_content_error":"Rule Content Error",
   "exception_package_error":"Begin With Package",
-  "warn_delete_info": "only delete in stoped case rule "
+  "warn_delete_info": "only delete in stoped case rule ",
+  "message_update_rule_success":"Update Success",
+  "message_engine_error_rule_fail":"Call Engine Interface Fail",
+  "modalTitleUpdate":"Rule Update",
+  "message_other_exception_rule_fail":"Other error occurred",
+  "message_checkContent_rule_success":"Rule Content Correct",
+  "modalTitleCheck":"Check Rule",
+  "message_rule_name_repeat_error":"Rule Name Repeat",
+  "message_rule_content_repeat_error":"Rule Content Repeat",
+  "message_rule_content":"Rule Content"
 
 }
\ No newline at end of file
index ee94826..08933d8 100644 (file)
@@ -1,22 +1,8 @@
-/* Copyright 2017 ZTE Corporation.
- *
- *Licensed under the Apache License, Version 2.0 (the "License");
- *you may not use this file except in compliance with the License.
- *You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 {
   "common_status":"状态",
   "common_keyword":"关键字",
   "field_rule_name":"规则名称",
-  "common_query":"查询",
+  "common_query":"查询 ",
   "common_reset":"重置",
   "common_add":"添加",
   "common_total1":"共 ",
   "message_add_rule_success":"添加成功",
   "exception_content_error":"规则内容错误",
   "exception_package_error":"规则必须以package开头",
-  "warn_delete_info":"只能删除处于已停止状态的规则"
+  "warn_delete_info":"只能删除处于已停止状态的规则",
+  "message_update_rule_success":"修改成功",
+  "message_exception_rule_fail":"从引擎调用删除规则接口失败",
+  "modalTitleUpdate":"规则修改",
+  "message_other_exception_rule_fail":"发生其他错误",
+  "message_checkContent_rule_success":"规则内容正确",
+  "modalTitleCheck":"验证规则",
+  "message_rule_name_repeat_error":"规则名字重复",
+  "message_rule_content_repeat_error":"规则内容重复",
+  "message_rule_content":"规则内容"
 }
\ No newline at end of file
index 4b4b9ed..9ba38e8 100644 (file)
@@ -1,17 +1,3 @@
-/* Copyright 2017 ZTE Corporation.
- *
- *Licensed under the Apache License, Version 2.0 (the "License");
- *you may not use this file except in compliance with the License.
- *You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 {
   "name": "alarm-analysis",
   "version": "1.0.0",
@@ -20,7 +6,7 @@
     "start": "webpack-dev-server --inline --progress",
     "test": "karma start",
     "build": "rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail",
-    "postinstall": "typings install",
+    "postinstall": "typings install"
   },
   "licenses": [
     {
index 57db656..f58e4af 100644 (file)
@@ -1,17 +1,3 @@
-/* Copyright 2017 ZTE Corporation.\r
- *\r
- *Licensed under the Apache License, Version 2.0 (the "License");\r
- *you may not use this file except in compliance with the License.\r
- *You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
 {\r
   "compilerOptions": {\r
     "target": "es5",\r
index 34d977e..3df8030 100644 (file)
@@ -1,17 +1,3 @@
-/* Copyright 2017 ZTE Corporation.\r
- *\r
- *Licensed under the Apache License, Version 2.0 (the "License");\r
- *you may not use this file except in compliance with the License.\r
- *You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
 {\r
   "globalDependencies": {\r
     "bootstrap": "registry:dt/bootstrap#3.3.5+20160726204056",\r