更换组合式API写法

src/views/dashboard/BarChart.vue

@@ -1,101 +1,90 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}" />
+  <div ref="chartRef" :class="className" :style="{ height: height, width: width }" />
 </template>
 
-<script>
+<script setup>
-import * as echarts from 'echarts';
+import * as echarts from 'echarts'
-// import resize from './mixins/resize'
+let chart = null
-
+const { proxy } = getCurrentInstance()
 const animationDuration = 6000
-
+const props = defineProps({
-export default {
-  // mixins: [resize],
-  props: {
   className: {
     type: String,
-      default: 'chart'
+    default: 'chart',
   },
   width: {
     type: String,
-      default: '100%'
+    default: '100%',
   },
   height: {
     type: String,
-      default: '300px'
+    default: '300px',
-    }
   },
-  data() {
+})
-    return {
+function initChart() {
-      chart: null
+  chart = echarts.init(proxy.$refs.chartRef, 'macarons')
-    }
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.initChart()
-    })
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(this.$el)
 
-      this.chart.setOption({
+  chart.setOption({
     tooltip: {
       trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+      axisPointer: {
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+        // 坐标轴指示器，坐标轴触发有效
-          }
+        type: 'shadow', // 默认为直线，可选为：'line' | 'shadow'
+      },
     },
     grid: {
       top: 10,
       left: '2%',
       right: '2%',
       bottom: '3%',
-          containLabel: true
+      containLabel: true,
     },
-        xAxis: [{
+    xAxis: [
+      {
         type: 'category',
         data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
         axisTick: {
-            alignWithLabel: true
+          alignWithLabel: true,
-          }
+        },
-        }],
+      },
-        yAxis: [{
+    ],
+    yAxis: [
+      {
         type: 'value',
         axisTick: {
-            show: false
+          show: false,
-          }
+        },
-        }],
+      },
-        series: [{
+    ],
+    series: [
+      {
         name: 'pageA',
         type: 'bar',
         stack: 'vistors',
         barWidth: '60%',
         data: [79, 52, 200, 334, 390, 330, 220],
-          animationDuration
+        animationDuration,
-        }, {
+      },
+      {
         name: 'pageB',
         type: 'bar',
         stack: 'vistors',
         barWidth: '60%',
         data: [80, 52, 200, 334, 390, 330, 220],
-          animationDuration
+        animationDuration,
-        }, {
+      },
+      {
         name: 'pageC',
         type: 'bar',
         stack: 'vistors',
         barWidth: '60%',
         data: [30, 52, 200, 334, 390, 330, 220],
-          animationDuration
+        animationDuration,
-        }]
+      },
+    ],
   })
-    }
-  }
 }
+onMounted(() => {
+  initChart()
+})
 </script>

src/views/dashboard/LineChart.vue

@@ -1,14 +1,12 @@
 <template>
-  <div :class="className" :style="{ height: height, width: width }" />
+  <div ref="chartRef" :class="className" :style="{ height: height, width: width }" />
 </template>
 
-<script>
+<script setup>
 import * as echarts from 'echarts'
-// import resize from './mixins/resize'
+const { proxy } = getCurrentInstance()
-
+const chartRef = ref(null)
-export default {
+const props = defineProps({
-  // mixins: [resize],
-  props: {
   className: {
     type: String,
     default: 'chart',
@@ -29,39 +27,18 @@ export default {
     type: Object,
     required: true,
   },
+})
+let chart = null
+watch(
+  () => props.chartData,
+  (val) => {
+    setOptions(val)
   },
-  data() {
+  { deep: true },
-    return {
+)
-      chart: null,
+
-    }
+function setOptions({ expectedData, actualData } = {}) {
-  },
+  chart.setOption({
-  watch: {
-    chartData: {
-      deep: true,
-      handler(val) {
-        this.setOptions(val)
-      },
-    },
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.initChart()
-    })
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(this.$el)
-      this.setOptions(this.chartData)
-    },
-    setOptions({ expectedData, actualData } = {}) {
-      this.chart.setOption({
     xAxis: {
       data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
       boundaryGap: false,
@@ -127,7 +104,15 @@ export default {
       },
     ],
   })
-    },
+}
-  },
+function initChart() {
+  chart = echarts.init(proxy.$refs.chartRef, 'macarons')
+  setOptions(props.chartData)
+}
+onMounted(() => {
+  initChart()
+})
+window.onresize = function () {
+  chart.resize()
 }
 </script>

src/views/dashboard/PieChart.vue

@@ -1,57 +1,38 @@
 <template>
-  <div :class="className" :style="{height:height,width:width}" />
+  <div ref="chartRef" :class="className" :style="{ height: height, width: width }" />
 </template>
 
-<script>
+<script setup>
-import * as echarts from 'echarts';
+import * as echarts from 'echarts'
-// import resize from './mixins/resize'
+const { proxy } = getCurrentInstance()
-
+let chart = null
-export default {
+const props = defineProps({
-  // mixins: [resize],
-  props: {
   className: {
     type: String,
-      default: 'chart'
+    default: 'chart',
   },
   width: {
     type: String,
-      default: '100%'
+    default: '100%',
   },
   height: {
     type: String,
-      default: '300px'
+    default: '300px',
-    }
   },
-  data() {
+})
-    return {
-      chart: null
-    }
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.initChart()
-    })
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(this.$el)
 
-      this.chart.setOption({
+function initChart() {
+  chart = echarts.init(proxy.$refs.chartRef)
+
+  chart.setOption({
     tooltip: {
       trigger: 'item',
-          formatter: '{a} <br/>{b} : {c} ({d}%)'
+      formatter: '{a} <br/>{b} : {c} ({d}%)',
     },
     legend: {
       left: 'center',
       bottom: '10',
-          data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
+      data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts'],
     },
     series: [
       {
@@ -65,14 +46,15 @@ export default {
           { value: 240, name: 'Technology' },
           { value: 149, name: 'Forex' },
           { value: 100, name: 'Gold' },
-              { value: 59, name: 'Forecasts' }
+          { value: 59, name: 'Forecasts' },
         ],
         animationEasing: 'cubicInOut',
-            animationDuration: 2600
+        animationDuration: 2600,
-          }
+      },
-        ]
+    ],
   })
-    }
-  }
 }
+onMounted(() => {
+  initChart()
+})
 </script>

src/views/dashboard/RaddarChart.vue

@@ -4,7 +4,6 @@
 
 <script>
 import * as echarts from 'echarts'
-// import resize from './mixins/resize'
 
 const animationDuration = 3000
 

src/views/monitor/logininfor/index.vue

@@ -8,12 +8,18 @@
         <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="登录状态" clearable  >
+        <el-select v-model="queryParams.status" placeholder="登录状态" clearable>
           <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
         </el-select>
       </el-form-item>
       <el-form-item label="登录时间">
-        <el-date-picker v-model="dateRange"  style="width: 240px" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
@@ -23,7 +29,9 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['monitor:logininfor:remove']">删除</el-button>
+        <el-button type="danger" plain icon="delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['monitor:logininfor:remove']"
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="delete" @click="handleClean" v-hasPermi="['monitor:logininfor:remove']">清空</el-button>
@@ -43,7 +51,7 @@
       <el-table-column label="浏览器" align="center" prop="browser" />
       <el-table-column label="操作系统" align="center" prop="os" />
       <el-table-column label="操作状态" align="center" prop="status">
-        <template #default="{row}">
+        <template #default="{ row }">
           <dict-tag :options="statusOptions" :value="row.status"></dict-tag>
         </template>
       </el-table-column>
@@ -55,142 +63,124 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
   </div>
 </template>
 
-<script>
+<script setup name="logininfor">
-import {
+import { list as queryList, delLogininfor, cleanLogininfor, exportLogininfor } from '@/api/monitor/logininfor'
-  list,
-  delLogininfor,
-  cleanLogininfor,
-  exportLogininfor,
-} from "@/api/monitor/logininfor";
 
-export default {
+// 遮罩层
-  name: "logininfor",
+const loading = ref(true)
-  data() {
+// 选中数组
-    return {
+const ids = ref([])
-      // 遮罩层
+// 非多个禁用
-      loading: true,
+const multiple = ref(true)
-      // 选中数组
+// 显示搜索条件
-      ids: [],
+const showSearch = ref(true)
-      // 非多个禁用
+// 总条数
-      multiple: true,
+const total = ref(0)
-      // 显示搜索条件
+// 表格数据
-      showSearch: true,
+const list = ref([])
-      // 总条数
+// 状态数据字典
-      total: 0,
+const statusOptions = ref([])
-      // 表格数据
+// 日期范围
-      list: [],
+const dateRange = ref([])
-      // 状态数据字典
+// 查询参数
-      statusOptions: [],
+const queryParams = reactive({
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
   pageNum: 1,
   pageSize: 10,
   ipaddr: undefined,
   userName: undefined,
   status: undefined,
-      },
+})
-    };
+
-  },
+const { proxy } = getCurrentInstance()
-  created() {
+/** 查询登录日志列表 */
-    this.getList();
+function getList() {
-    this.getDicts("sys_common_status").then((response) => {
+  loading.value = true
-      this.statusOptions = response.data;
+  queryList(proxy.addDateRange(queryParams, dateRange.value)).then((response) => {
-    });
+    loading.value = false
-  },
-  methods: {
-    /** 查询登录日志列表 */
-    getList() {
-      this.loading = true;
-      list(this.addDateRange(this.queryParams, this.dateRange)).then(
-        (response) => {
-          this.loading = false;
     if (response.code == 200) {
-            this.list = response.data.result;
+      list.value = response.data.result
-            this.total = response.data.totalNum;
+      total.value = response.data.totalNum
     } else {
-            this.total = 0;
+      total.value = 0
-            this.list = [];
+      list.value = []
     }
-        }
+  })
-      );
+}
-    },
+// 登录状态字典翻译
-    // 登录状态字典翻译
+function statusFormat(row, column) {
-    statusFormat(row, column) {
+  return proxy.selectDictLabel(statusOptions.value, row.status)
-      return this.selectDictLabel(this.statusOptions, row.status);
+}
-    },
+getList()
-    /** 搜索按钮操作 */
+proxy.getDicts('sys_common_status').then((response) => {
-    handleQuery() {
+  statusOptions.value = response.data
-      this.queryParams.pageNum = 1;
+})
-      this.getList();
+
-    },
+/** 搜索按钮操作 */
-    /** 重置按钮操作 */
+function handleQuery() {
-    resetQuery() {
+  queryParams.pageNum = 1
-      this.dateRange = [];
+  getList()
-      this.resetForm("queryForm");
+}
-      this.handleQuery();
+/** 重置按钮操作 */
-    },
+function resetQuery() {
-    // 多选框选中数据
+  dateRange.value = []
-    handleSelectionChange(selection) {
+  proxy.resetForm('queryForm')
-      this.ids = selection.map((item) => item.infoId);
+  handleQuery()
-      this.multiple = !selection.length;
+}
-    },
+// 多选框选中数据
-    /** 删除按钮操作 */
+function handleSelectionChange(selection) {
-    handleDelete(row) {
+  ids.value = selection.map((item) => item.infoId)
-      const infoIds = row.infoId || this.ids;
+  multiple.value = !selection.length
-      this.$confirm(
+}
-        '是否确认删除访问编号为"' + infoIds + '"的数据项?',
+/** 删除按钮操作 */
-        "警告",
+function handleDelete(row) {
-        {
+  const infoIds = row.infoId || ids.value
-          confirmButtonText: "确定",
+  proxy
-          cancelButtonText: "取消",
+    .$confirm('是否确认删除访问编号为"' + infoIds + '"的数据项?', '警告', {
-          type: "warning",
+      confirmButtonText: '确定',
-        }
+      cancelButtonText: '取消',
-      )
+      type: 'warning',
+    })
     .then(function () {
-          return delLogininfor(infoIds);
+      return delLogininfor(infoIds)
     })
     .then(() => {
-          this.getList();
+      getList()
-          this.$modal.msgSuccess("删除成功");
+      proxy.$modal.msgSuccess('删除成功')
-        });
+    })
-    },
+}
-    /** 清空按钮操作 */
+/** 清空按钮操作 */
-    handleClean() {
+function handleClean() {
-      this.$confirm("是否确认清空所有登录日志数据项?", "警告", {
+  proxy
-        confirmButtonText: "确定",
+    .$confirm('是否确认清空所有登录日志数据项?', '警告', {
-        cancelButtonText: "取消",
+      confirmButtonText: '确定',
-        type: "warning",
+      cancelButtonText: '取消',
+      type: 'warning',
     })
     .then(function () {
-          return cleanLogininfor();
+      return cleanLogininfor()
     })
     .then(() => {
-          this.getList();
+      getList()
-          this.$modal.msgSuccess("清空成功");
+      proxy.$modal.msgSuccess('清空成功')
-        });
+    })
-    },
+}
-    /** 导出按钮操作 */
+/** 导出按钮操作 */
-    handleExport() {
+function handleExport() {
-      const queryParams = this.queryParams;
+  proxy
-      this.$confirm("是否确认导出所有操作日志数据项?", "警告", {
+    .$confirm('是否确认导出所有操作日志数据项?', '警告', {
-        confirmButtonText: "确定",
+      confirmButtonText: '确定',
-        cancelButtonText: "取消",
+      cancelButtonText: '取消',
-        type: "warning",
+      type: 'warning',
     })
     .then(function () {
-          return exportLogininfor(queryParams);
+      return exportLogininfor(queryParams)
     })
     .then((response) => {
-          this.download(response.data.path);
+      proxy.download(response.data.path)
-        });
+    })
-    },
+}
-  },
-};
 </script>
-

src/views/monitor/operlog/index.vue

@@ -90,7 +90,7 @@
 
     <!-- 操作日志详细 -->
     <el-dialog title="操作日志详细" v-model="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" label-width="100px">
+      <el-form ref="formRef" :model="form" label-width="100px">
         <el-row>
           <el-col :lg="12">
             <el-form-item label="操作模块：">{{ form.title }} </el-form-item>
@@ -136,36 +136,33 @@
   </div>
 </template>
 
-<script>
+<script setup name="operlog">
-import { list, delOperlog, cleanOperlog, exportOperlog } from '@/api/monitor/operlog'
+import { list as listOperLog, delOperlog, cleanOperlog, exportOperlog } from '@/api/monitor/operlog'
 
-export default {
+const { proxy } = getCurrentInstance()
-  name: 'operlog',
+// 遮罩层
-  data() {
+const loading = ref(true)
-    return {
+// 选中数组
-      // 遮罩层
+const ids = ref([])
-      loading: true,
+// 非多个禁用
-      // 选中数组
+const multiple = ref(true)
-      ids: [],
+// 显示搜索条件
-      // 非多个禁用
+const showSearch = ref(true)
-      multiple: true,
+// 总条数
-      // 显示搜索条件
+const total = ref(0)
-      showSearch: true,
+// 表格数据
-      // 总条数
+const list = ref([])
-      total: 0,
+// 是否显示弹出层
-      // 表格数据
+const open = ref(false)
-      list: [],
+// 类型数据字典
-      // 是否显示弹出层
+const statusOptions = ref([])
-      open: false,
+// 业务类型（0其它 1新增 2修改 3删除）选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
-      // 类型数据字典
+const businessTypeOptions = ref([])
-      statusOptions: [],
+// 日期范围
-      // 业务类型（0其它 1新增 2修改 3删除）选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
+const dateRange = ref([])
-      businessTypeOptions: [],
+
-      // 日期范围
+const state = reactive({
-      dateRange: [],
-      // 表单参数
   form: {},
-      // 查询参数
   queryParams: {
     pageNum: 1,
     pageSize: 20,
@@ -174,64 +171,85 @@ export default {
     businessType: undefined,
     status: undefined,
   },
-    }
+})
-  },
+const { form, queryParams } = toRefs(state)
-  created() {
+var dictParams = [
-    this.getList()
-    var dictParams = [
   { dictType: 'sys_oper_type', columnName: 'businessTypeOptions' },
   { dictType: 'sys_common_status', columnName: 'statusOptions' },
-    ]
+]
-    this.getDicts(dictParams).then((response) => {
+proxy.getDicts(dictParams).then((response) => {
   response.data.forEach((element) => {
-        this[element.columnName] = element.list
+    proxy[element.columnName] = element.list
   })
-    })
+})
-  },
+/** 查询登录日志 */
-  methods: {
+function getList() {
-    /** 查询登录日志 */
+  loading.value = true
-    getList() {
+  listOperLog(proxy.addDateRange(queryParams.value, dateRange.value)).then((response) => {
-      this.loading = true
+    loading.value = false
-      list(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
-        this.loading = false
     if (response.code == 200) {
-          this.list = response.data.result
+      list.value = response.data.result
-          this.total = response.data.totalNum
+      total.value = response.data.totalNum
     } else {
-          this.total = 0
+      total.value = 0
-          this.list = []
+      list.value = []
     }
   })
-    },
+}
-    // 操作日志状态字典翻译
+// 操作日志状态字典翻译
-    statusFormat(row, column) {
+function statusFormat(row, column) {
-      return this.selectDictLabel(this.statusOptions, row.status)
+  return proxy.selectDictLabel(statusOptions.value, row.status)
-    },
+}
-    /** 搜索按钮操作 */
+/** 搜索按钮操作 */
-    handleQuery() {
+function handleQuery() {
-      this.queryParams.pageNum = 1
+  queryParams.value.pageNum = 1
-      this.getList()
+  getList()
-    },
+}
-    /** 重置按钮操作 */
+/** 重置按钮操作 */
-    resetQuery() {
+function resetQuery() {
-      this.dateRange = []
+  dateRange.value = []
-      this.resetForm('queryForm')
+  proxy.resetForm('queryForm')
-      this.handleQuery()
+  handleQuery()
-    },
+}
-    // 多选框选中数据
+// 多选框选中数据
-    handleSelectionChange(selection) {
+function handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.operId)
+  ids.value = selection.map((item) => item.operId)
-      this.multiple = !selection.length
+  multiple.value = !selection.length
-    },
+}
-    /** 详细按钮操作 */
+const formRef = ref()
-    handleView(row) {
+/** 重置操作表单 */
-      this.open = true
+function reset() {
-      this.form = row
+  form.value = {
-    },
+    operId: undefined,
-    /** 删除按钮操作 */
+    title: undefined,
-    handleDelete(row) {
+    businessType: undefined,
-      const operIds = row.operId || this.ids
+    method: undefined,
-      this.$confirm('是否确认删除日志编号为"' + operIds + '"的数据项?', '警告', {
+    requestMethod: undefined,
+    operatorType: undefined,
+    deptName: undefined,
+    operUrl: undefined,
+    operIp: undefined,
+    operLocation: undefined,
+    operParam: undefined,
+    jsonResult: undefined,
+    status: 0,
+    errorMsg: undefined,
+    operTime: undefined,
+    elapsed: 0,
+  }
+  proxy.resetForm('formRef')
+}
+/** 详细按钮操作 */
+function handleView(row) {
+  reset()
+  open.value = true
+  form.value = row
+}
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const operIds = row.operId || ids.value
+  proxy
+    .$confirm('是否确认删除日志编号为"' + operIds + '"的数据项?', '警告', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning',
@@ -240,13 +258,14 @@ export default {
       return delOperlog(operIds)
     })
     .then(() => {
-          this.getList()
+      getList()
-          this.$modal.msgSuccess('删除成功')
+      proxy.$modal.msgSuccess('删除成功')
     })
-    },
+}
-    /** 清空按钮操作 */
+/** 清空按钮操作 */
-    handleClean() {
+function handleClean() {
-      this.$confirm('是否确认清空所有操作日志数据项?', '警告', {
+  proxy
+    .$confirm('是否确认清空所有操作日志数据项?', '警告', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning',
@@ -255,29 +274,29 @@ export default {
       return cleanOperlog()
     })
     .then(() => {
-          this.getList()
+      getList()
-          this.$modal.msgSuccess('清空成功')
+      proxy.$modal.msgSuccess('清空成功')
     })
-    },
+}
-    /** 导出按钮操作 */
+/** 导出按钮操作 */
-    handleExport() {
+function handleExport() {
-      const queryParams = this.queryParams
+  proxy
-      this.$confirm('是否确认导出所有操作日志?', '警告', {
+    .$confirm('是否确认导出所有操作日志?', '警告', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning',
-      }).then(() => {
+    })
-        exportOperlog(queryParams).then((response) => {
+    .then(() => {
+      exportOperlog(queryParams.value).then((response) => {
         const { code, data } = response
         if (code == 200) {
-            this.$modal.msgSuccess('导出成功')
+          proxy.$modal.msgSuccess('导出成功')
-            this.download(data.path)
+          proxy.download(data.path)
         } else {
-            this.$modal.msgError('导出失败')
+          proxy.$modal.msgError('导出失败')
         }
       })
     })
-    },
-  },
 }
+handleQuery()
 </script>