Merge branch 'master' of http://47.101.207.123:3000/sharedExchange/gxjh-ywtb

src/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <Header/>
+<!--    <Header/>-->
     <div class="content">
       <router-view></router-view>
     </div>
@@ -9,11 +9,11 @@
 
 <script>
 import {mapEvaluateState} from "@/units/map-units";
-import Header from "@/components/header/Header";
+// import Header from "@/components/header/Header";
 export default {
   name: 'App',
   components: {
-    Header
+
   },
   computed:{
     ...mapEvaluateState({

src/assets/styles/global.scss

@@ -195,6 +195,16 @@
 .el-select-dropdown {
   background-color: #03172d;
 }
+.el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
+  color: #409EFF;
+  background-color: #0e6b9e;
+}
+.el-select-dropdown.is-multiple .el-select-dropdown__item.selected.hover {
+  background-color: #0e6b9e;
+}
+.el-select__input{
+  color: #fff;
+}
 .el-select-dropdown__item.selected {
   color: #409EFF;
   font-weight: 700;

src/components/analysis-average-time/AnalysisAverageTime.vue

@@ -88,7 +88,7 @@ export default {
           echarts.init(ele).on('click',(params)=> {
             console.log(params.seriesName)
 
-            this.$router.push('/handleSituation');
+            this.$router.push('/origion/handleSituation');
             this.handleSituationRefresh(false);
             this.$nextTick(() => {
               let index = this.getHandleSituationCode(params.seriesName);
@@ -148,7 +148,7 @@ export default {
           echarts.init(ele).on('click',(params)=> {
             console.log(params.seriesName)
 
-            this.$router.push('/handleSituation');
+            this.$router.push('/origion/handleSituation');
             this.handleSituationRefresh(false);
             this.$nextTick(() => {
               let index = this.getHandleSituationCode(params.seriesName);
@@ -200,7 +200,7 @@ export default {
           echarts.init(ele).on('click',(params)=> {
             console.log(params.seriesName)
 
-            this.$router.push('/handleSituation');
+            this.$router.push('/origion/handleSituation');
             this.handleSituationRefresh(false);
             this.$nextTick(() => {
               let index = this.getHandleSituationCode(params.seriesName);

src/components/analysis-handle-situation/AnalysisHandleSituation.vue

@@ -135,7 +135,7 @@ export default {
   },
   methods:{
     chooseSingleSituation(code,status,type){
-      this.$router.push('/handleSituation');
+      this.$router.push('/origion/handleSituation');
       this.handleSituationRefresh(false);
       this.$nextTick(() => {
         this.handleSituationSingleChange([
@@ -163,7 +163,7 @@ export default {
       })
     },
     chooseSingleMatter(code,status,type){
-      this.$router.push('/handleSituation');
+      this.$router.push('/origion/handleSituation');
       this.handleSituationRefresh(false);
       this.$nextTick(() => {
         this.handleSituationSingleChange([

src/components/analysis-total-handle/AnalysisTotalHandle.vue

@@ -108,7 +108,7 @@ export default {
           setAnalysisTotalHandle(ele,this.dataX,this.dataY_COUNT,this.dataY_MONTH,this.dataY_YEAR)
           echarts.init(ele).on('click',(params)=> {
             console.log(params.dataIndex)
-            this.$router.push('/handleSituation');
+            this.$router.push('/origion/handleSituation');
             this.analysisRefresh(true);
           })
         })
@@ -168,7 +168,7 @@ export default {
           setAnalysisTotalHandle(ele,this.dataX,this.dataY_COUNT,this.dataY_MONTH,this.dataY_YEAR)
           echarts.init(ele).on('click',(params)=> {
             console.log(params.dataIndex)
-            this.$router.push('/handleSituation');
+            this.$router.push('/origion/handleSituation');
             this.analysisRefresh(true);
           })
         })
@@ -221,7 +221,7 @@ export default {
           setAnalysisTotalHandle(ele,this.dataX,this.dataY_COUNT,this.dataY_MONTH,this.dataY_YEAR)
           echarts.init(ele).on('click',(params)=> {
             console.log(params.dataIndex)
-            this.$router.push('/handleSituation');
+            this.$router.push('/origion/handleSituation');
             this.analysisRefresh(true);
           })
         })

src/components/analysis-total-notice/AnalysisTotalNotice.vue

@@ -93,7 +93,7 @@ export default {
           echarts.init(ele).on('click',(params)=> {
             console.log(params.seriesName)
 
-            this.$router.push('/handleSituation');
+            this.$router.push('/origion/handleSituation');
             this.handleSituationRefresh(false);
             this.$nextTick(() => {
              let index = this.getHandleSituationCode(params.seriesName);

src/components/data-sta/DataSta.vue

@@ -143,7 +143,7 @@ export default {
   methods:{
     showBasicAnalysis(item){
       if(item.code=="AVG_TIME"||item.code=="MAX_TIME"){
-        this.$router.push('/handleSituation');
+        this.$router.push('/origion/handleSituation');
         this.handleSituationRefresh(false);
         this.$nextTick(() => {
           this.handleSituationSingleChange([
@@ -154,7 +154,7 @@ export default {
           ])
         })
       }else{
-        this.$router.push('/handleAnalysis');
+        this.$router.push('/origion/handleAnalysis');
         this.analysisRefresh(false);
         this.$nextTick(() => {
           this.analysisSingleChange([
@@ -175,7 +175,7 @@ export default {
       }
     },
     showHandleSituation(index){
-        this.$router.push('/handleSituation');
+        this.$router.push('/origion/handleSituation');
         this.handleSituationRefresh(false);
         this.$nextTick(() => {
           //this.handleSituationThirdLevel(index);

src/components/evaluate/EvaluateCard.vue

@@ -71,22 +71,22 @@ export default {
   methods:{
     showCommit(code){
       if(code=='ALL_YZ_NUM'){
-        this.$router.push('/electricCard');
+        this.$router.push('/origion/electricCard');
         this.$nextTick(() => {
           this.eletricCardCurrentId('4')
         })
       }else if(code=='ALL_ZZ_NUM'){
-        this.$router.push('/electricCard');
+        this.$router.push('/origion/electricCard');
         this.$nextTick(() => {
           this.eletricCardCurrentId('5')
         })
       }else if(code=='SEVEN_ZZ_NUM'){
-        this.$router.push('/electricCard');
+        this.$router.push('/origion/electricCard');
         this.$nextTick(() => {
           this.eletricCardCurrentId('1')
         })
       }else{
-        this.$router.push('/electricCard');
+        this.$router.push('/origion/electricCard');
         this.$nextTick(() => {
           this.eletricCardCurrentId('2')
         })

src/components/event-sta/EventSta.vue

@@ -169,7 +169,7 @@ export default {
   },
   methods:{
     showMatterGuidance(code,type){
-      this.$router.push('/mattersGuidance/mainBody');
+      this.$router.push('/origion/mattersGuidance/mainBody');
       this.matterGuidanceRefresh(false);
       this.$nextTick(()=>{
         this.matterGuidanceSingleChange([

src/components/handle-static/HandleStatic.vue

@@ -50,7 +50,7 @@ export default {
       setHandleStaticOption(ele,this.HandleStaticDataX.reverse(),this.HandleStaticDataXTotal.reverse(),this.HandleStaticDataY.reverse())
       echarts.init(ele).on('click',(params)=> {
         console.log( this.HandleStaticCode[params.dataIndex])
-        this.$router.push('/handleAnalysis');
+        this.$router.push('/origion/handleAnalysis');
         this.analysisRefresh(false);
         this.$nextTick(() => {
           this.analysisSingleChange([

src/components/handle-status/HandleStatus.vue

@@ -91,7 +91,7 @@ export default {
   methods:{
     showBasicAnalysis(index){
       console.log(index);
-      this.$router.push('/handleSituation');
+      this.$router.push('/origion/handleSituation');
       this.handleSituationRefresh(false);
       this.$nextTick(() => {
         this.handleSituationSingleChange([

src/components/header/Header.vue

@@ -6,7 +6,7 @@
         </span>
   </div>
   <div  class="header_mid">
-    <div class="center_title" @click="clickFn('/home')">
+    <div class="center_title" @click="clickFn('/origion/home')">
       市住建委“一网通办”管理门户
     </div>
   </div>
@@ -31,42 +31,42 @@ export default {
         {
           id:'1',
           name:'事项和指南',
-          component:'/mattersGuidance/mainBody',
+          component:'/origion/mattersGuidance/mainBody',
           chosen:false,
             role_button_code:'353'
         },
         {
           id:'2',
           name:'办件情况',
-          component:'/handleSituation',
+          component:'/origion/handleSituation',
           chosen:false,
             role_button_code:'354'
         },
         {
           id:'3',
           name:'办件分析',
-          component:'/handleAnalysis',
+          component:'/origion/handleAnalysis',
           chosen:false,
             role_button_code:'355'
         },
         {
           id:'4',
           name:'好差评',
-          component:'/evaluate',
+          component:'/origion/evaluate',
           chosen:false,
             role_button_code:'356'
         },
         {
           id:'5',
           name:'电子证照',
-          component:'/electricCard',
+          component:'/origion/electricCard',
           chosen:false,
             role_button_code:'357'
         },
         {
           id:'6',
           name:'驾驶舱',
-          component:'/controlCabin',
+          component:'/origion/controlCabin',
           chosen:false,
             role_button_code:'358'
         },

src/components/month-sta/MonthSta.vue

@@ -73,7 +73,7 @@ export default {
       echarts.init(ele).on('click',(params)=> {
         //console.log( this.HandleStaticCode[params.dataIndex])
         console.log(params.seriesName)
-        this.$router.push('/handleAnalysis');
+        this.$router.push('/origion/handleAnalysis');
         this.analysisRefresh(false);
         this.$nextTick(() => {
           this.analysisSingleChange([

src/components/remind-handle-sta/RemindHandleS.vue

@@ -80,15 +80,15 @@ export default {
   methods:{
     showCommit(code){
       if(code=='REPLY'){
-        this.$router.push('/evaluate');
+        this.$router.push('/origion/evaluate');
         this.evaluateCurrentId('repeat')
         this.evaluateRepeatId('0,1,2,3,4')
       }else if(code=='NO_REPLY'){
-        this.$router.push('/evaluate');
+        this.$router.push('/origion/evaluate');
         this.evaluateCurrentId('repeat')
         this.evaluateRepeatId('0')
       }else{
-        this.$router.push('/evaluate');
+        this.$router.push('/origion/evaluate');
         this.evaluateCurrentId('situation')
 
       }

src/components/total-handle/TotalHandle.vue

@@ -329,7 +329,7 @@ export default {
       this.updateToParent();
     },
     showTypeAnalysis(index){
-      this.$router.push('/handleAnalysis');
+      this.$router.push('/origion/handleAnalysis');
       this.analysisRefresh(false);
       this.$nextTick(() => {
         //this.analysisTimer('365');

src/components/unit-event-center/UnitEventCenter.vue

@@ -61,7 +61,7 @@ export default {
       setUnitEventOption(ele,this.UnitEventCenterX,this.UnitEventCenterXTotal,this.UnitEventCenterY)
       echarts.init(ele).on('click',(params)=> {
         console.log( this.UnitEventCode[params.dataIndex])
-        this.$router.push('/handleAnalysis');
+        this.$router.push('/origion/handleAnalysis');
         this.analysisRefresh(false);
         this.$nextTick(() => {
 

src/routers.js

@@ -8,6 +8,7 @@ import HandleSituation from "@/views/handle_situation/HandleSituation";
 import HandleAnalysis from "@/views/handle_analysis/HandleAnalysis";
 import Evaluate from "@/views/evaluate/Evaluate";
 import ElectricCard from "@/views/electricCard/ElectricCard";
+import Origion from "@/views/Origion";
 
 const routers = [
     {
@@ -17,54 +18,108 @@ const routers = [
     },
     {
       path:'/',
-      redirect:'/home'
+      redirect:'/origion/home'
     },
     {
-        path:'/home',
-        name:'home',
-        component:Home
-    },
-    {
-        path:'/controlCabin',
-        name:'controlCabin',
-        component:ControlCabin
-    },
-    {
-        path:'/handleAnalysis',
-        name:'HandleAnalysis',
-        component:HandleAnalysis
-    },
-    {
-        path:'/electricCard',
-        name:'electricCard',
-        component:ElectricCard
-    },
-    {
-        path:'/mattersGuidance',
-        name:'mattersGuidance',
-        component:MattersGuidance,
+        path:'/origion',
+        name:'origion',
+        component:Origion,
         children:[
             {
-                name:'mainBody',
-                component:MainBody,
-                path:'mainBody'
+                name:'home',
+                component:Home,
+                path:'home'
+            },
+            {
+                name:'controlCabin',
+                component:ControlCabin,
+                path:'controlCabin'
+            },
+            {
+                name:'handleAnalysis',
+                component:HandleAnalysis,
+                path:'handleAnalysis'
+            },
+            {
+                name:'electricCard',
+                component:ElectricCard,
+                path:'electricCard'
             },
             {
-                name:'detailInfo',
-                component:DetailInfo,
-                path:'detailInfo'
+                name:'mattersGuidance',
+                component:MattersGuidance,
+                path:'mattersGuidance',
+                children:[
+                    {
+                        name:'mainBody',
+                        component:MainBody,
+                        path:'mainBody'
+                    },
+                    {
+                        name:'detailInfo',
+                        component:DetailInfo,
+                        path:'detailInfo'
+                    },
+                ]
+            },
+            {
+                name:'handleSituation',
+                component:HandleSituation,
+                path:'handleSituation'
+            },
+            {
+                name:'evaluate',
+                component:Evaluate,
+                path:'evaluate'
             },
         ]
     },
-    {
-        path:'/handleSituation',
-        name:'handleSituation',
-        component:HandleSituation
-    },
-    {
-        path:'/evaluate',
-        name:'evaluate',
-        component:Evaluate
-    },
+    // {
+    //     path:'/home',
+    //     name:'home',
+    //     component:Home
+    // },
+    // {
+    //     path:'/controlCabin',
+    //     name:'controlCabin',
+    //     component:ControlCabin
+    // },
+    // {
+    //     path:'/handleAnalysis',
+    //     name:'HandleAnalysis',
+    //     component:HandleAnalysis
+    // },
+    // {
+    //     path:'/electricCard',
+    //     name:'electricCard',
+    //     component:ElectricCard
+    // },
+    // {
+    //     path:'/mattersGuidance',
+    //     name:'mattersGuidance',
+    //     component:MattersGuidance,
+    //     children:[
+    //         {
+    //             name:'mainBody',
+    //             component:MainBody,
+    //             path:'mainBody'
+    //         },
+    //         {
+    //             name:'detailInfo',
+    //             component:DetailInfo,
+    //             path:'detailInfo'
+    //         },
+    //     ]
+    // },
+    // {
+    //     path:'/handleSituation',
+    //     name:'handleSituation',
+    //     component:HandleSituation
+    // },
+    // {
+    //     path:'/evaluate',
+    //     name:'evaluate',
+    //     component:Evaluate
+    // },
 ]
 export default routers

src/views/Origion.vue

@@ -0,0 +1,20 @@
+<template>
+  <div class="h100">
+    <Header/>
+    <router-view/>
+  </div>
+</template>
+
+<script>
+import Header from "@/components/header/Header";
+export default {
+  name: "Origion",
+  components:{
+    Header,
+  }
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>

src/views/matters_guidance/mian_body/MainBody.vue

@@ -1178,30 +1178,28 @@ export default {
           MessageBox.alert('请选择一条数据进行操作', '提示', {
             confirmButtonText: '确定'
           });
-
-        } else {
+        }else{
           this.$router.push({
             name: 'detailInfo',
-            query:{
-              name:selection[0].NAME,
-              detailType:detailType,
-              detailData:JSON.stringify(selection[0])
+            query: {
+              base_code:selection[0].BASE_CODE,
+              name: selection[0].NAME,
+              detailType: detailType,
+              detailData: JSON.stringify(selection[0])
             }
           });
-          // localStorage.setItem("searchParams", this.form.name);
-          // localStorage.setItem("detailType", detailType);
-          // localStorage.setItem("detailData", JSON.stringify(selection[0]));
-
         }
-
-      } else if (detailType === 'add') {
-        this.$router.push({
-          name: 'detailInfo',
-        });
-        localStorage.setItem("searchParams", this.form.name);
-        localStorage.setItem("detailType", detailType);
-        localStorage.setItem("detailData", '');
-      } else if (detailType === 'delete') {
+      }else if(detailType === 'add'){
+            this.$router.push({
+              name: 'detailInfo',
+              query:{
+                base_code:'',
+                name:'新增',
+                detailType:detailType,
+                detailData:''
+              }
+            });
+        }else if (detailType === 'delete') {
         let selection = this.$refs.Table.selection;
         if (selection.length != 1) {
           MessageBox.alert('请选择一条数据进行操作', '提示', {