houzhongjian
2024-11-21 019e51eac5228b87f85b4602cd21bc7f5c5d7665
Merge remote-tracking branch 'origin/master'

# Conflicts:
# .env.dev
已修改12个文件
119 ■■■■■ 文件已修改
.env.dev 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.env.local 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.env.test 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/data/channel/http/api/tag/index.vue 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/data/channel/kio/tag/index.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/data/channel/modbus/tag/index.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/data/channel/opcda/tag/index.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/data/channel/opcua/tag/index.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/model/mpk/file/MpkForm.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/model/mpk/file/MpkRun.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/model/mpk/icon/index.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
types/env.d.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.env.dev
@@ -29,8 +29,14 @@
# 输出路径
VITE_OUT_DIR=dist
# 公共静态文件路径
VITE_STATIC_DIR=/
# 商城H5会员端域名iai
VITE_MALL_H5_DOMAIN='http://'
# 验证码的开关
VITE_APP_CAPTCHA_ENABLE=false
# MDK模型上传路径
MDK_UPLOAD_URL='http://localhost:48080/admin-api/model//pre/item/upload-model'
.env.local
@@ -26,6 +26,9 @@
# 打包路径
VITE_BASE_PATH=/plat
# 公共静态文件路径
VITE_STATIC_DIR=/
# 商城H5会员端域名
VITE_MALL_H5_DOMAIN='http://localhost:3000'
.env.test
@@ -33,7 +33,7 @@
VITE_OUT_DIR=dist
# 公共静态文件路径
VITE_STATIC_DIR=plat/
VITE_STATIC_DIR=/plat/
# 商城H5会员端域名
VITE_MALL_H5_DOMAIN='http://'
src/views/data/channel/http/api/tag/index.vue
@@ -1,7 +1,7 @@
<template>
  <el-drawer
    v-model="drawer"
    size="50%"
    size="60%"
    title="Http Tag"
    :direction="direction"
    :before-close="handleClose"
@@ -107,20 +107,22 @@
          label="数据值"
          header-align="center"
          align="center"
          min-width="100"
          :formatter="(row) => {if (row.dataValue === -2.0) {return '--';}return row.dataValue;}"
        />
        <el-table-column
          prop="quality"
          prop="dataTime"
          label="数据时间"
          header-align="center"
          align="center"
          min-width="150"
        />
        <el-table-column
          prop="dataQuality"
          label="数据质量"
          header-align="center"
          align="center"
        >
          <template #default="scope">
            <el-tag v-if="scope.row.dataValue === Number(-2.0)" type="danger" size="small">bad
            </el-tag>
            <el-tag v-else size="small">good</el-tag>
          </template>
        </el-table-column>
        />
        <el-table-column label="操作" align="center" min-width="110" fixed="right">
          <template #default="scope">
            <el-button
src/views/data/channel/kio/tag/index.vue
@@ -1,7 +1,7 @@
<template>
  <el-drawer
    v-model="drawer"
    size="50%"
    size="60%"
    title="Kio Tag"
    :direction="direction"
    :before-close="handleClose"
@@ -105,19 +105,22 @@
          label="数据值"
          header-align="center"
          align="center"
          min-width="100"
          :formatter="(row) => {if (row.dataValue === -2.0) {return '--';}return row.dataValue;}"
        />
        <el-table-column
          prop="quality"
          prop="dataTime"
          label="数据时间"
          header-align="center"
          align="center"
          min-width="150"
        />
        <el-table-column
          prop="dataQuality"
          label="数据质量"
          header-align="center"
          align="center"
        >
          <template #default="scope">
            <el-tag v-if="scope.row.dataValue === Number(-2.0)" type="danger" size="small">bad</el-tag>
            <el-tag v-else size="small">good</el-tag>
          </template>
        </el-table-column>
        />
        <el-table-column label="操作" align="center" min-width="110" fixed="right">
          <template #default="scope">
            <el-button
src/views/data/channel/modbus/tag/index.vue
@@ -1,7 +1,7 @@
<template>
  <el-drawer
    v-model="drawer"
    size="50%"
    size="60%"
    title="ModBus Tag"
    :direction="direction"
    :before-close="handleClose"
@@ -133,19 +133,22 @@
          label="数据值"
          header-align="center"
          align="center"
          min-width="100"
          :formatter="(row) => {if (row.dataValue === -2.0) {return '--';}return row.dataValue;}"
        />
        <el-table-column
          prop="quality"
          prop="dataTime"
          label="数据时间"
          header-align="center"
          align="center"
          min-width="150"
        />
        <el-table-column
          prop="dataQuality"
          label="数据质量"
          header-align="center"
          align="center"
        >
          <template #default="scope">
            <el-tag v-if="scope.row.dataValue === Number(-2.0)" type="danger" size="small">bad</el-tag>
            <el-tag v-else size="small">good</el-tag>
          </template>
        </el-table-column>
        />
        <el-table-column label="操作" align="center" min-width="110" fixed="right">
          <template #default="scope">
            <el-button
src/views/data/channel/opcda/tag/index.vue
@@ -1,7 +1,7 @@
<template>
  <el-drawer
    v-model="drawer"
    size="50%"
    size="60%"
    title="OpcDA Tag"
    :direction="direction"
    :before-close="handleClose"
@@ -98,19 +98,22 @@
          label="数据值"
          header-align="center"
          align="center"
          min-width="100"
          :formatter="(row) => {if (row.dataValue === -2.0) {return '--';}return row.dataValue;}"
        />
        <el-table-column
          prop="quality"
          prop="dataTime"
          label="数据时间"
          header-align="center"
          align="center"
          min-width="150"
        />
        <el-table-column
          prop="dataQuality"
          label="数据质量"
          header-align="center"
          align="center"
        >
          <template #default="scope">
            <el-tag v-if="scope.row.dataValue === Number(-2.0)" type="danger" size="small">bad</el-tag>
            <el-tag v-else size="small">good</el-tag>
          </template>
        </el-table-column>
        />
        <el-table-column label="操作" align="center" min-width="110" fixed="right">
          <template #default="scope">
            <el-button
src/views/data/channel/opcua/tag/index.vue
@@ -1,7 +1,7 @@
<template>
  <el-drawer
    v-model="drawer"
    size="50%"
    size="60%"
    title="Opcua Tag"
    :direction="direction"
    :before-close="handleClose"
@@ -119,19 +119,22 @@
          label="数据值"
          header-align="center"
          align="center"
          min-width="100"
          :formatter="(row) => {if (row.dataValue === -2.0) {return '--';}return row.dataValue;}"
        />
        <el-table-column
          prop="quality"
          prop="dataTime"
          label="数据时间"
          header-align="center"
          align="center"
          min-width="150"
        />
        <el-table-column
          prop="dataQuality"
          label="数据质量"
          header-align="center"
          align="center"
        >
          <template #default="scope">
            <el-tag v-if="scope.row.dataValue === Number(-2.0)" type="danger" size="small">bad</el-tag>
            <el-tag v-else size="small">good</el-tag>
          </template>
        </el-table-column>
        />
        <el-table-column label="操作" align="center" min-width="110" fixed="right">
          <template #default="scope">
            <el-button
src/views/model/mpk/file/MpkForm.vue
@@ -116,7 +116,7 @@
                      float: right;
                      color: var(--el-text-color-secondary);
                      font-size: 13px;">
                    <img :src="'/SimtreeUnitImage/' + item.iconName" style="height: 24px;" :alt=" item.iconDesc" />
                    <img :src="staticDir + 'SimtreeUnitImage/' + item.iconName" style="height: 24px;" :alt=" item.iconDesc" />
                  </span>
                </el-option>
              </el-select>
@@ -268,6 +268,8 @@
  const route = useRoute() // 路由
  const router = useRouter();
  const staticDir = ref(import.meta.env.VITE_STATIC_DIR)
  const treeData = ref([])
  const iconList = ref([] as MpkIconApi.MpkIconVO)
  const pkgNameList = ref([] as MpkPackApi.MpkPackVO)
src/views/model/mpk/file/MpkRun.vue
@@ -36,7 +36,7 @@
      <el-divider content-position="left">模型参数信息</el-divider>
      <el-row :gutter="20">
        <el-col :span="2" style="margin-bottom: 10px;margin-left: 20px">
          <el-button tag="a" href="/template/模型参数导入模板.xlsx" download="模型参数导入模板.xlsx" style="text-decoration: none;" type="primary" size="small" link>模板下载</el-button>
          <el-button tag="a" :href="staticDir + '/template/模型参数导入模板.xlsx'" download="模型参数导入模板.xlsx" style="text-decoration: none;" type="primary" size="small" link>模板下载</el-button>
        </el-col>
        <el-col :span="2" style="margin-bottom: 10px;">
          <el-upload
@@ -116,6 +116,7 @@
  import * as MpkApi from '@/api/model/mpk/mpk'
  import {FormRules} from "element-plus";
  import {getAccessToken, getTenantId} from "@/utils/auth";
  const staticDir = ref(import.meta.env.VITE_STATIC_DIR)
  const { t } = useI18n() // 国际化
  const message = useMessage() // 消息弹窗
src/views/model/mpk/icon/index.vue
@@ -50,7 +50,7 @@
      <el-table-column prop="iconDesc" label="描述"/>
      <el-table-column align="center" label="图标" prop="icon" width="100">
        <template #default="scope">
          <img :src="'/SimtreeUnitImage/' + scope.row.iconName" class="mpk-icon-list" :alt=" scope.row.iconDesc" />
          <img :src="staticDir + 'SimtreeUnitImage/' + scope.row.iconName" class="mpk-icon-list" :alt=" scope.row.iconDesc" />
        </template>
      </el-table-column>
      <el-table-column prop="sort" label="排序"/>
@@ -91,6 +91,8 @@
defineOptions({name: 'MpkIcon'})
const staticDir = ref(import.meta.env.VITE_STATIC_DIR)
const message = useMessage() // 消息弹窗
const {t} = useI18n() // 国际化
types/env.d.ts
@@ -30,6 +30,7 @@
  readonly VITE_DROP_CONSOLE: string
  readonly VITE_SOURCEMAP: string
  readonly VITE_OUT_DIR: string
  readonly VITE_STATIC_DIR: string
}
declare global {