Merge remote-tracking branch 'origin/master'

 .env.prod

@@ -28,7 +28,7 @@
VITE_VIDEO_CAMERA_DOMAIN='10.88.4.131'

# 输出路径
VITE_OUT_DIR=dist
VITE_OUT_DIR=plat

# 公共静态文件路径
VITE_STATIC_DIR=/plat/

 public/template/模型参数导入模板.xlsx

Binary files differ

 src/main.ts

@@ -64,6 +64,8 @@

import lifecycles from '@/utils/lifecycles' // 生命周期函数

import * as ElementPlusIconsVue from '@element-plus/icons-vue'

// import credentialsFetch from "@/utils/fetch";

const isProduction = process.env.NODE_ENV === "production";
@@ -72,6 +74,10 @@
const setupAll = async () => {
  const app = createApp(App)

  for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
    app.component(key, component)
  }

  await setupI18n(app)

  setupStore(app)

 src/views/data/ind/data/DataSetForm.vue

@@ -21,7 +21,7 @@
        </el-select>
      </el-form-item>
      <el-form-item label="查询语句" prop="querySql">
        <el-input v-model="formData.querySql" placeholder="请输入内容" type="textarea" maxlength="500"
        <el-input v-model="formData.querySql" placeholder="请输入内容" type="textarea" maxlength="5000"
                  :rows="6"
                  @input="checkSensitiveWords"
                  show-word-limit spellcheck="false"/>

 src/views/data/ind/item/DerIndDefineForm.vue

@@ -123,6 +123,19 @@
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="6" v-if="['LAST_MONTH_12','THIS_MONTH','LAST_MONTH'].includes(formData.derItem.timeLimit)">
          <el-form-item label="月周期开始日" prop="monthStart">
            <div style="display: flex;flex-direction: row;align-items: center">
              <el-input-number v-model="formData.derItem.monthStart" :min="-28" :max="28" />
              <el-tooltip content="正数代表当前月，负数代表上月。例：-26代表上月26号为本月开始日期" placement="top">
                <div style="margin-left: 4px;display: flex;align-items: center">
                  <el-icon :size="20"><QuestionFilled /></el-icon>
                </div>
              </el-tooltip>
            </div>

          </el-form-item>
        </el-col>
      </el-row>
      <el-row v-if="showTimeChange">
        <el-col :span="6">

 src/views/data/point/DaPointForm.vue

@@ -499,7 +499,7 @@
    unittransfactor: 1,
    defaultValue: 0,
    maxValue: 100000000,
    minValue: 0,
    minValue: -100000000,
    minfreqid: undefined,
    remark: undefined,
    isEnable: 1,

 src/views/model/sche/scheme/ScheduleSchemeForm.vue

@@ -89,6 +89,13 @@
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="12">
          <el-form-item label="预警调整速率" prop="warningAdjustRate">
            <el-input-number v-model="formData.warningAdjustRate" :min="0" clearable controls-position="right" placeholder="请输入预警调整速率"/>
          </el-form-item>
        </el-col>
      </el-row>
      <el-row>
        <el-col :span="24">
          <el-form-item label="备注" prop="remark">
            <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea"
@@ -134,6 +141,7 @@
  status: 0,
  mpkprojectid: undefined,
  adjustRate: undefined,
  warningAdjustRate: undefined,
})
const formRules = reactive({
  code: [{required: true, message: '编号不能为空', trigger: 'blur'}],
@@ -240,7 +248,8 @@
    remark: undefined,
    status: CommonStatusEnum.ENABLE,
    mpkprojectid: undefined,
    adjustRate: undefined
    adjustRate: undefined,
    warningAdjustRate: undefined,
  }
  formRef.value?.resetFields()
}