Merge branch 'lvtianfang' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/tcZz-pc

src/layout/components/Sidebar/Logo.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
     <transition name="sidebarLogoFade">
-      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
+      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/tcZz/networkSecurity/sjly/DataSourceTj">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
         <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
-      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
+      <router-link v-else key="expand" class="sidebar-logo-link" to="/tcZz/networkSecurity/sjly/DataSourceTj">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
         <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>

src/views/login.vue

@@ -98,7 +98,7 @@ export default {
   watch: {
     $route: {
       handler: function(route) {
-        this.redirect = 'tcZz/networkSecurity/sjly/DataSourceTj';
+        this.redirect = '/tcZz/networkSecurity/sjly/DataSourceTj';
         // this.redirect = route.query && route.query.redirect;
       },
       immediate: true

src/views/tcZz/netManage/ytlc/index.vue

@@ -325,7 +325,6 @@
         this.files = [];
         const id = row.id || this.ids
         getYtlc(id).then(response => {
-          console.log(response,'response')
           this.form = response.data;
           let arr1 = this.form.fileName.split(',');
           let arr2 = this.form.fileUrl.split(',');
@@ -339,7 +338,6 @@
           } else {
             this.files = [];
           }
-          console.log(this.files,'this.files')
           this.infoOpen = true;
           this.infoTitle = "查看约谈流程详情"
         });

src/views/tcZz/networkEcology/fb/index.vue

@@ -310,7 +310,7 @@
         }}</el-descriptions-item>
 
         <el-descriptions-item label="发布时间">{{
-          form.dateTime
+          parseTime(form.dateTime,'{y}-{m}-{d}')
         }}</el-descriptions-item>
 
         <el-descriptions-item label="网址">{{ form.url }}</el-descriptions-item>