1

shanXiPlatform/src/layout/components/TagsView/index.vue

@@ -24,15 +24,15 @@
             <div id="right_buts" v-if="!this.$store.state.isnavigation">
                 <span class="rightButsSpan" style="color:#037D41;font-weight:500" v-if="this.$store.state.relation == 'house'">{{this.$store.state.houseName}}</span>
                 <div v-if="this.$store.state.istable" class="changeButtonLeft" @click="navigationChange">导航切换</div>
-                <el-popover  v-if="this.$store.state.istable" placement="bottom" width="600px" height="399px" v-model="visible">
-                    <el-row >
+                <el-popover v-if="this.$store.state.istable" placement="bottom" width="600px" height="399px" v-model="visible">
+                    <el-row>
                         <el-button type="success" v-if="ssko &&  (homeType == 1 ||  isshow == true)" plain @click="gocitysheng">去省图</el-button>
                         <el-button type="success" v-if="sskt && (homeType == 1 ||  isshow == true)" plain @click="gocityshi" style="margin-bottom:20px;">去市图</el-button>
                     </el-row>
 
                     <div v-show="clickchange && (homeType == 1 ||  isshow == true)" style="width:600px;height:337px;" id="myChartdt" class="myChartdtb" v-on:mousemove="dataDetails($event)">
                     </div>
-                    <div style="position:relative;"  width="600px" height="337px">
+                    <div style="position:relative;" width="600px" height="337px">
                         <img src="./map.jpg" v-show="!clickchange" alt="" width="600px" height="337px" usemap="#Map" @click="visible = false">
                         <map name="Map" @click="visible = false" v-show="!clickchange">
                             <span v-for="item in bodyContentMiddleMapData" :key="item.depotCode">
@@ -57,7 +57,11 @@ import Breadcrumb from "@/components/Breadcrumb"
 import { getpointll } from "@/api/branchoff/index.js"
 // import path from "path"
 import { getUser } from "@/utils/auth"
-import { getWeather, getRightUserMappictureData , getRightUserMappictureDataType } from "@/api/home"
+import {
+    getWeather,
+    getRightUserMappictureData,
+    getRightUserMappictureDataType
+} from "@/api/home"
 export default {
     components: { Breadcrumb },
     data() {
@@ -89,7 +93,7 @@ export default {
             visible: false,
             homeType: "",
             depotId: "",
-            isshow: false 
+            isshow: false
         }
     },
 
@@ -140,17 +144,18 @@ export default {
         this.homeType = JSON.parse(getUser()).homeType
         this.depotId = this.$store.state.depotId
 
-
-        if(JSON.parse(getUser()).homeType == 2){
-        let cfIds = ''
-        let depotId = this.$store.state.depotId
-        let homeType = JSON.parse(getUser()).homeType
-        getRightUserMappictureDataType(cfIds,depotId,homeType,'1').then(res => {
-            if( res.data[0].children.length > 0 ){
-              this.isshow = true
-            }
-        })
-      }
+        if (JSON.parse(getUser()).homeType == 2) {
+            let cfIds = ""
+            let depotId = this.$store.state.depotId
+            let homeType = JSON.parse(getUser()).homeType
+            getRightUserMappictureDataType(cfIds, depotId, homeType, "1").then(
+                res => {
+                    if (res.data[0].children.length > 0) {
+                        this.isshow = true
+                    }
+                }
+            )
+        }
     },
     mounted() {
         this.$nextTick(() => {
@@ -180,7 +185,9 @@ export default {
             this.administrativeDivision = this.$store.state.areacodes
             this.ssko = true
             this.sskt = false
-            this.drawtdt()
+            this.$nextTick(() => {
+                this.drawtdt()
+            })
         },
         drawtdt() {
             getpointll(this.homeType, this.depotId).then(res => {
@@ -237,7 +244,7 @@ export default {
                                     type: "changeareacode",
                                     areacodes: cityId
                                 })
-                                 
+
                                 if (this.ssko == false && this.sskt == false) {
                                     this.ssko = true
                                     this.sskt = false
@@ -256,14 +263,14 @@ export default {
                                     this.ssko == true &&
                                     this.sskt == false
                                 ) {
-                                     this.$store.commit({
-                                    type: "changeDepotId",
-                                    depotId: params.data[4]
-                                })
-                                this.$store.commit({
-                                    type: "changeDepotName",
-                                    depotName: params.data[2]
-                                })
+                                    this.$store.commit({
+                                        type: "changeDepotId",
+                                        depotId: params.data[4]
+                                    })
+                                    this.$store.commit({
+                                        type: "changeDepotName",
+                                        depotName: params.data[2]
+                                    })
                                     this.clickchange = false
                                     this.ssko = false
                                     this.sskt = true

shanXiPlatform/src/views/systemManagement/policySystem/index.vue

@@ -32,7 +32,8 @@
             <el-table-column prop="title" label="标题" align="center" />
             <el-table-column prop="publishTime" label="发布时间" align="center">
               <template slot-scope="scope">
-                <span>{{scope.row.publishTime}}</span>
+                <span v-if="scope.row.publishTime">{{scope.row.publishTime.slice(0,16)}}</span>
+                <span v-if="!scope.row.publishTime">{{scope.row.publishTime}}</span>
               </template>
             </el-table-column>
             <el-table-column prop="publishUserName" label="发布人" align="center" />