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

src/assets/styles/variables.scss

@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
 $base-sub-menu-hover:#001528;
 */
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 220px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass

src/views/login.vue

@@ -73,7 +73,7 @@ export default {
       codeUrl: "",
       loginForm: {
         username: "admin",
-        password: "admin123",
+        password: "Taicang@2023",
         rememberMe: false,
         code: "",
         uuid: ""

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

@@ -319,9 +319,9 @@
 
         <el-descriptions-item label="类型">{{ form.type }}</el-descriptions-item>
 
-                      <el-descriptions-item label="文件名称">{{ form.fileName }}</el-descriptions-item>
+        <el-descriptions-item label="文件"><a v-for="(item,index) in files" :key="index" :href="item.url" target="blank">{{ item.name }}</a></el-descriptions-item>
 
-                      <el-descriptions-item label="文件路径(完整路径)">{{ form.fileUrl }}</el-descriptions-item>
+        <!-- <el-descriptions-item label="文件路径(完整路径)">{{ form.fileUrl }}</el-descriptions-item> -->
 
         <el-descriptions-item label="备注">{{ form.remark }}</el-descriptions-item>
 
@@ -429,6 +429,7 @@
         },
         // fileNameS:[],
         fileList:[],
+        files:[],
       };
     },
     created() {
@@ -540,9 +541,22 @@
       /**查看按钮操作 */
       handleInfo(row){
         this.reset();
+        this.files = [];
         const id = row.id || this.ids
         getGzdt(id).then(response => {
           this.form = response.data;
+          let arr1 = this.form.fileName.split(',');
+          let arr2 = this.form.fileUrl.split(',');
+          if(arr1[0] !== '' && arr1.length > 1 && arr2.length > 1) {
+            arr1.forEach((item,index)=>{
+              let obj = {};
+              obj.name = item;
+              obj.url = arr2[index];
+              this.files.push(obj);
+            })
+          } else {
+            this.files = [];
+          }
           this.infoOpen = true;
           this.infoTitle = "查看工作动态详情"
         });
@@ -723,6 +737,10 @@
         }
       }
     }
+    a {
+      color: #0072c6;
+      margin: 0 5px;
+    }
   }
 } 
 </style>

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

@@ -289,7 +289,7 @@
 
         <el-descriptions-item label="内容"><div v-html='form.content'></div></el-descriptions-item>
 
-                      <el-descriptions-item label="图片路径(完整路径)">{{ form.imageUrl }}</el-descriptions-item>
+        <el-descriptions-item label="图片路径(完整路径)"><a v-for="(url,index) in images" :key="index" :href="url" target="blank">查看图片</a></el-descriptions-item>
 
         <el-descriptions-item label="备注">{{ form.remark }}</el-descriptions-item>
 
@@ -391,6 +391,7 @@
           ],
         },
         fileList:[],
+        images:[],
       };
     },
     created() {
@@ -501,9 +502,11 @@
       /**查看按钮操作 */
       handleInfo(row){
         this.reset();
+        this.images = [];
         const id = row.id || this.ids
         getQlzxxddt(id).then(response => {
           this.form = response.data;
+          this.images = this.form.imageUrl.split(',');
           this.infoOpen = true;
           this.infoTitle = "查看清朗专项行动动态详情"
         });
@@ -669,6 +672,10 @@
         }
       }
     }
+    a {
+      color: #0072c6;
+      margin: 0 5px;
+    }
   }
 } 
 </style>

src/views/tcZz/networkSecurity/cybersecurity/index.vue

@@ -114,7 +114,7 @@
 
       <el-table-column label="攻击源IP" align="center" prop="attackyIp" />
       <el-table-column label="攻击类型" align="center" prop="attackType" />
-      <el-table-column label="受攻击IP" align="center" prop="sAttackIp" />
+      <el-table-column label="受攻击IP" align="center" prop="sattackIp" />
       <el-table-column label="网站安全等级" align="center" prop="netLevel" />
       <el-table-column label="联系人" align="center" prop="linkMan" />
       <el-table-column label="启用/禁用" align="center" prop="isStatus">
@@ -226,12 +226,12 @@
             placeholder="请输入攻击源IP区域"
           />
         </el-form-item>
-        <el-form-item label="受攻击IP" prop="sAttackIp">
-          <el-input v-model="form.sAttackIp" placeholder="请输入受攻击IP" />
+        <el-form-item label="受攻击IP" prop="sattackIp">
+          <el-input v-model="form.sattackIp" placeholder="请输入受攻击IP" />
         </el-form-item>
-        <el-form-item label="受攻击IP区域" prop="sAttackIpArea">
+        <el-form-item label="受攻击IP区域" prop="sattackIpArea">
           <el-input
-            v-model="form.sAttackIpArea"
+            v-model="form.sattackIpArea"
             placeholder="请输入受攻击IP区域"
           />
         </el-form-item>
@@ -305,11 +305,11 @@
         }}</el-descriptions-item>
 
         <el-descriptions-item label="受攻击IP">{{
-          form.sAttackIp
+          form.sattackIp
         }}</el-descriptions-item>
 
         <el-descriptions-item label="受攻击IP区域">{{
-          form.sAttackIpArea
+          form.sattackIpArea
         }}</el-descriptions-item>
 
         <el-descriptions-item label="网站安全等级">{{
@@ -447,9 +447,9 @@ export default {
 
         type: null,
 
-        sAttackIp: null,
+        sattackIp: null,
 
-        sAttackIpArea: null,
+        sattackIpArea: null,
 
         netLevel: null,
 
@@ -622,9 +622,9 @@ export default {
 
         type: null,
 
-        sAttackIp: null,
+        sattackIp: null,
 
-        sAttackIpArea: null,
+        sattackIpArea: null,
 
         netLevel: null,
 

src/views/tcZz/networkSecurity/tbwc/index.vue

@@ -31,8 +31,9 @@
             clearable
             size="small"
             v-model="queryParams.year"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="year"
+            format="yyyy"
+            value-format="yyyy"
             placeholder="选择年份"
           >
           </el-date-picker>
@@ -178,8 +179,9 @@
             clearable
             size="small"
             v-model="form.year"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="year"
+            format="yyyy"
+            value-format="yyyy"
             placeholder="选择年份"
           >
           </el-date-picker>

vue.config.js

@@ -56,9 +56,9 @@ module.exports = {
         sassOptions: { outputStyle: "expanded" },
       },
       // px to rem
-      postcss: {
-        plugins: [postcss],
-      },
+      // postcss: {
+      //   plugins: [postcss],
+      // },
     },
   },
   configureWebpack: {