Merge branch 'dev' of ssh://git.omniview.pro:256/fangdi/housemanage/web/majorproject into dev

Jenkinsfile-pudong

+pipeline {
+  agent {
+    node {
+      label 'nodejs'
+    }
+  }
+
+    environment {
+        KUBECONFIG_CREDENTIAL_ID = 'devops-kubeconfig'
+        REGISTRY = '10.0.6.228:5000'
+        DOCKERHUB_NAMESPACE = 'house-manage-pd'
+        APP_NAME = 'web-main'
+        NAMESPACE = 'house-manage-pd'
+    }
+
+    stages {
+        stage ('checkout scm') {
+            steps {
+                checkout(scm)
+            }
+        }
+
+        stage ('build & push') {
+            steps {
+                container ('nodejs') {
+                    sh 'docker build -f Dockerfile --build-arg project=pudong-sit -t $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$BUILD_NUMBER .'
+                    sh 'docker push  $REGISTRY/$DOCKERHUB_NAMESPACE/$APP_NAME:$BUILD_NUMBER'
+                }
+            }
+        }
+
+        stage('deploy') {
+          steps {
+            kubernetesDeploy(configs: 'deploy/**', enableConfigSubstitution: true, kubeconfigId: "$KUBECONFIG_CREDENTIAL_ID")
+          }
+        }
+    }
+}

src/router/pudongRoutes.json

@@ -38,15 +38,15 @@
     },
     {
       "path": "/pudong/complaintPath", "name": "complaintPath",
-      "meta": { "title": "投诉直通车", "menuPath": true, "menuIcon": "profile", "hideInBread": true },
+      "meta": { "title": "投诉信息", "menuPath": true, "menuIcon": "profile", "hideInBread": true },
       "children": [
         {
           "path": "/pudong/complaintPath/complaintList", "name": "complaintList",
           "meta": { "title": "投诉列表", "menuPath": true, "menuIcon": "profile", "hideInBread": false }
         },
         {
-          "path": "/pudong/complaintPath/repeatComplaintList", "name": "repeatComplaintList",
-          "meta": { "title": "重复投诉列表", "menuPath": true, "menuIcon": "profile", "hideInBread": false }
+          "path": "/pudong/complaintPath/complaint12345TEL", "name": "complaint12345TEL", 
+          "meta": { "title": "12345热线列表", "menuPath": true, "menuIcon": "profile", "hideInBread": false }
         }
       ]
     },