Modify rule manager common component

modify json file license

Issue-ID:CLIENT-164

Change-Id: I14819be526be3a1762d29045a6646cdcb54643af
Signed-off-by: YILI <li.yi101@zte.com.cn>

7 files changed, 37 insertions, 94 deletions

diff --git a/alarm-analysis/src/main/webapp/config/webpack.common.js b/alarm-analysis/src/main/webapp/config/webpack.common.js
index bedcb7cc..34ce92df 100644
--- a/alarm-analysis/src/main/webapp/config/webpack.common.js
+++ b/alarm-analysis/src/main/webapp/config/webpack.common.js
@@ -20,15 +20,14 @@ var helpers = require('./helpers');
 

 module.exports = {

     entry: {

-        'polyfills': './src/polyfills.ts',   

-        'vendor': './src/vendor.ts',        

-        'app': './src/main.ts'               

+        'polyfills': './alarm/polyfills.ts',  

+        'vendor': './alarm/vendor.ts',        

+        'app': './alarm/main.ts'              

     },

 

     resolve: {

-        extensions: ['', '.js', '.ts']        

+        extensions: ['', '.js', '.ts']      

     },

-    require:"../public/common/js/popModal.js",

 

     module: {

         loaders: [

@@ -38,37 +37,32 @@ module.exports = {
 

             },

             

-            {   

+            {  

                 test: /\.html$/,

                 loader: 'html'

             },

             {   

                 test: /\.(png|jpe?g|gif|ico|svg)$/,

-                include: [helpers.root('public', 'images'),helpers.root('public', 'component/thirdparty/uniform/images'),

-                    helpers.root('public', 'framework/img'),

-                    helpers.root('public', 'component/thirdparty/zTree/css/zTreeStyle/img'),

-                    helpers.root('public', 'component/thirdparty/icheck/skins/line'),

-                    helpers.root('public', 'component/thirdparty/icheck/skins/square'),

-                    helpers.root('public', 'component/'),

+                include: [helpers.root('public', 'thirdparty'),helpers.root('public', 'framework'),

+                helpers.root('public', 'thirdparty/images'),helpers.root('public', 'framework/browser/thirdparty/images')

                 ],

                 loader: 'file?name=public/images/[name].[hash].[ext]'

             },

             {   

                 test: /\.(svg|woff|woff2|ttf|eot)$/,

-                include: [helpers.root('public', 'fonts'),helpers.root('public', 'component/css/ZteIctIcons/fonts'),

-                    helpers.root('public', 'component/thirdparty/bootstrap/fonts')

+                include: [helpers.root('public', 'thirdparty')

                 ],

                 loader: 'file?name=public/fonts/[name].[hash].[ext]'

             },

-            {   

+            {  

                 test: /\.css$/,

-                exclude: [helpers.root('src', 'app'),helpers.root('public', 'component/thirdparty/icheck/skins/line')

+                exclude: [helpers.root('alarm', 'app'),helpers.root('public', 'component/thirdparty/icheck/skins/line')

             ],

                 loader: ExtractTextPlugin.extract('style', 'css?sourceMap')

             },

             {

                 test: /\.css$/,

-                include: helpers.root('src', 'app'),

+                include: helpers.root('alarm', 'app'),

                 loader: 'raw'

             }

         ]

@@ -80,7 +74,8 @@ module.exports = {
         }),

 

         new HtmlWebpackPlugin({

-            template: 'src/index.html',

+            template: 'alarm/index.html'

         })

+        

     ]

 };

diff --git a/alarm-analysis/src/main/webapp/config/webpack.dev.js b/alarm-analysis/src/main/webapp/config/webpack.dev.js
index ec32a22d..235a3acd 100644
--- a/alarm-analysis/src/main/webapp/config/webpack.dev.js
+++ b/alarm-analysis/src/main/webapp/config/webpack.dev.js
@@ -32,7 +32,7 @@ module.exports = webpackMerge(commonConfig, {
 

      devServer: {

       port: 9527,

-      host: '10.74.24.33',

+      host: '10.74.24.30',

       historyApiFallback: true,

       watchOptions: {

         aggregateTimeout: 300,

diff --git a/alarm-analysis/src/main/webapp/i18n/en-US.json b/alarm-analysis/src/main/webapp/i18n/en-US.json
index 64f7e58e..2486638e 100644
--- a/alarm-analysis/src/main/webapp/i18n/en-US.json
+++ b/alarm-analysis/src/main/webapp/i18n/en-US.json
@@ -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",
@@ -49,6 +35,15 @@
   "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
diff --git a/alarm-analysis/src/main/webapp/i18n/zh-CN.json b/alarm-analysis/src/main/webapp/i18n/zh-CN.json
index ee948267..08933d84 100644
--- a/alarm-analysis/src/main/webapp/i18n/zh-CN.json
+++ b/alarm-analysis/src/main/webapp/i18n/zh-CN.json
@@ -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":"共 ",
@@ -49,5 +35,14 @@
   "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
diff --git a/alarm-analysis/src/main/webapp/package.json b/alarm-analysis/src/main/webapp/package.json
index 4b4b9edf..9ba38e87 100644
--- a/alarm-analysis/src/main/webapp/package.json
+++ b/alarm-analysis/src/main/webapp/package.json
@@ -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": [
     {
diff --git a/alarm-analysis/src/main/webapp/tsconfig.json b/alarm-analysis/src/main/webapp/tsconfig.json
index 57db6567..f58e4af8 100644
--- a/alarm-analysis/src/main/webapp/tsconfig.json
+++ b/alarm-analysis/src/main/webapp/tsconfig.json
@@ -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.

- */

 {

   "compilerOptions": {

     "target": "es5",

diff --git a/alarm-analysis/src/main/webapp/typings.json b/alarm-analysis/src/main/webapp/typings.json
index 34d977ef..3df80303 100644
--- a/alarm-analysis/src/main/webapp/typings.json
+++ b/alarm-analysis/src/main/webapp/typings.json
@@ -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.

- */

 {

   "globalDependencies": {

     "bootstrap": "registry:dt/bootstrap#3.3.5+20160726204056",