From e63ff33e2b057f0a6b13e55dd45ac1053b12680b Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Mon, 30 Oct 2023 16:56:29 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=A6=96=E9=A1=B5=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/Logo.vue | 4 ++--
 src/views/login.vue                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 2774cc8..47e1f4b 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/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>
diff --git a/src/views/login.vue b/src/views/login.vue
index c99bb4a..66346fb 100644
--- a/src/views/login.vue
+++ b/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

From 55e952dcd872671772be1cd084f5558720e675e5 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 31 Oct 2023 14:00:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tcZz/netManage/gzdt/index.vue | 314 ++++++++++++------------
 src/views/tcZz/netManage/ytlc/index.vue |   2 -
 2 files changed, 157 insertions(+), 159 deletions(-)

diff --git a/src/views/tcZz/netManage/gzdt/index.vue b/src/views/tcZz/netManage/gzdt/index.vue
index a17a8f1..13d6c76 100644
--- a/src/views/tcZz/netManage/gzdt/index.vue
+++ b/src/views/tcZz/netManage/gzdt/index.vue
@@ -2,113 +2,113 @@
   <div class="container-main" ref="main">
   <div class="search-hearder" ref="topSearch">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-                  <!-- <el-form-item label="${comment}" prop="id">
-                    <el-input
-                        v-model="queryParams.id"
-                        placeholder="请输入${comment}"
-                        clearable
-                        size="small"
-                        @keyup.enter.native="handleQuery"
-                    />
-                  </el-form-item> -->
-                  <el-form-item label="区域" prop="areaId">
-                    <el-select v-model="queryParams.areaId" placeholder="请选择区域" clearable size="small">
-                      <el-option
-                          v-for="dict in dict.type.tc_area"
-                          :key="dict.value"
-                          :label="dict.label"
-                          :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="启用/禁用" prop="isStatus">
-                    <el-select v-model="queryParams.isStatus" placeholder="请选择启用/禁用" clearable size="small">
-                      <el-option
-                          v-for="dict in dict.type.tc_start"
-                          :key="dict.value"
-                          :label="dict.label"
-                          :value="dict.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                  <el-form-item label="标题" prop="title">
-                    <el-input
-                        v-model="queryParams.title"
-                        placeholder="请输入标题"
-                        clearable
-                        size="small"
-                        @keyup.enter.native="handleQuery"
-                    />
-                  </el-form-item>
-                  <el-form-item label="类型" prop="type">
-                    <el-input
-                        v-model="queryParams.type"
-                        placeholder="请输入类型"
-                        clearable
-                        size="small"
-                        @keyup.enter.native="handleQuery"
-                    />
-                  </el-form-item>
-                  <!-- <el-form-item label="文件名称" prop="fileName">
-                    <el-input
-                        v-model="queryParams.fileName"
-                        placeholder="请输入文件名称"
-                        clearable
-                        size="small"
-                        @keyup.enter.native="handleQuery"
-                    />
-                  </el-form-item>
-                  <el-form-item label="创建者" prop="createBy">
-                    <el-input
-                        v-model="queryParams.createBy"
-                        placeholder="请输入创建者"
-                        clearable
-                        size="small"
-                        @keyup.enter.native="handleQuery"
-                    />
-                  </el-form-item>
-                  <el-form-item label="创建时间">
-                    <el-date-picker
-                        v-model="daterangeCreateTime"
-                        size="small"
-                        style="width: 240px"
-                        value-format="yyyy-MM-dd"
-                        type="daterange"
-                        range-separator="-"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                    ></el-date-picker>
-                  </el-form-item>
-                  <el-form-item label="更新者" prop="updateBy">
-                    <el-input
-                        v-model="queryParams.updateBy"
-                        placeholder="请输入更新者"
-                        clearable
-                        size="small"
-                        @keyup.enter.native="handleQuery"
-                    />
-                  </el-form-item>
-                  <el-form-item label="更新时间">
-                    <el-date-picker
-                        v-model="daterangeUpdateTime"
-                        size="small"
-                        style="width: 240px"
-                        value-format="yyyy-MM-dd"
-                        type="daterange"
-                        range-separator="-"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期"
-                    ></el-date-picker>
-                  </el-form-item>
-                  <el-form-item label="备注" prop="remark">
-                    <el-input
-                        v-model="queryParams.remark"
-                        placeholder="请输入备注"
-                        clearable
-                        size="small"
-                        @keyup.enter.native="handleQuery"
-                    />
-                  </el-form-item> -->
+      <!-- <el-form-item label="${comment}" prop="id">
+        <el-input
+            v-model="queryParams.id"
+            placeholder="请输入${comment}"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="区域" prop="areaId">
+        <el-select v-model="queryParams.areaId" placeholder="请选择区域" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.tc_area"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="启用/禁用" prop="isStatus">
+        <el-select v-model="queryParams.isStatus" placeholder="请选择启用/禁用" clearable size="small">
+          <el-option
+            v-for="dict in dict.type.tc_start"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-input
+          v-model="queryParams.type"
+          placeholder="请输入类型"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="文件名称" prop="fileName">
+        <el-input
+          v-model="queryParams.fileName"
+          placeholder="请输入文件名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建者" prop="createBy">
+        <el-input
+          v-model="queryParams.createBy"
+          placeholder="请输入创建者"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="更新者" prop="updateBy">
+        <el-input
+          v-model="queryParams.updateBy"
+          placeholder="请输入更新者"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="更新时间">
+        <el-date-picker
+          v-model="daterangeUpdateTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          placeholder="请输入备注"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -124,19 +124,19 @@
         >新增</el-button
       >
       <el-button
-            type="success"
-            size="mini"
-            :disabled="single"
-            @click="handleUpdate"
-            v-hasPermi="['tcZz/netManage:gzdt:edit']"
-        >修改</el-button>
-         <el-button
-            type="danger"
-            size="mini"
-            :disabled="multiple"
-            @click="handleDelete"
-            v-hasPermi="['tcZz/netManage:gzdt:remove']"
-        >删除</el-button>
+        type="success"
+        size="mini"
+        :disabled="single"
+        @click="handleUpdate"
+        v-hasPermi="['tcZz/netManage:gzdt:edit']"
+      >修改</el-button>
+      <el-button
+        type="danger"
+        size="mini"
+        :disabled="multiple"
+        @click="handleDelete"
+        v-hasPermi="['tcZz/netManage:gzdt:remove']"
+      >删除</el-button>
       <el-button
         type="warning"
         size="mini"
@@ -172,61 +172,61 @@
     </div>
     <el-table v-loading="loading" :data="gzdtList"  @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-              <!-- <el-table-column label="序号" align="center" prop="id" /> -->
-              <el-table-column label="区域" align="center" prop="areaId">
-                <template slot-scope="scope">
-                  <dict-tag :options="dict.type.tc_area" :value="scope.row.areaId"/>
-                </template>
-              </el-table-column>
-              <el-table-column label="标题" align="center" prop="title" />
-              <el-table-column label="类型" align="center" prop="type" />
-              <!-- <el-table-column label="文件名称" align="center" prop="fileName" />
-              <el-table-column label="文件路径(完整路径)" align="center" prop="fileUrl" />
-              <el-table-column label="备注" align="center" prop="remark" /> -->
-              <el-table-column label="启用/禁用" align="center" prop="isStatus">
-                <template slot-scope="scope">
-                  <!-- <dict-tag :options="dict.type.tc_start" :value="scope.row.isStatus"/> -->
-                  <el-switch
-                    v-model="scope.row.isStatus"
-                    :active-value="2"
-                    :inactive-value="1"
-                    active-color="#ff4949"
-                    inactive-color="#13ce66"
-                    @change="handleStatusChange(scope.row)"
-                  ></el-switch>
-                </template>
-              </el-table-column>
+      <!-- <el-table-column label="序号" align="center" prop="id" /> -->
+      <el-table-column label="区域" align="center" prop="areaId">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.tc_area" :value="scope.row.areaId"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="标题" align="center" prop="title" />
+      <el-table-column label="类型" align="center" prop="type" />
+      <!-- <el-table-column label="文件名称" align="center" prop="fileName" />
+      <el-table-column label="文件路径(完整路径)" align="center" prop="fileUrl" />
+      <el-table-column label="备注" align="center" prop="remark" /> -->
+      <el-table-column label="启用/禁用" align="center" prop="isStatus">
+        <template slot-scope="scope">
+          <!-- <dict-tag :options="dict.type.tc_start" :value="scope.row.isStatus"/> -->
+          <el-switch
+            v-model="scope.row.isStatus"
+            :active-value="2"
+            :inactive-value="1"
+            active-color="#ff4949"
+            inactive-color="#13ce66"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center"  class-name="small-padding fixed-width" width="200"  fixed="right">
         <template slot-scope="scope">
           <el-button
-              size="mini"
-              @click="handleInfo(scope.row)"
-              v-hasPermi="['tcZz/netManage:gzdt:list']"
+            size="mini"
+            @click="handleInfo(scope.row)"
+            v-hasPermi="['tcZz/netManage:gzdt:list']"
           >
             查看
           </el-button>
           <el-button
             type="success"
             size="mini"
-              @click="handleUpdate(scope.row)"
-              v-hasPermi="['tcZz/netManage:gzdt:edit']"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['tcZz/netManage:gzdt:edit']"
           >修改</el-button>
           <el-button
-              size="mini"
+            size="mini"
             type="danger"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['tcZz/netManage:gzdt:remove']"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['tcZz/netManage:gzdt:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
     />
 
     <!-- 添加或修改工作动态对话框 -->
diff --git a/src/views/tcZz/netManage/ytlc/index.vue b/src/views/tcZz/netManage/ytlc/index.vue
index cdb7cce..bbe0eb3 100644
--- a/src/views/tcZz/netManage/ytlc/index.vue
+++ b/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 = "查看约谈流程详情"
         });

From 0a65b6e45ee77f8718dec35a2f80fcb64935783e Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Tue, 31 Oct 2023 14:54:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tcZz/networkEcology/fb/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/tcZz/networkEcology/fb/index.vue b/src/views/tcZz/networkEcology/fb/index.vue
index 47b1451..c0791f8 100644
--- a/src/views/tcZz/networkEcology/fb/index.vue
+++ b/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>