From 5aa4bf85a42a80b04071013cb18ba70d09cc4e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Wed, 22 Nov 2023 14:09:32 +0800
Subject: [PATCH] +1

---
 src/App.vue                              |   1 +
 src/assets/styles/general.scss           |  11 ++
 src/views/netEwm/netHistory/index.vue    | 147 +++++++++++++------
 src/views/netEwm/posterHistory/index.vue | 177 +++++++++++++++--------
 4 files changed, 232 insertions(+), 104 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index bf3387e..6602508 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,6 +14,7 @@ export default {
     //获取当前屏幕可视区域宽度与高度
     var screenWidth = window.innerWidth;
     var screenHeight = window.innerHeight;
+    console.log(screenWidth, screenHeight);
     // 初始化(适配)
     autofit.init(
       {
diff --git a/src/assets/styles/general.scss b/src/assets/styles/general.scss
index a83477c..0e40e6e 100644
--- a/src/assets/styles/general.scss
+++ b/src/assets/styles/general.scss
@@ -1,3 +1,4 @@
+@import "./element-variables.scss";
 .fixed-header {
   padding-right: 0 !important;
 }
@@ -8,3 +9,13 @@
 .el-dialog {
   border-radius: 0 !important;
 }
+.el-dialog__header {
+  background-color: $--color-primary;
+  .el-dialog__title,
+  .el-dialog__close {
+    color: #fff;
+  }
+  .el-dialog__headerbtn:hover .el-dialog__close {
+    color: blue !important;
+  }
+}
diff --git a/src/views/netEwm/netHistory/index.vue b/src/views/netEwm/netHistory/index.vue
index 67fd4f8..2018643 100644
--- a/src/views/netEwm/netHistory/index.vue
+++ b/src/views/netEwm/netHistory/index.vue
@@ -1,8 +1,19 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="是否连接成功" prop="isTrue">
-        <el-select v-model="queryParams.isTrue" placeholder="请选择是否连接成功" clearable>
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="是否连接成功" prop="isTrue" label-width="100px">
+        <el-select
+          v-model="queryParams.isTrue"
+          placeholder="请选择是否连接成功"
+          clearable
+        >
           <el-option
             v-for="dict in dict.type.sys_yes_no"
             :key="dict.value"
@@ -20,8 +31,16 @@
         />
       </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>
+        <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
+        >
       </el-form-item>
     </el-form>
 
@@ -34,7 +53,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['netEwm:netHistory:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -45,7 +65,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['netEwm:netHistory:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -56,7 +77,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['netEwm:netHistory:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -66,24 +88,35 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['netEwm:netHistory:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="netHistoryList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="netHistoryList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
       <el-table-column label="是否连接成功" align="center" prop="isTrue">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isTrue"/>
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isTrue" />
         </template>
       </el-table-column>
       <el-table-column label="网络id" align="center" prop="netId" />
       <el-table-column label="网络名称" align="center" prop="netName" />
       <el-table-column label="wifi名称" align="center" prop="wifiName" />
       <el-table-column label="wifi密码" align="center" prop="wifiPass" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -91,20 +124,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['netEwm:netHistory:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['netEwm:netHistory:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -113,7 +148,7 @@
 
     <!-- 添加或修改连网历史对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="是否连接成功" prop="isTrue">
           <el-select v-model="form.isTrue" placeholder="请选择是否连接成功">
             <el-option
@@ -146,11 +181,17 @@
 </template>
 
 <script>
-import { listNetHistory, getNetHistory, delNetHistory, addNetHistory, updateNetHistory } from "@/api/netEwm/netHistory";
+import {
+  listNetHistory,
+  getNetHistory,
+  delNetHistory,
+  addNetHistory,
+  updateNetHistory,
+} from "@/api/netEwm/netHistory";
 
 export default {
   name: "NetHistory",
-  dicts: ['sys_yes_no'],
+  dicts: ["sys_yes_no"],
   data() {
     return {
       // 遮罩层
@@ -183,18 +224,22 @@ export default {
       // 表单校验
       rules: {
         isTrue: [
-          { required: true, message: "是否连接成功不能为空", trigger: "change" }
+          {
+            required: true,
+            message: "是否连接成功不能为空",
+            trigger: "change",
+          },
         ],
         netName: [
-          { required: true, message: "网络名称不能为空", trigger: "blur" }
+          { required: true, message: "网络名称不能为空", trigger: "blur" },
         ],
         wifiName: [
-          { required: true, message: "wifi名称不能为空", trigger: "blur" }
+          { required: true, message: "wifi名称不能为空", trigger: "blur" },
         ],
         wifiPass: [
-          { required: true, message: "wifi密码不能为空", trigger: "blur" }
+          { required: true, message: "wifi密码不能为空", trigger: "blur" },
         ],
-      }
+      },
     };
   },
   created() {
@@ -204,7 +249,7 @@ export default {
     /** 查询连网历史列表 */
     getList() {
       this.loading = true;
-      listNetHistory(this.queryParams).then(response => {
+      listNetHistory(this.queryParams).then((response) => {
         this.netHistoryList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -228,7 +273,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        remark: null
+        remark: null,
       };
       this.resetForm("form");
     },
@@ -244,9 +289,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -257,8 +302,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getNetHistory(id).then(response => {
+      const id = row.id || this.ids;
+      getNetHistory(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改连网历史";
@@ -266,16 +311,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateNetHistory(this.form).then(response => {
+            updateNetHistory(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addNetHistory(this.form).then(response => {
+            addNetHistory(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -287,19 +332,27 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除连网历史编号为"' + ids + '"的数据项？').then(function() {
-        return delNetHistory(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除连网历史编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delNetHistory(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('netEwm/netHistory/export', {
-        ...this.queryParams
-      }, `netHistory_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "netEwm/netHistory/export",
+        {
+          ...this.queryParams,
+        },
+        `netHistory_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>
diff --git a/src/views/netEwm/posterHistory/index.vue b/src/views/netEwm/posterHistory/index.vue
index d971c32..3b9f845 100644
--- a/src/views/netEwm/posterHistory/index.vue
+++ b/src/views/netEwm/posterHistory/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="广告名称" prop="posterName">
         <el-input
           v-model="queryParams.posterName"
@@ -9,25 +16,37 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="有效起始时间" prop="startTime">
-        <el-date-picker clearable
+      <el-form-item label="有效起始时间" prop="startTime" label-width="100px">
+        <el-date-picker
+          clearable
           v-model="queryParams.startTime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择有效起始时间">
+          placeholder="请选择有效起始时间"
+        >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="有效结束时间" prop="endTime">
-        <el-date-picker clearable
+      <el-form-item label="有效结束时间" prop="endTime" label-width="100px">
+        <el-date-picker
+          clearable
           v-model="queryParams.endTime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="请选择有效结束时间">
+          placeholder="请选择有效结束时间"
+        >
         </el-date-picker>
       </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>
+        <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
+        >
       </el-form-item>
     </el-form>
 
@@ -40,7 +59,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['netEwm:posterHistory:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -51,7 +71,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['netEwm:posterHistory:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -62,7 +83,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['netEwm:posterHistory:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -72,29 +94,50 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['netEwm:posterHistory:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="posterHistoryList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="posterHistoryList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="${comment}" align="center" prop="id" />
       <el-table-column label="广告id" align="center" prop="posterId" />
       <el-table-column label="广告名称" align="center" prop="posterName" />
-      <el-table-column label="有效起始时间" align="center" prop="startTime" width="180">
+      <el-table-column
+        label="有效起始时间"
+        align="center"
+        prop="startTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="有效结束时间" align="center" prop="endTime" width="180">
+      <el-table-column
+        label="有效结束时间"
+        align="center"
+        prop="endTime"
+        width="180"
+      >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="视频路径" align="center" prop="videoPath" />
       <el-table-column label="视频封面" align="center" prop="videoLogo" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -102,20 +145,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['netEwm:posterHistory:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['netEwm:posterHistory:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -124,7 +169,7 @@
 
     <!-- 添加或修改广告历史对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="广告id" prop="posterId">
           <el-input v-model="form.posterId" placeholder="请输入广告id" />
         </el-form-item>
@@ -132,19 +177,23 @@
           <el-input v-model="form.posterName" placeholder="请输入广告名称" />
         </el-form-item>
         <el-form-item label="有效起始时间" prop="startTime">
-          <el-date-picker clearable
+          <el-date-picker
+            clearable
             v-model="form.startTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择有效起始时间">
+            placeholder="请选择有效起始时间"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="有效结束时间" prop="endTime">
-          <el-date-picker clearable
+          <el-date-picker
+            clearable
             v-model="form.endTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择有效结束时间">
+            placeholder="请选择有效结束时间"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="视频路径" prop="videoPath">
@@ -163,7 +212,13 @@
 </template>
 
 <script>
-import { listPosterHistory, getPosterHistory, delPosterHistory, addPosterHistory, updatePosterHistory } from "@/api/netEwm/posterHistory";
+import {
+  listPosterHistory,
+  getPosterHistory,
+  delPosterHistory,
+  addPosterHistory,
+  updatePosterHistory,
+} from "@/api/netEwm/posterHistory";
 
 export default {
   name: "PosterHistory",
@@ -200,18 +255,18 @@ export default {
       // 表单校验
       rules: {
         posterName: [
-          { required: true, message: "广告名称不能为空", trigger: "blur" }
+          { required: true, message: "广告名称不能为空", trigger: "blur" },
         ],
         startTime: [
-          { required: true, message: "有效起始时间不能为空", trigger: "blur" }
+          { required: true, message: "有效起始时间不能为空", trigger: "blur" },
         ],
         endTime: [
-          { required: true, message: "有效结束时间不能为空", trigger: "blur" }
+          { required: true, message: "有效结束时间不能为空", trigger: "blur" },
         ],
         videoLogo: [
-          { required: true, message: "视频封面不能为空", trigger: "blur" }
+          { required: true, message: "视频封面不能为空", trigger: "blur" },
         ],
-      }
+      },
     };
   },
   created() {
@@ -221,7 +276,7 @@ export default {
     /** 查询广告历史列表 */
     getList() {
       this.loading = true;
-      listPosterHistory(this.queryParams).then(response => {
+      listPosterHistory(this.queryParams).then((response) => {
         this.posterHistoryList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -246,7 +301,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
-        remark: null
+        remark: null,
       };
       this.resetForm("form");
     },
@@ -262,9 +317,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -275,8 +330,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getPosterHistory(id).then(response => {
+      const id = row.id || this.ids;
+      getPosterHistory(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改广告历史";
@@ -284,16 +339,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updatePosterHistory(this.form).then(response => {
+            updatePosterHistory(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addPosterHistory(this.form).then(response => {
+            addPosterHistory(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -305,19 +360,27 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除广告历史编号为"' + ids + '"的数据项？').then(function() {
-        return delPosterHistory(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      this.$modal
+        .confirm('是否确认删除广告历史编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delPosterHistory(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('netEwm/posterHistory/export', {
-        ...this.queryParams
-      }, `posterHistory_${new Date().getTime()}.xlsx`)
-    }
-  }
+      this.download(
+        "netEwm/posterHistory/export",
+        {
+          ...this.queryParams,
+        },
+        `posterHistory_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
 };
 </script>