src/api/collaborativeApproval/customerVisit.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
import request from '@/utils/request'

// èŽ·å–拜访记录列表
export function getVisitRecords(query) {
  return request({
    url: '/customerVisits/listPage',
    method: 'get',
    params: query
  })
}

 src/views/collaborativeApproval/customerVisit/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,269 @@
<template>
  <div class="app-container">
    <div class="search_form">
      <el-form :model="searchForm" :inline="true">
        <el-form-item label="客户名称：">
          <el-input 
            v-model="searchForm.customerName" 
            placeholder="请输入客户名称" 
            clearable 
            prefix-icon="Search"
            style="width: 200px"
            @change="handleQuery" 
          />
        </el-form-item>
        <el-form-item label="拜访人：">
          <el-input 
            v-model="searchForm.visitingPeople" 
            placeholder="请输入拜访人" 
            clearable 
            prefix-icon="Search"
            style="width: 200px"
            @change="handleQuery" 
          />
        </el-form-item>
        <el-form-item>
          <el-button type="primary" @click="handleQuery">搜索</el-button>
        </el-form-item>
      </el-form>
    </div>
    <div class="table_list">
      <el-table 
        :data="tableData" 
        border 
        v-loading="tableLoading" 
        style="width: 100%" 
        height="calc(100vh - 18.5em)"
      >
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column label="客户名称" prop="customerName" width="150" show-overflow-tooltip />
        <el-table-column label="联系人" prop="contact" width="120" show-overflow-tooltip />
        <el-table-column label="联系电话" prop="contactPhone" width="140" show-overflow-tooltip />
        <el-table-column label="拜访目的" prop="purposeVisit" width="150" show-overflow-tooltip />
        <el-table-column label="拜访时间" prop="purposeDate" width="180" show-overflow-tooltip />
        <el-table-column label="拜访地点" prop="visitAddress" min-width="200" show-overflow-tooltip />
        <el-table-column label="拜访人" prop="visitingPeople" width="120" show-overflow-tooltip />
        <el-table-column fixed="right" label="操作" width="100" align="center">
          <template #default="scope">
            <el-button link type="primary" size="small" @click="viewDetail(scope.row)">查看</el-button>
          </template>
        </el-table-column>
      </el-table>
      <pagination 
        v-show="total > 0" 
        :total="total" 
        layout="total, sizes, prev, pager, next, jumper"
        :page="page.current" 
        :limit="page.size" 
        @pagination="paginationChange" 
      />
    </div>

    <!-- è¯¦æƒ…弹窗 -->
    <el-dialog 
      v-model="detailVisible" 
      title="客户拜访记录详情" 
      width="600px"
      @close="closeDetail"
    >
      <div class="content-container">
        <!-- å®¢æˆ·ä¿¡æ¯ -->
        <div class="section">
          <div class="section-title">客户信息</div>
          <div class="info-item">
            <span class="info-label">客户名称</span>
            <span class="info-value">{{ detailForm.customerName || '-' }}</span>
          </div>
          <div class="info-item">
            <span class="info-label">联系人</span>
            <span class="info-value">{{ detailForm.contact || '-' }}</span>
          </div>
          <div class="info-item">
            <span class="info-label">联系电话</span>
            <span class="info-value">{{ detailForm.contactPhone || '-' }}</span>
          </div>
        </div>

        <!-- æ‹œè®¿ä¿¡æ¯ -->
        <div class="section">
          <div class="section-title">拜访信息</div>
          <div class="info-item">
            <span class="info-label">拜访目的</span>
            <span class="info-value">{{ detailForm.purposeVisit || '-' }}</span>
          </div>
          <div class="info-item">
            <span class="info-label">拜访时间</span>
            <span class="info-value">{{ detailForm.purposeDate || '-' }}</span>
          </div>
          <div class="info-item">
            <span class="info-label">拜访地点</span>
            <span class="info-value multi-line">{{ detailForm.visitAddress || '-' }}</span>
          </div>
          <div class="info-item">
            <span class="info-label">拜访人</span>
            <span class="info-value">{{ detailForm.visitingPeople || '-' }}</span>
          </div>
          <div class="info-item" v-if="detailForm.latitude && detailForm.longitude">
            <span class="info-label">经纬度</span>
            <span class="info-value">{{ detailForm.latitude }}, {{ detailForm.longitude }}</span>
          </div>
        </div>

        <!-- å¤‡æ³¨ä¿¡æ¯ -->
        <div class="section">
          <div class="section-title">备注信息</div>
          <div class="info-item remark-item">
            <span class="info-label">备注</span>
            <span class="info-value multi-line">{{ detailForm.remark || '-' }}</span>
          </div>
        </div>
      </div>
      <template #footer>
        <div class="dialog-footer">
          <el-button @click="closeDetail">关闭</el-button>
        </div>
      </template>
    </el-dialog>
  </div>
</template>

<script setup>
import { ref, reactive, onMounted, getCurrentInstance } from 'vue'
import pagination from '@/components/PIMTable/Pagination.vue'
import { getVisitRecords } from '@/api/collaborativeApproval/customerVisit.js'

const { proxy } = getCurrentInstance()
const tableData = ref([])
const tableLoading = ref(false)
const page = reactive({
  current: 1,
  size: 10,
})
const total = ref(0)

// æœç´¢è¡¨å•
const searchForm = reactive({
  customerName: '',
  visitingPeople: '',
})

// è¯¦æƒ…相关
const detailVisible = ref(false)
const detailForm = ref({})

// æŸ¥è¯¢åˆ—表
const handleQuery = () => {
  page.current = 1
  getList()
}

// åˆ†é¡µå˜åŒ–
const paginationChange = (obj) => {
  page.current = obj.page
  page.size = obj.limit
  getList()
}

// èŽ·å–列表数据
const getList = () => {
  tableLoading.value = true
  getVisitRecords({ ...searchForm, ...page })
    .then((res) => {
      tableLoading.value = false
      if (res.code === 200) {
        tableData.value = res.data?.records || res.records || []
        total.value = res.data?.total || res.total || 0
      } else {
        proxy.$modal.msgError(res.msg || '获取数据失败')
      }
    })
    .catch(() => {
      tableLoading.value = false
    })
}

// æŸ¥çœ‹è¯¦æƒ…
const viewDetail = (row) => {
  detailForm.value = { ...row }
  detailVisible.value = true
}

// å…³é—­è¯¦æƒ…
const closeDetail = () => {
  detailVisible.value = false
  detailForm.value = {}
}

onMounted(() => {
  getList()
})
</script>

<style scoped lang="scss">
.table_list {
  margin-top: unset;
}

.content-container {
  padding: 10px;
}

.section {
  margin-bottom: 24px;
  
  &:last-child {
    margin-bottom: 0;
  }
}

.section-title {
  font-size: 16px;
  font-weight: bold;
  color: #303133;
  margin-bottom: 16px;
  padding-bottom: 8px;
  border-bottom: 1px solid #e4e7ed;
}

.info-item {
  display: flex;
  margin-bottom: 12px;
  line-height: 1.6;
  
  &:last-child {
    margin-bottom: 0;
  }
  
  &.remark-item {
    flex-direction: column;
    align-items: flex-start;
    
    .info-label {
      margin-bottom: 8px;
    }
    
    .info-value {
      width: 100%;
    }
  }
}

.info-label {
  font-weight: 500;
  color: #606266;
  min-width: 100px;
  margin-right: 12px;
  flex-shrink: 0;
}

.info-value {
  color: #303133;
  flex: 1;
  word-break: break-all;
  
  &.multi-line {
    white-space: pre-wrap;
    word-break: break-word;
  }
}
</style>

 src/views/procurementManagement/procurementLedger/index.vue

@@ -1683,14 +1683,6 @@
  const handleDelete = () => {
    let ids = [];
    if (selectedRows.value.length > 0) {
      // æ£€æŸ¥æ˜¯å¦æœ‰ä»–人维护的数据
      const unauthorizedData = selectedRows.value.filter(
        item => item.recorderName !== userStore.nickName
      );
      if (unauthorizedData.length > 0) {
        proxy.$modal.msgWarning("不可删除他人维护的数据");
        return;
      }
      ids = selectedRows.value.map(item => item.id);
    } else {
      proxy.$modal.msgWarning("请选择数据");

 src/views/reportAnalysis/financialAnalysis/components/center-bottom.vue

@@ -101,7 +101,7 @@
  border: 1px solid #1a58b0;
  padding: 18px;
  width: 100%;
  height: 428px;
  height: 432px;
}
</style>


 src/views/reportAnalysis/productionAnalysis/components/center-top.vue

@@ -97,7 +97,7 @@

.card-label {
  font-weight: 400;
  font-size: 19px;
  font-size: 16px;
  color: rgba(208, 231, 255, 0.7);
}


 src/views/reportAnalysis/productionAnalysis/components/right-bottom.vue

@@ -5,9 +5,18 @@
      <div class="filters-row">
        <DateTypeSwitch v-model="dateType" @change="handleDateTypeChange" />
      </div>
      <Echarts ref="chart" :chartStyle="chartStyle" :grid="grid" :legend="barLegend" :series="chartSeries"
        :tooltip="tooltip" :xAxis="xAxis1" :yAxis="yAxis1"
        :options="{ backgroundColor: 'transparent', textStyle: { color: '#B8C8E0' } }" style="height: 320px" />
      <Echarts
        ref="chart"
        :chartStyle="chartStyle"
        :grid="grid"
        :legend="barLegend"
        :series="chartSeries"
        :tooltip="tooltip"
        :xAxis="xAxis1"
        :yAxis="yAxis1"
        :options="{ backgroundColor: 'transparent', textStyle: { color: '#B8C8E0' } }"
        style="height: 260px"
      />
    </div>
  </div>
</template>
@@ -21,62 +30,110 @@

const dateType = ref(1)

const chartStyle = { width: '100%', height: '100%' }
const grid = { left: '3%', right: '4%', bottom: '3%', top: '15%', containLabel: true }
const chartStyle = {
  width: '100%',
  height: '140%',
}

const grid = { left: '3%', right: '4%', bottom: '3%', top: '10%', containLabel: true }

const barLegend = {
  show: true,
  textStyle: { color: '#B8C8E0' },
  data: ['完成数量', '工资金额', '合格率'],
  top: '0%'
}

// åˆå§‹åŒ– series ç»“æž„
const chartSeries = ref([
  {
    name: '完成数量',
    type: 'bar',
    barWidth: 15,
    itemStyle: { color: '#4EE4FF' },
    data: []
    barWidth: 20,
    barGap: '40%',
    emphasis: { focus: 'series' },
    itemStyle: {
      color: {
        type: 'linear',
        x: 0,
        y: 0,
        x2: 0,
        y2: 1,
        colorStops: [
          { offset: 1, color: 'rgba(0, 164, 237, 0)' },
          { offset: 0, color: 'rgba(78, 228, 255, 1)' },
        ],
      },
    },
    data: [],
  },
  {
    name: '工资金额',
    type: 'bar',
    barWidth: 15,
    itemStyle: { color: '#00A4ED' },
    data: []
    barGap: '40%',
    barWidth: 20,
    emphasis: { focus: 'series' },
    itemStyle: {
      color: {
        type: 'linear',
        x: 0,
        y: 0,
        x2: 0,
        y2: 1,
        colorStops: [
          { offset: 1, color: 'rgba(83, 126, 245, 0.19)' },
          { offset: 0, color: 'rgba(144, 97, 248, 1)' },
        ],
      },
    },
    data: [],
  },
  {
    name: '合格率',
    type: 'line',
    yAxisIndex: 1,
    smooth: true,
    itemStyle: { color: '#FFD339' },
    data: []
  }
    showSymbol: true,
    symbol: 'circle',
    symbolSize: 8,
    lineStyle: { color: 'rgba(90, 216, 166, 1)', width: 2 },
    itemStyle: { color: 'rgba(90, 216, 166, 1)' },
    data: [],
    emphasis: { focus: 'series' },
  },
])

const xAxis1 = ref([
  { type: 'category', axisTick: { show: false }, axisLabel: { color: '#B8C8E0' }, data: [] }
  { type: 'category', axisTick: { show: false }, axisLabel: { color: '#B8C8E0' }, data: [] },
])

const yAxis1 = [
  { type: 'value', name: '数量/金额', axisLabel: { color: '#B8C8E0' }, splitLine: { lineStyle: { color: 'rgba(184, 200, 224, 0.2)' } } },
  { type: 'value', name: '合格率(%)', max: 100, axisLabel: { formatter: '{value}%', color: '#B8C8E0' }, splitLine: { show: false } }
  {
    type: 'value',
    name: '数量/金额',
    axisLabel: { color: '#B8C8E0' },
    nameTextStyle: { color: '#B8C8E0' },
    // splitLine: { lineStyle: { color: 'rgba(184, 200, 224, 0.2)' } },
  },
  {
    type: 'value',
    name: '合格率(%)',
    min: 0,
    max: 100,
    axisLabel: { color: '#B8C8E0', formatter: '{value}%' },
    nameTextStyle: { color: '#B8C8E0' },
    splitLine: { lineStyle: { color: 'rgba(184, 200, 224, 0.2)' } },
  },
]

const tooltip = {
  trigger: 'axis',
  axisPointer: { type: 'shadow' },
  axisPointer: { type: 'cross' },
  formatter(params) {
    let res = params[0].axisValueLabel + '<br/>'
    params.forEach(item => {
    let result = params[0].axisValueLabel + '<br/>'
    params.forEach((item) => {
      const unit = item.seriesName === '合格率' ? '%' : (item.seriesName === '工资金额' ? ' å…ƒ' : ' ä¸ª')
      res += `${item.marker} ${item.seriesName}: ${item.value}${unit}<br/>`
      result += `<div>${item.marker} ${item.seriesName}: ${item.value}${unit}</div>`
    })
    return res
  }
    return result
  },
}

const handleDateTypeChange = () => {
@@ -93,8 +150,6 @@
        chartSeries.value[0].data = items.map(item => Number(item.numberOfCompleted) || 0)
        chartSeries.value[1].data = items.map(item => Number(item.amount) || 0)
        chartSeries.value[2].data = items.map(item => Number(item.passRate) || 0)

        console.log('更新后的数据:', chartSeries.value)
      }
    })
    .catch((err) => {
@@ -108,17 +163,25 @@
</script>

<style scoped>
.main-panel {
  display: flex;
  flex-direction: column;
  gap: 20px;
}

.filters-row {
  display: flex;
  justify-content: flex-end;
  align-items: center;
  gap: 12px;
  margin-bottom: 10px;
}

.panel-item-customers {
  border: 1px solid #1a58b0;
  padding: 18px;
  width: 100%;
  height: 449px;
  box-sizing: border-box;
}

.filters-row {
  display: flex;
  justify-content: flex-end;
  margin-bottom: 10px;
}
</style>

 src/views/reportAnalysis/qualityAnalysis/components/center-bottom.vue

@@ -1,21 +1,23 @@
<template>
  <div>
    <div class="chart-header">
      <PanelHeader title="完成检验数" />
      <div class="chart-header-title">
        <PanelHeader title="完成检验数" />
      </div>
      <div class="warn-range" @click="handleRangeClick">近7天</div>
    </div>
    <div class="main-panel panel-item-customers">
      <Echarts
          ref="chart"
          :chartStyle="chartStyle"
          :grid="grid"
          :legend="barLegend"
          :series="chartSeries"
          :tooltip="tooltip"
          :xAxis="xAxis1"
          :yAxis="yAxis1"
          :options="{ backgroundColor: 'transparent', textStyle: { color: '#B8C8E0' } }"
          style="height: 260px"
        ref="chart"
        :chartStyle="chartStyle"
        :grid="grid"
        :legend="barLegend"
        :series="chartSeries"
        :tooltip="tooltip"
        :xAxis="xAxis1"
        :yAxis="yAxis1"
        :options="{ backgroundColor: 'transparent', textStyle: { color: '#B8C8E0' } }"
        style="height: 260px"
      />
    </div>
  </div>
@@ -29,28 +31,23 @@

const chartStyle = {
  width: '100%',
  height: '135%',
  height: '140%',
}

const grid = { left: '8%', right: '8%', bottom: '8%', top: '15%', containLabel: true }
const grid = { left: '3%', right: '4%', bottom: '3%', top: '10%', containLabel: true }

const barLegend = {
  show: true,
  top: '5%',
  left: 'center',
  textStyle: { color: '#B8C8E0', fontSize: 14 },
  itemGap: 30,
  textStyle: { color: '#B8C8E0' },
  data: ['合格', '不合格', '合格率'],
}

// æŸ±çŠ¶å›¾ï¼šåˆæ ¼ï¼ˆé»„色）、不合格（紫色）；折线图：合格率（蓝色）
const chartSeries = ref([
  {
    name: '合格',
    type: 'bar',
    barWidth: 20,
    barGap: '20%',
    yAxisIndex: 0,
    barGap: '40%',
    emphasis: { focus: 'series' },
    itemStyle: {
      color: {
@@ -60,8 +57,8 @@
        x2: 0,
        y2: 1,
        colorStops: [
          { offset: 0, color: 'rgba(255, 215, 0, 1)' }, // é‡‘黄色顶部
          { offset: 1, color: 'rgba(255, 215, 0, 0.5)' }, // åŠé€æ˜Žåº•éƒ¨
          { offset: 1, color: 'rgba(0, 164, 237, 0)' },
          { offset: 0, color: 'rgba(78, 228, 255, 1)' },
        ],
      },
    },
@@ -70,9 +67,8 @@
  {
    name: '不合格',
    type: 'bar',
    barGap: '20%',
    barGap: '40%',
    barWidth: 20,
    yAxisIndex: 0,
    emphasis: { focus: 'series' },
    itemStyle: {
      color: {
@@ -82,8 +78,8 @@
        x2: 0,
        y2: 1,
        colorStops: [
          { offset: 0, color: 'rgba(144, 97, 248, 1)' }, // ç´«è‰²é¡¶éƒ¨
          { offset: 1, color: 'rgba(144, 97, 248, 0.6)' }, // åŠé€æ˜Žåº•éƒ¨
          { offset: 1, color: 'rgba(83, 126, 245, 0.19)' },
          { offset: 0, color: 'rgba(144, 97, 248, 1)' },
        ],
      },
    },
@@ -93,87 +89,43 @@
    name: '合格率',
    type: 'line',
    yAxisIndex: 1,
    smooth: true,
    showSymbol: true,
    symbol: 'circle',
    symbolSize: 8,
    lineStyle: {
      color: 'rgba(78, 228, 255, 1)', // é’色
      width: 2,
    },
    itemStyle: {
      color: 'rgba(78, 228, 255, 1)',
      borderWidth: 2,
      borderColor: '#fff',
    },
    emphasis: {
      focus: 'series',
      itemStyle: {
        shadowBlur: 10,
        shadowColor: 'rgba(78, 228, 255, 0.8)',
      },
    },
    lineStyle: { color: 'rgba(90, 216, 166, 1)', width: 2 },
    itemStyle: { color: 'rgba(90, 216, 166, 1)' },
    data: [],
    emphasis: { focus: 'series' },
  },
])

const tooltip = {
  trigger: 'axis',
  axisPointer: { type: 'cross' },
  backgroundColor: 'rgba(0, 0, 0, 0.8)',
  borderColor: 'rgba(78, 228, 255, 0.5)',
  borderWidth: 1,
  textStyle: { color: '#B8C8E0' },
  formatter(params) {
    let result = params[0].axisValueLabel + '<br/>'
    params.forEach((item) => {
      let unit = ''
      if (item.seriesName === '合格率') {
        unit = '%'
      } else {
        unit = '件'
      }
      result += `<div style="margin: 4px 0;">${item.marker} ${item.seriesName}: ${item.value}${unit}</div>`
      const unit = item.seriesName === '合格率' ? '%' : '件'
      result += `<div>${item.marker} ${item.seriesName}: ${item.value}${unit}</div>`
    })
    return result
  },
}

const xAxis1 = ref([
  {
    type: 'category',
    axisTick: { show: false },
    axisLabel: { color: '#B8C8E0', fontSize: 12 },
    axisLine: { lineStyle: { color: 'rgba(184, 200, 224, 0.3)' } },
    data: [],
  },
  { type: 'category', axisTick: { show: false }, axisLabel: { color: '#B8C8E0' }, data: [] },
])

const yAxis1 = [
  { type: 'value', name: '件', axisLabel: { color: '#B8C8E0' }, nameTextStyle: { color: '#B8C8E0' } },
  {
    type: 'value',
    name: '单位: ä»¶',
    nameLocation: 'start',
    nameTextStyle: { color: '#B8C8E0', fontSize: 12, padding: [0, 0, 0, 10] },
    axisLabel: { color: '#B8C8E0', fontSize: 12 },
    axisLine: { show: false },
    splitLine: {
      show: true,
      lineStyle: { color: 'rgba(184, 200, 224, 0.2)', type: 'dashed' },
    },
  },
  {
    type: 'value',
    name: '单位: %',
    nameLocation: 'end',
    nameTextStyle: { color: '#B8C8E0', fontSize: 12, padding: [0, 0, 0, 10] },
    name: '合格率(%)',
    min: 0,
    max: 100,
    axisLabel: { color: '#B8C8E0', fontSize: 12, formatter: '{value}' },
    axisLine: { show: false },
    splitLine: {
      show: true,
      lineStyle: { color: 'rgba(184, 200, 224, 0.2)', type: 'dashed' },
    },
    axisLabel: { color: '#B8C8E0', formatter: '{value}%' },
    nameTextStyle: { color: '#B8C8E0' },
    splitLine: { lineStyle: { color: 'rgba(184, 200, 224, 0.2)' } },
  },
]

@@ -212,6 +164,13 @@
  position: relative;
  display: flex;
  align-items: center;
  width: 100%;
}

.chart-header-title {
  flex: 1;
  min-width: 0;
  width: 100%;
}

.warn-range {
@@ -247,8 +206,6 @@
  border: 1px solid #1a58b0;
  padding: 18px;
  width: 100%;
  height: 449px;
  position: relative;
  background: radial-gradient(circle at 50% 50%, rgba(78, 228, 255, 0.05) 0%, rgba(0, 0, 0, 0) 70%);
  height: 436px;
}
</style>

 src/views/reportAnalysis/qualityAnalysis/components/center-top.vue

@@ -117,6 +117,8 @@
  gap: 6px;
  font-size: 15px;
  color: #d0e7ff;
  white-space: nowrap;
  flex-wrap: nowrap;
}

.card-compare>span:first-child {

 src/views/reportAnalysis/qualityAnalysis/components/left-bottom.vue

ÎļþÒÑɾ³ý

 src/views/reportAnalysis/qualityAnalysis/components/left-top.vue

@@ -220,7 +220,7 @@
})
</script>

<style scoped>
<style scoped lang="scss">
.main-panel {
  display: flex;
  flex-direction: column;
@@ -304,7 +304,7 @@
  border: 1px solid #1a58b0;
  padding: 14px 18px;
  width: 100%;
  height: 960px;
  height: 958px;
  box-sizing: border-box;
}


 src/views/reportAnalysis/qualityAnalysis/components/right-bottom.vue

@@ -163,7 +163,7 @@
  border: 1px solid #1a58b0;
  padding: 18px;
  width: 100%;
  height: 420px;
  height: 449px;
}

.pie-chart-wrapper {

 src/views/reportAnalysis/qualityAnalysis/index.vue

@@ -43,7 +43,6 @@
<script setup>
import { ref, onMounted, onBeforeUnmount, nextTick } from 'vue'
import autofit from 'autofit.js'
import LeftBottom from './components/left-bottom.vue'
import CenterCenter from './components/center-center.vue'
import RightTop from './components/right-top.vue'
import RightBottom from './components/right-bottom.vue'

 src/views/safeProduction/accidentReportingRecord/index.vue

@@ -235,7 +235,7 @@
          <el-descriptions-item label="事故类型">
            <el-tag type="info">{{ accidentTypeLabel(currentKnowledge.accidentType) }}</el-tag>
          </el-descriptions-item>
          <el-descriptions-item label="人员伤亡情况">
          <el-descriptions-item label="人员损失情况">
            {{ currentKnowledge.personLoss }}
          </el-descriptions-item>
          <el-descriptions-item label="直接财产损失（元）">

 src/views/system/menu/index.vue

@@ -84,8 +84,8 @@
      </el-table>



      <!-- æ·»åŠ æˆ–修改菜单对话框 -->

      <el-dialog :title="title" v-model="open" width="680px" append-to-body>

         <el-form ref="menuRef" :model="form" :rules="rules" label-width="100px">

      <el-dialog :title="title" v-model="open" width="880px" append-to-body>

         <el-form ref="menuRef" :model="form" :rules="rules" label-width="130px">

            <el-row>

               <el-col :span="24">

                  <el-form-item label="上级菜单">

@@ -194,6 +194,19 @@
                        </span>

                     </template>

                     <el-input v-model="form.component" placeholder="请输入组件路径" />

                  </el-form-item>

               </el-col>

               <el-col :span="12" v-if="form.menuType == 'C'">

                  <el-form-item prop="appComponent">

                     <template #label>

                        <span>

                           <el-tooltip content="APP ç«¯è®¿é—®çš„组件路径，如：`app/system/user/index`" placement="top">

                              <el-icon><question-filled /></el-icon>

                           </el-tooltip>

                           APP组件路径

                        </span>

                     </template>

                     <el-input v-model="form.appComponent" placeholder="请输入 APP ç»„件路径（可选）" />

                  </el-form-item>

               </el-col>

               <el-col :span="12" v-if="form.menuType != 'M'">

@@ -316,7 +329,8 @@
  rules: {

    menuName: [{ required: true, message: "菜单名称不能为空", trigger: "blur" }],

    orderNum: [{ required: true, message: "菜单顺序不能为空", trigger: "blur" }],

    path: [{ required: true, message: "路由地址不能为空", trigger: "blur" }]

    path: [{ required: true, message: "路由地址不能为空", trigger: "blur" }],

    appComponent: [{ required: false, message: "APP组件路径不能为空", trigger: "blur" }]

  },

})



@@ -359,7 +373,8 @@
    isFrame: "1",

    isCache: "0",

    visible: "0",

    status: "0"

    status: "0",

    appComponent: undefined

  }

  proxy.resetForm("menuRef")

}


 src/views/system/user/index.vue

@@ -15,7 +15,7 @@
                </pane>

                <!--用户数据-->

                <pane size="84">

                    <el-col style="padding: 10px">

                    <el-col style="padding: 10px; height: 100%; display: flex; flex-direction: column;">

                        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">

                            <el-form-item label="登录账号" prop="userName">

                                <el-input v-model="queryParams.userName" placeholder="请输入登录账号" clearable style="width: 240px" @keyup.enter="handleQuery" />

@@ -56,45 +56,47 @@
                            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>

                        </el-row>

                        

                        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">

                            <el-table-column type="selection" width="50" align="center" />

                            <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />

                            <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />

                            <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />

                            <el-table-column label="部门" align="center" key="deptNames" prop="deptNames" v-if="columns[3].visible" :show-overflow-tooltip="true" />

                            <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />

                            <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">

                                <template #default="scope">

                                    <el-switch

                                        v-model="scope.row.status"

                                        active-value="0"

                                        inactive-value="1"

                                        @change="handleStatusChange(scope.row)"

                                    ></el-switch>

                                </template>

                            </el-table-column>

                            <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">

                                <template #default="scope">

                                    <span>{{ parseTime(scope.row.createTime) }}</span>

                                </template>

                            </el-table-column>

                            <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">

                                <template #default="scope">

                                    <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">

                                        <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>

                                    </el-tooltip>

                                    <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">

                                        <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>

                                    </el-tooltip>

                                    <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">

                                        <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>

                                    </el-tooltip>

                                    <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">

                                        <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>

                                    </el-tooltip>

                                </template>

                            </el-table-column>

                        </el-table>

                        <div style="flex: 1; overflow: hidden;">

                            <el-table v-loading="loading" :data="userList" height="100%" @selection-change="handleSelectionChange">

                                <el-table-column type="selection" width="50" align="center" />

                                <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />

                                <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />

                                <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />

                                <el-table-column label="部门" align="center" key="deptNames" prop="deptNames" v-if="columns[3].visible" :show-overflow-tooltip="true" />

                                <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />

                                <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">

                                    <template #default="scope">

                                        <el-switch

                                            v-model="scope.row.status"

                                            active-value="0"

                                            inactive-value="1"

                                            @change="handleStatusChange(scope.row)"

                                        ></el-switch>

                                    </template>

                                </el-table-column>

                                <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">

                                    <template #default="scope">

                                        <span>{{ parseTime(scope.row.createTime) }}</span>

                                    </template>

                                </el-table-column>

                                <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">

                                    <template #default="scope">

                                        <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">

                                            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>

                                        </el-tooltip>

                                        <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">

                                            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>

                                        </el-tooltip>

                                        <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">

                                            <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>

                                        </el-tooltip>

                                        <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">

                                            <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>

                                        </el-tooltip>

                                    </template>

                                </el-table-column>

                            </el-table>

                        </div>

                        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />

                    </el-col>

                </pane>