f388ea8993f8e1a0673d291a301b9eb78d61e86d..32bab65e8d9ebbf49e9b97bcf3aa2bfee3783282
8 天以前 gaoluyang
时间修改
32bab6 对比 | 目录
8 天以前 gaoluyang
时间修改
90b729 对比 | 目录
已修改20个文件
171 ■■■■ 文件已修改
.env.development 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.env.production 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.env.staging 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
index.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
package.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/layout/components/Sidebar/Logo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/collaborativeApproval/attendanceManagement/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/collaborativeApproval/knowledgeBase/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/collaborativeApproval/meetingBoard/index.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/collaborativeApproval/noticeManagement/index.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/collaborativeApproval/notificationManagement/index.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/collaborativeApproval/rpaManagement/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/energyManagement/dynamicEnergySaving/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/energyManagement/meterCollection/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/gasTank/simple.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/equipmentManagement/upkeep/Modal/MaintenanceModal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inventoryManagement/stockWarning/index.vue 64 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/login.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productionManagement/safetyMonitoring/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vite.config.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.env.development
@@ -1,8 +1,8 @@
# 页面标题
VITE_APP_TITLE = 芯导云(管理信息系统)
VITE_APP_TITLE = 基智油井管理系统
# 开发环境配置
VITE_APP_ENV = 'development'
# 芯导云(管理信息系统)/开发环境
# 基智油井管理系统/开发环境
VITE_APP_BASE_API = '/dev-api'
.env.production
@@ -1,10 +1,10 @@
# 页面标题
VITE_APP_TITLE = 芯导云(管理信息系统)
VITE_APP_TITLE = 基智油井管理系统
# 生产环境配置
VITE_APP_ENV = 'production'
# 芯导云(管理信息系统)/生产环境
# 基智油井管理系统/生产环境
VITE_APP_BASE_API = '/prod-api'
# 是否在打包时开启压缩,支持 gzip 和 brotli
.env.staging
@@ -1,10 +1,10 @@
# 页面标题
VITE_APP_TITLE = 芯导云(管理信息系统)
VITE_APP_TITLE = 基智油井管理系统
# 生产环境配置
VITE_APP_ENV = 'staging'
# 芯导云(管理信息系统)/生产环境
# 基智油井管理系统/生产环境
VITE_APP_BASE_API = '/stage-api'
# 是否在打包时开启压缩,支持 gzip 和 brotli
index.html
@@ -6,8 +6,8 @@
  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
  <meta name="renderer" content="webkit">
  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
  <link rel="icon" href="/favicon.ico">
  <title>芯导云(管理信息系统)</title>
  <link rel="icon" href="/JZYJico.ico">
  <title>基智油井管理系统</title>
  <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
  <style>
    html,
package.json
@@ -1,7 +1,7 @@
{
  "name": "ruoyi",
  "version": "3.8.9",
  "description": "芯导云(管理信息系统)",
  "description": "基智油井管理系统",
  "author": "若依",
  "license": "MIT",
  "type": "module",
src/layout/components/Sidebar/Logo.vue
@@ -16,7 +16,7 @@
<script setup>
import { ref, computed, onMounted, watch } from 'vue'
import useUserStore from '@/store/modules/user'
import defaultLogo from '@/assets/logo/logo.png' // 导入默认logo
import defaultLogo from '@/assets/indexViews/JZYJLogo.png' // 导入默认logo
defineProps({
  collapse: {
src/views/collaborativeApproval/attendanceManagement/index.vue
@@ -353,9 +353,9 @@
// 模拟数据
const holidayData = ref([
  { id: '1', name: '春节', type: 'legal', startDate: '2024-02-10', endDate: '2024-02-17', days: 8, status: 'active' },
  { id: '2', name: '清明节', type: 'legal', startDate: '2024-04-05', endDate: '2024-04-05', days: 1, status: 'active' },
  { id: '3', name: '劳动节', type: 'legal', startDate: '2024-05-01', endDate: '2024-05-05', days: 5, status: 'active' }
  { id: '1', name: '春节', type: 'legal', startDate: '2025-02-10', endDate: '2025-02-17', days: 8, status: 'active' },
  { id: '2', name: '清明节', type: 'legal', startDate: '2025-04-05', endDate: '2025-04-05', days: 1, status: 'active' },
  { id: '3', name: '劳动节', type: 'legal', startDate: '2025-05-01', endDate: '2025-05-05', days: 5, status: 'active' }
])
const annualData = ref([
src/views/collaborativeApproval/knowledgeBase/index.vue
@@ -412,7 +412,7 @@
    keyPoints: "绿色通道条件,简化流程,审批权限,时间控制",
    creator: "张经理",
    usageCount: 15,
    createTime: "2024-01-15 10:30:00"
    createTime: "2025-01-15 10:30:00"
  },
  {
    id: "2",
@@ -425,7 +425,7 @@
    keyPoints: "项目协调,定期会议,统一意见,负责人制度",
    creator: "李主管",
    usageCount: 8,
    createTime: "2024-01-14 15:20:00"
    createTime: "2025-01-14 15:20:00"
  },
  {
    id: "3",
@@ -438,7 +438,7 @@
    keyPoints: "紧急分级,标准制定,流程简化,及时处理",
    creator: "王专员",
    usageCount: 12,
    createTime: "2024-01-13 09:15:00"
    createTime: "2025-01-13 09:15:00"
  }
];
src/views/collaborativeApproval/meetingBoard/index.vue
@@ -161,8 +161,8 @@
    id: 1,
    title: '产品开发周会',
    status: 'ongoing',
    startTime: '2024-01-15 09:00:00',
    endTime: '2024-01-15 10:30:00',
    startTime: '2025-01-15 09:00:00',
    endTime: '2025-01-15 10:30:00',
    location: '会议室A',
    host: '张经理',
    participants: ['张经理', '李工程师', '王设计师', '赵测试员'],
@@ -177,8 +177,8 @@
    id: 2,
    title: '客户需求评审会',
    status: 'upcoming',
    startTime: '2024-01-15 14:00:00',
    endTime: '2024-01-15 15:00:00',
    startTime: '2025-01-15 14:00:00',
    endTime: '2025-01-15 15:00:00',
    location: '线上会议',
    host: '陈总监',
    participants: ['陈总监', '刘产品经理', '孙客户经理', '客户代表'],
@@ -192,8 +192,8 @@
    id: 3,
    title: '团队建设活动',
    status: 'completed',
    startTime: '2024-01-14 16:00:00',
    endTime: '2024-01-14 18:00:00',
    startTime: '2025-01-14 16:00:00',
    endTime: '2025-01-14 18:00:00',
    location: '公司大厅',
    host: '人事部',
    participants: ['全体员工'],
src/views/collaborativeApproval/noticeManagement/index.vue
@@ -277,7 +277,7 @@
    noticeContent: "根据国务院办公厅通知,2024年春节放假安排如下:2月10日(初一)至2月17日(初八)放假调休,共8天。2月4日(星期日)、2月18日(星期日)上班。请各部门提前做好工作安排。",
    remark: "放假期间请保持手机畅通,如有紧急事务及时联系",
    createBy: "人事部",
    createTime: "2024-01-15 10:30:00"
    createTime: "2025-01-15 10:30:00"
  },
  {
    id: 2,
@@ -288,7 +288,7 @@
    noticeContent: "根据国务院办公厅通知,2024年清明节放假安排如下:4月4日(星期四)至4月6日(星期六)放假调休,共3天。4月7日(星期日)上班。",
    remark: "请各部门做好值班安排,确保节日期间各项工作正常运转",
    createBy: "行政部",
    createTime: "2024-01-14 14:20:00"
    createTime: "2025-01-14 14:20:00"
  },
  {
    id: 3,
@@ -299,7 +299,7 @@
    noticeContent: "根据国务院办公厅通知,2024年劳动节放假安排如下:5月1日(星期三)至5月5日(星期日)放假调休,共5天。4月28日(星期日)、5月11日(星期六)上班。",
    remark: "放假前请关闭电源,锁好门窗,注意安全",
    createBy: "行政部",
    createTime: "2024-01-13 09:15:00"
    createTime: "2025-01-13 09:15:00"
  },
  {
    id: 4,
@@ -310,7 +310,7 @@
    noticeContent: "根据国务院办公厅通知,2024年端午节放假安排如下:6月8日(星期六)至6月10日(星期一)放假调休,共3天。6月11日(星期二)上班。",
    remark: "祝大家端午节快乐,阖家幸福!",
    createBy: "行政部",
    createTime: "2024-01-12 16:30:00"
    createTime: "2025-01-12 16:30:00"
  },
  {
    id: 5,
@@ -321,7 +321,7 @@
    noticeContent: "根据国务院办公厅通知,2024年中秋节放假安排如下:9月15日(星期日)至9月17日(星期二)放假调休,共3天。9月14日(星期六)上班。",
    remark: "中秋佳节,祝大家团圆美满,幸福安康!",
    createBy: "行政部",
    createTime: "2024-01-11 11:20:00"
    createTime: "2025-01-11 11:20:00"
  },
  {
    id: 6,
@@ -332,7 +332,7 @@
    noticeContent: "根据国务院办公厅通知,2024年国庆节放假安排如下:10月1日(星期二)至10月7日(星期一)放假调休,共7天。9月29日(星期日)、10月12日(星期六)上班。",
    remark: "国庆期间请各部门做好值班安排,确保安全稳定",
    createBy: "行政部",
    createTime: "2024-01-10 15:45:00"
    createTime: "2025-01-10 15:45:00"
  },
  {
    id: 7,
@@ -343,7 +343,7 @@
    noticeContent: "A车间生产线将于2024年1月20日(周六)进行年度检修维护,预计停工8小时。检修内容包括:设备清洁、润滑保养、安全装置检查等。请生产部门提前调整生产计划。",
    remark: "维修期间请相关人员配合,确保检修工作安全顺利进行",
    createBy: "设备部",
    createTime: "2024-01-14 14:20:00"
    createTime: "2025-01-14 14:20:00"
  },
  {
    id: 8,
@@ -354,7 +354,7 @@
    noticeContent: "B车间关键设备将于2024年1月25日进行预防性维护,预计停工4小时。维护内容包括:设备检查、零件更换、性能测试等。请相关部门配合。",
    remark: "维护完成后将进行试运行,确保设备正常运行",
    createBy: "设备部",
    createTime: "2024-01-13 09:15:00"
    createTime: "2025-01-13 09:15:00"
  }
];
src/views/collaborativeApproval/notificationManagement/index.vue
@@ -567,9 +567,9 @@
    status: "published",
    content: "根据国家规定,结合公司实际情况,现将2024年春节放假安排通知如下...",
    departments: ["技术部", "销售部", "人事部", "财务部", "运营部", "市场部", "客服部"],
    expireDate: "2024-02-15",
    expireDate: "2025-02-15",
    syncMethods: ["wechat", "dingtalk", "email"],
    createTime: "2024-01-15 10:30:00"
    createTime: "2025-01-15 10:30:00"
  },
  {
    id: "2",
@@ -579,9 +579,9 @@
    status: "published",
    content: "技术部定于每周五下午2点召开周例会,请各位同事准时参加...",
    departments: ["技术部"],
    expireDate: "2024-01-20",
    expireDate: "2025-01-20",
    syncMethods: ["wechat", "dingtalk"],
    createTime: "2024-01-14 15:20:00"
    createTime: "2025-01-14 15:20:00"
  },
  {
    id: "3",
@@ -591,9 +591,9 @@
    status: "draft",
    content: "为维护公司正常秩序,规范员工行为,现对违反公司规定的行为进行处罚...",
    departments: ["人事部", "技术部", "销售部"],
    expireDate: "2024-02-13",
    expireDate: "2025-02-13",
    syncMethods: ["wechat", "email"],
    createTime: "2024-01-13 09:15:00"
    createTime: "2025-01-13 09:15:00"
  }
];
src/views/collaborativeApproval/rpaManagement/index.vue
@@ -215,21 +215,21 @@
    programName: "订单处理RPA",
    status: "running",
    description: "自动处理客户订单,包括验证、分配和确认",
    createTime: "2024-01-15 10:30:00"
    createTime: "2025-01-15 10:30:00"
  },
  {
    id: "2",
    programName: "库存同步RPA",
    status: "stopped",
    description: "同步多个仓库的库存数据,确保数据一致性",
    createTime: "2024-01-14 15:20:00"
    createTime: "2025-01-14 15:20:00"
  },
  {
    id: "3",
    programName: "报表生成RPA",
    status: "error",
    description: "自动生成每日销售报表和库存报表",
    createTime: "2024-01-13 09:15:00"
    createTime: "2025-01-13 09:15:00"
  }
];
src/views/energyManagement/dynamicEnergySaving/index.vue
@@ -237,21 +237,21 @@
    version: 'v2.1.0',
    status: 'active',
    accuracy: '94.2%',
    lastUpdate: '2024-01-15 14:30:00'
    lastUpdate: '2025-01-15 14:30:00'
  },
  {
    modelName: '地层压力预测模型',
    version: 'v1.8.5',
    status: 'active',
    accuracy: '91.7%',
    lastUpdate: '2024-01-14 09:15:00'
    lastUpdate: '2025-01-14 09:15:00'
  },
  {
    modelName: '能耗分析模型',
    version: 'v2.0.3',
    status: 'standby',
    accuracy: '89.3%',
    lastUpdate: '2024-01-13 16:45:00'
    lastUpdate: '2025-01-13 16:45:00'
  }
])
src/views/energyManagement/meterCollection/index.vue
@@ -227,7 +227,7 @@
        power: '75.5',
        powerFactor: '0.85',
        status: '正常',
        lastUpdateTime: '2024-01-15 10:30:00'
        lastUpdateTime: '2025-01-15 10:30:00'
      },
      {
        id: 2,
@@ -241,7 +241,7 @@
        power: '45.2',
        powerFactor: '0.92',
        status: '正常',
        lastUpdateTime: '2024-01-15 10:25:00'
        lastUpdateTime: '2025-01-15 10:25:00'
      }
    ]
    this.pagination.total = this.meterList.length
@@ -408,7 +408,7 @@
        power: '50.0',
        powerFactor: '0.85',
        status: '正常',
        lastUpdateTime: '2024-01-15 12:00:00'
        lastUpdateTime: '2025-01-15 12:00:00'
      }
      this.detailDialogVisible = true
    },
src/views/equipmentManagement/gasTank/simple.vue
@@ -233,7 +233,7 @@
const maintenanceRecords = ref([
  {
    id: 1,
    date: '2024-01-15',
    date: '2025-01-15',
    type: 'inspection',
    title: '年度检验',
    description: '按照TSG 21-2016标准进行年度检验,设备状态良好',
@@ -241,7 +241,7 @@
  },
  {
    id: 2,
    date: '2024-02-20',
    date: '2025-02-20',
    type: 'maintenance',
    title: '安全阀维护',
    description: '更换安全阀密封圈,校准压力设定值',
@@ -249,7 +249,7 @@
  },
  {
    id: 3,
    date: '2024-03-10',
    date: '2025-03-10',
    type: 'inspection',
    title: '压力测试',
    description: '进行压力容器水压试验,符合设计要求',
src/views/equipmentManagement/upkeep/Modal/MaintenanceModal.vue
@@ -30,7 +30,7 @@
  modalOptions,
  handleConfirm,
  closeModal,
} = useModal({ title: "设备维修" });
} = useModal({ title: "设备保养" });
/**
 * @desc 保存保养
src/views/inventoryManagement/stockWarning/index.vue
@@ -558,11 +558,11 @@
      warningLevel: '紧急',
      warningThreshold: 20,
      isEnabled: true,
      warningTime: '2024-01-15 08:30:00',
      warningTime: '2025-01-15 08:30:00',
      warningDuration: 3,
      lastUpdateTime: '2024-01-15 10:00:00',
      expectedRefillTime: '2024-01-16 14:00:00',
      expectedShortageTime: '2024-01-15 18:30:00', // 今天下午6:30缺气
      lastUpdateTime: '2025-01-15 10:00:00',
      expectedRefillTime: '2025-01-16 14:00:00',
      expectedShortageTime: '2025-01-15 18:30:00', // 今天下午6:30缺气
      warningRule: '当气体量低于20%时触发预警'
    },
    {
@@ -581,11 +581,11 @@
      warningLevel: '重要',
      warningThreshold: 10,
      isEnabled: true,
      warningTime: '2024-01-14 16:20:00',
      warningTime: '2025-01-14 16:20:00',
      warningDuration: 2,
      lastUpdateTime: '2024-01-15 09:15:00',
      expectedRefillTime: '2024-01-17 09:00:00',
      expectedShortageTime: '2024-01-18 12:00:00', // 3天后缺气
      lastUpdateTime: '2025-01-15 09:15:00',
      expectedRefillTime: '2025-01-17 09:00:00',
      expectedShortageTime: '2025-01-18 12:00:00', // 3天后缺气
      warningRule: '当压力超过8MPa时触发预警'
    },
    {
@@ -604,11 +604,11 @@
      warningLevel: '一般',
      warningThreshold: 5,
      isEnabled: true,
      warningTime: '2024-01-13 11:45:00',
      warningTime: '2025-01-13 11:45:00',
      warningDuration: 1,
      lastUpdateTime: '2024-01-15 08:45:00',
      expectedRefillTime: '2024-01-20 10:00:00',
      expectedShortageTime: '2024-01-22 15:30:00', // 7天后缺气
      lastUpdateTime: '2025-01-15 08:45:00',
      expectedRefillTime: '2025-01-20 10:00:00',
      expectedShortageTime: '2025-01-22 15:30:00', // 7天后缺气
      warningRule: '当温度超过60°C时触发预警'
    },
    {
@@ -627,11 +627,11 @@
      warningLevel: '紧急',
      warningThreshold: 15,
      isEnabled: true,
      warningTime: '2024-01-15 07:15:00',
      warningTime: '2025-01-15 07:15:00',
      warningDuration: 4,
      lastUpdateTime: '2024-01-15 11:30:00',
      expectedRefillTime: '2024-01-15 16:00:00',
      expectedShortageTime: '2024-01-15 14:00:00', // 今天下午2点缺气
      lastUpdateTime: '2025-01-15 11:30:00',
      expectedRefillTime: '2025-01-15 16:00:00',
      expectedShortageTime: '2025-01-15 14:00:00', // 今天下午2点缺气
      warningRule: '当检测到气体泄漏时触发预警'
    },
    {
@@ -650,11 +650,11 @@
      warningLevel: '重要',
      warningThreshold: 20,
      isEnabled: false,
      warningTime: '2024-01-14 14:30:00',
      warningTime: '2025-01-14 14:30:00',
      warningDuration: 2,
      lastUpdateTime: '2024-01-15 09:00:00',
      expectedRefillTime: '2024-01-19 08:00:00',
      expectedShortageTime: '2024-01-21 10:00:00', // 6天后缺气
      lastUpdateTime: '2025-01-15 09:00:00',
      expectedRefillTime: '2025-01-19 08:00:00',
      expectedShortageTime: '2025-01-21 10:00:00', // 6天后缺气
      warningRule: '当气体量低于20%时触发预警'
    },
    {
@@ -673,11 +673,11 @@
      warningLevel: '一般',
      warningThreshold: 8,
      isEnabled: true,
      warningTime: '2024-01-12 09:20:00',
      warningTime: '2025-01-12 09:20:00',
      warningDuration: 1,
      lastUpdateTime: '2024-01-15 08:30:00',
      expectedRefillTime: '2024-01-25 14:00:00',
      expectedShortageTime: '2024-01-28 16:00:00', // 13天后缺气
      lastUpdateTime: '2025-01-15 08:30:00',
      expectedRefillTime: '2025-01-25 14:00:00',
      expectedShortageTime: '2025-01-28 16:00:00', // 13天后缺气
      warningRule: '当压力超过8MPa时触发预警'
    },
    {
@@ -696,11 +696,11 @@
      warningLevel: '重要',
      warningThreshold: 6,
      isEnabled: true,
      warningTime: '2024-01-11 16:45:00',
      warningTime: '2025-01-11 16:45:00',
      warningDuration: 1,
      lastUpdateTime: '2024-01-15 07:45:00',
      expectedRefillTime: '2024-01-30 09:00:00',
      expectedShortageTime: '2024-02-05 12:00:00', // 21天后缺气
      lastUpdateTime: '2025-01-15 07:45:00',
      expectedRefillTime: '2025-01-30 09:00:00',
      expectedShortageTime: '2025-02-05 12:00:00', // 21天后缺气
      warningRule: '当温度超过60°C时触发预警'
    },
    {
@@ -719,11 +719,11 @@
      warningLevel: '紧急',
      warningThreshold: 12,
      isEnabled: true,
      warningTime: '2024-01-15 06:30:00',
      warningTime: '2025-01-15 06:30:00',
      warningDuration: 5,
      lastUpdateTime: '2024-01-15 12:15:00',
      expectedRefillTime: '2024-01-15 20:00:00',
      expectedShortageTime: '2024-01-15 17:30:00', // 今天下午5:30缺气
      lastUpdateTime: '2025-01-15 12:15:00',
      expectedRefillTime: '2025-01-15 20:00:00',
      expectedShortageTime: '2025-01-15 17:30:00', // 今天下午5:30缺气
      warningRule: '当检测到气体泄漏时触发预警'
    }
  ]
src/views/login.vue
@@ -181,7 +181,7 @@
<style lang='scss' scoped>
.login {
  height: 100%;
  background-image: url("../assets/images/login-background.png");
  background-image: url("../assets/indexViews/JZYJView.png");
  background-size: cover;
  position: relative;
}
src/views/productionManagement/safetyMonitoring/index.vue
@@ -295,7 +295,7 @@
            emergencyRecords: [
                {
                    id: 'EM001',
                    time: '2024-01-15 14:35:12',
                    time: '2025-01-15 14:35:12',
                    location: '储罐T-003',
                    type: '甲烷超标',
                    status: 'resolved',
@@ -303,7 +303,7 @@
                },
                {
                    id: 'EM002',
                    time: '2024-01-15 14:35:15',
                    time: '2025-01-15 14:35:15',
                    location: '压缩机C-002',
                    type: '硫化氢超标',
                    status: 'processing',
vite.config.js
@@ -9,7 +9,8 @@
  const baseUrl =
    VITE_APP_ENV == "development"
      ? "http://114.132.189.42:8089" // 开发环境后端接口
      : "http://114.132.189.42:7003"; // 生产环境后端接口
      // : "http://114.132.189.42:8068"; // 韦德实业生产环境后端接口
      : "http://114.132.189.42:8078"; // 基智油井生产环境后端接口
  return {
    // 部署生产环境和开发环境下的URL。