From e320cece8a6e4321453e6b9c4736860997731646 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 02 四月 2025 10:03:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/ind/data/DataSetForm.vue | 2 +-
public/template/模型参数导入模板.xlsx | 0
src/views/model/sche/scheme/ScheduleSchemeForm.vue | 11 ++++++++++-
src/views/data/ind/item/DerIndDefineForm.vue | 13 +++++++++++++
.env.prod | 2 +-
src/main.ts | 6 ++++++
src/views/data/point/DaPointForm.vue | 2 +-
7 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/.env.prod b/.env.prod
index 3dfd239..1bec2e6 100644
--- a/.env.prod
+++ b/.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/
diff --git "a/public/template/\346\250\241\345\236\213\345\217\202\346\225\260\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/public/template/\346\250\241\345\236\213\345\217\202\346\225\260\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index cfe9487..d73651e 100644
--- "a/public/template/\346\250\241\345\236\213\345\217\202\346\225\260\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/public/template/\346\250\241\345\236\213\345\217\202\346\225\260\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
diff --git a/src/main.ts b/src/main.ts
index 90aceba..b056fbd 100644
--- a/src/main.ts
+++ b/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)
diff --git a/src/views/data/ind/data/DataSetForm.vue b/src/views/data/ind/data/DataSetForm.vue
index d09745b..63974e0 100644
--- a/src/views/data/ind/data/DataSetForm.vue
+++ b/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"/>
diff --git a/src/views/data/ind/item/DerIndDefineForm.vue b/src/views/data/ind/item/DerIndDefineForm.vue
index 5dae869..44ef103 100644
--- a/src/views/data/ind/item/DerIndDefineForm.vue
+++ b/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">
diff --git a/src/views/data/point/DaPointForm.vue b/src/views/data/point/DaPointForm.vue
index e4136b6..8b2bbf6 100644
--- a/src/views/data/point/DaPointForm.vue
+++ b/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,
diff --git a/src/views/model/sche/scheme/ScheduleSchemeForm.vue b/src/views/model/sche/scheme/ScheduleSchemeForm.vue
index 3e7fd76..34304cf 100644
--- a/src/views/model/sche/scheme/ScheduleSchemeForm.vue
+++ b/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()
}
--
Gitblit v1.9.3