Merge remote-tracking branch 'origin/master'

frontend/src/views/home/index.vue

@@ -36,6 +36,7 @@ import { ElMessage } from "element-plus";
 import { useAuthStore } from "@/stores/modules/auth";
 import model from "./tabs/model.vue";
 import dashboard from "./tabs/dashboard.vue";
+import { onMounted } from "vue";
 const authStore = useAuthStore();
 console.log(authStore.showMenuFlagGet, "????????????????33333333");
 const activeIndex = ref("1-1");

frontend/src/views/login/components/LoginForm.vue

@@ -1,146 +1,154 @@
 <template>
   <el-form
-    ref="loginFormRef"
-    :model="loginForm"
-    :rules="loginRules"
-    size="large"
+      ref='loginFormRef'
+      :model='loginForm'
+      :rules='loginRules'
+      size='large'
   >
-    <el-form-item prop="username">
-      <el-input v-model="loginForm.username" placeholder="用户名">
+    <el-form-item prop='username'>
+      <el-input v-model='loginForm.username' placeholder='用户名'>
         <template #prefix>
-          <el-icon class="el-input__icon">
+          <el-icon class='el-input__icon'>
             <user />
           </el-icon>
         </template>
       </el-input>
     </el-form-item>
-    <el-form-item prop="password">
+    <el-form-item prop='password'>
       <el-input
-        v-model="loginForm.password"
-        type="password"
-        placeholder="密码"
-        show-password
-        autocomplete="new-password"
+          v-model='loginForm.password'
+          type='password'
+          placeholder='密码'
+          show-password
+          autocomplete='new-password'
       >
         <template #prefix>
-          <el-icon class="el-input__icon">
+          <el-icon class='el-input__icon'>
             <lock />
           </el-icon>
         </template>
       </el-input>
     </el-form-item>
   </el-form>
-  <div class="login-btn">
+  <div class='login-btn'>
     <el-button
-      :icon="UserFilled"
-      round
-      size="large"
-      type="primary"
-      :loading="loading"
-      @click="login(loginFormRef)"
+        :icon='UserFilled'
+        round
+        size='large'
+        type='primary'
+        :loading='loading'
+        @click='login(loginFormRef)'
     >
       登录
     </el-button>
     <el-button
-      :icon="CircleClose"
-      round
-      size="large"
-      @click="resetForm(loginFormRef)"
+        :icon='CircleClose'
+        round
+        size='large'
+        @click='resetForm(loginFormRef)'
     >
       重置
     </el-button>
   </div>
 </template>
 
-<script setup lang="ts">
-import { useRouter } from "vue-router";
-import { HOME_URL } from "@/config";
-import { getTimeState } from "@/utils";
-import { Login } from "@/api/interface";
-import { ElNotification } from "element-plus";
-import { loginApi } from "@/api/user/login";
-import { useUserStore } from "@/stores/modules/user";
-import { useTabsStore } from "@/stores/modules/tabs";
-import { useKeepAliveStore } from "@/stores/modules/keepAlive";
-import { initDynamicRouter } from "@/routers/modules/dynamicRouter";
-import { CircleClose, UserFilled } from "@element-plus/icons-vue";
-import { useAuthStore } from "@/stores/modules/auth";
-import type { ElForm } from "element-plus";
-import md5 from "md5";
-const authStore = useAuthStore();
-const router = useRouter();
-const userStore = useUserStore();
-const tabsStore = useTabsStore();
-const keepAliveStore = useKeepAliveStore();
+<script setup lang='ts'>
+import { useRouter } from 'vue-router'
+import { HOME_URL } from '@/config'
+import { getTimeState } from '@/utils'
+import { type Dict, Login } from '@/api/interface'
+import { ElNotification } from 'element-plus'
+import { getDictList, loginApi } from '@/api/user/login'
+import { useUserStore } from '@/stores/modules/user'
+import { useTabsStore } from '@/stores/modules/tabs'
+import { useKeepAliveStore } from '@/stores/modules/keepAlive'
+import { initDynamicRouter } from '@/routers/modules/dynamicRouter'
+import { CircleClose, UserFilled } from '@element-plus/icons-vue'
+import { useAuthStore } from '@/stores/modules/auth'
+import type { ElForm } from 'element-plus'
+import md5 from 'md5'
+
+const authStore = useAuthStore()
+const router = useRouter()
+const userStore = useUserStore()
+const tabsStore = useTabsStore()
+const keepAliveStore = useKeepAliveStore()
+import { useDictStore } from '@/stores/modules/dict'
+import { onMounted } from 'vue'
+
+const dictStore = useDictStore()
+
 
 type FormInstance = InstanceType<typeof ElForm>;
-const loginFormRef = ref<FormInstance>();
+const loginFormRef = ref<FormInstance>()
 const loginRules = reactive({
-  username: [{ required: true, message: "请输入用户名", trigger: "blur" }],
-  password: [{ required: true, message: "请输入密码", trigger: "blur" }],
-});
+  username: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
+  password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
+})
 
-const loading = ref(false);
+const loading = ref(false)
 const loginForm = reactive<Login.ReqLoginForm>({
-  username: "",
-  password: "",
-});
+  username: '',
+  password: '',
+})
 
 // login
 const login = (formEl: FormInstance | undefined) => {
-  if (!formEl) return;
+  if (!formEl) return
   formEl.validate(async (valid) => {
-    if (!valid) return;
-    loading.value = true;
+    if (!valid) return
+    loading.value = true
     try {
       // 1.执行登录接口
       const { data } = await loginApi({
         ...loginForm,
         password: md5(loginForm.password),
-      });
-      userStore.setToken(data.accessToken);
-
+      })
+      userStore.setToken(data.accessToken)
+      const response = await getDictList()
+      const dictData = response.data as unknown as Dict[]
+      await dictStore.initDictData(dictData)
       // 2.添加动态路由
-      await initDynamicRouter();
+      await initDynamicRouter()
 
       // 3.清空 tabs、keepAlive 数据
-      tabsStore.setTabs([]);
-      keepAliveStore.setKeepAliveName([]);
+      tabsStore.setTabs([])
+      keepAliveStore.setKeepAliveName([])
 
       // 4.跳转到首页
-      router.push(HOME_URL);
+      router.push(HOME_URL)
       // 5.登录默认不显示菜单和导航栏
-      authStore.resetAuthStore();
+      authStore.resetAuthStore()
       ElNotification({
         title: getTimeState(),
-        message: "登录成功",
-        type: "success",
+        message: '登录成功',
+        type: 'success',
         duration: 3000,
-      });
+      })
     } finally {
-      loading.value = false;
+      loading.value = false
     }
-  });
-};
+  })
+}
 
 // resetForm
 const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return;
-  formEl.resetFields();
-};
+  if (!formEl) return
+  formEl.resetFields()
+}
 
 onMounted(() => {
   // 监听 enter 事件（调用登录）
   document.onkeydown = (e: KeyboardEvent) => {
-    e = (window.event as KeyboardEvent) || e;
-    if (e.code === "Enter" || e.code === "enter" || e.code === "NumpadEnter") {
-      if (loading.value) return;
-      login(loginFormRef.value);
+    e = (window.event as KeyboardEvent) || e
+    if (e.code === 'Enter' || e.code === 'enter' || e.code === 'NumpadEnter') {
+      if (loading.value) return
+      login(loginFormRef.value)
     }
-  };
-});
+  }
+})
 </script>
 
-<style scoped lang="scss">
+<style scoped lang='scss'>
 @import "../index.scss";
 </style>

frontend/src/views/login/index.vue

@@ -20,6 +20,7 @@
 <script setup lang="ts" name="login">
 import LoginForm from "./components/LoginForm.vue";
 const title = import.meta.env.VITE_GLOB_APP_TITLE;
+
 </script>
 
 <style scoped lang="scss">

frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue

@@ -1,135 +1,156 @@
 <template>
     <el-dialog v-model='dialogVisible' :title='dialogTitle' v-bind='dialogMiddle' @close="close">
-      <div>
+     
         <el-form :model='formContent' ref='dialogFormRef' :rules='rules' class='form-two'>
-          <el-form-item label='数据模型' :label-width='100' prop='dataType'>
-            <el-select v-model="formContent.dataType" placeholder="请选择资源类型">
+          <el-divider >基础数据</el-divider>
+          <el-form-item label='数据模型' :label-width='140' prop='dataType'>
+            <el-select v-model="formContent.dataType"  clearable placeholder="请选择资源类型">
             <el-option
-              v-for="item in dictStore.getDictData('dataType')"
+              v-for="item in dictStore.getDictData('High_Cate')"
               :key="item.id"
-              :label="item.label"
+              :label="item.name"
               :value="item.code"
             />
           </el-select>
           </el-form-item>
-          <el-form-item label='指标名称' :label-width='100' prop='name'>
+          <el-form-item label='指标名称' :label-width='140' prop='name'>
             <el-input v-model='formContent.name' placeholder='请输入' autocomplete='off' />
           </el-form-item>
-          <el-form-item label='别名' :label-width='100' prop='otherName'>
+          <el-form-item label='别名' :label-width='140' prop='otherName'>
             <el-input v-model='formContent.otherName' placeholder='请输入' autocomplete='off' />
           </el-form-item>
-          <el-form-item label='显示名称' :label-width='100' prop='showName'>
+          <el-form-item label='显示名称' :label-width='140' prop='showName'>
             <el-input v-model='formContent.showName' placeholder='请输入' autocomplete='off' />
           </el-form-item>
-          <el-form-item label='相别' :label-width='100' prop='phase'>
-            <el-select v-model="formContent.phase" placeholder="请选择相别">
+          <el-form-item label='相别' :label-width='140' prop='phase'>
+            <el-select v-model="formContent.phase"  clearable placeholder="请选择相别">
             <el-option
-              v-for="item in dictStore.getDictData('dataType')"
+              v-for="item in dictStore.getDictData('phase')"
               :key="item.id"
-              :label="item.label"
+              :name="item.name"
               :value="item.code"
             />
           </el-select>
           </el-form-item>
-          <el-form-item label='单位' :label-width='100' prop='unit'>
+          <el-form-item label='单位' :label-width='140' prop='unit'>
             <el-input v-model='formContent.unit' placeholder='请输入单位' autocomplete='off' />
           </el-form-item>
-          <el-form-item label='指标数据类型' :label-width='100' prop='type'>
+          <el-form-item label='指标数据类型' :label-width='140' prop='type'>
             <el-input v-model='formContent.type' placeholder='请输入指标数据类型' autocomplete='off' />
           </el-form-item>
-          <el-form-item label='开始结束' :label-width='100' prop='type'>
-            <el-input v-model='formContent.type' placeholder='请输入开始结束' autocomplete='off' />
+          <el-form-item label='次数' :label-width='140'>
+            <el-row :gutter="20">
+              <el-col :span="11">
+                <el-input v-model="formContent.harmStart" placeholder="请输入起始次数" autocomplete="off" />
+              </el-col>
+              <el-col :span="2" class="text-center" style="line-height: 32px;">-</el-col>
+              <el-col :span="11">
+                <el-input v-model="formContent.harmEnd" placeholder="请输入结束次数" autocomplete="off" />
+              </el-col>
+            </el-row>
           </el-form-item>
-          <el-form-item label='数据统计类型' :label-width='100' prop='statMethod'>
-            <el-select v-model="formContent.statMethod" placeholder="请选择数据统计类型">
-            <el-option
+          <el-form-item label='数据统计类型' :label-width='140' prop='statMethod'>
+            
+            <el-select v-model="formContent.statMethod" multiple   placeholder="请选择数据统计类型">
+              <el-option
               v-for="item in dictStore.getDictData('statMethod')"
-              :key="item.id"
-              :label="item.label"
+              :key="item.value"
+              :name="item.name"
               :value="item.code"
             />
           </el-select>
           </el-form-item>
-          <el-form-item label='报表数据来源' :label-width='100' prop='resourcesId'>
-            <el-select v-model="formContent.resourcesId" placeholder="请选择报表数据来源">
+          <el-form-item label='系统类别' :label-width='140' prop='systemType'>
+            <el-input v-model='formContent.systemType' placeholder='请输入' autocomplete='off' />
+          </el-form-item>
+          <el-form-item label='报表数据来源' :label-width='140' prop='resourcesId'>
+            <el-select v-model="formContent.resourcesId"  clearable placeholder="请选择报表数据来源">
             <el-option
-              v-for="item in dictStore.getDictData('statMethod')"
+              v-for="item in dictStore.getDictData('resourcesId')"
               :key="item.id"
-              :label="item.label"
+              :name="item.name"
               :value="item.code"
             />
           </el-select>
           </el-form-item>
-          <el-form-item label='数据表表名' :label-width='100' prop='statMethod'>
-            <el-select v-model="formContent.statMethod" placeholder="请选择数据表表名">
+          <el-form-item label='数据表表名' :label-width='140' prop='classId'>
+            <el-select v-model="formContent.classId"  clearable placeholder="请选择数据表表名">
             <el-option
-              v-for="item in dictStore.getDictData('statMethod')"
+              v-for="item in dictStore.getDictData('classId')"
               :key="item.id"
-              :label="item.label"
+              :name="item.name"
               :value="item.code"
             />
           </el-select>
           </el-form-item>
-          <el-form-item label='排序' :label-width='100'>
-            <el-input-number v-model='formContent.sort' />
-          </el-form-item>
-          <el-form-item label='限值字段名称' :label-width='100' prop='limitName'>
+          <el-form-item label='限值字段名称' :label-width='140' prop='limitName'>
             <el-input v-model='formContent.limitName' placeholder='请输入限值字段名称' autocomplete='off' />
           </el-form-item>
-          <el-form-item label='限值表名' :label-width='100' prop='limitTable'>
+          <el-form-item label='限值表名' :label-width='140' prop='limitTable'>
             <el-input v-model='formContent.limitTable' placeholder='请输入限值表名' autocomplete='off' />
           </el-form-item>
-          <el-form-item label='超标判断方式' :label-width='100' prop='formula'>
-            <el-select v-model="formContent.formula" placeholder="请选择超标判断方式">
+          <el-form-item label='超标判断方式' :label-width='140' prop='formula'>
+            <el-select v-model="formContent.formula"  clearable placeholder="请选择超标判断方式">
             <el-option
               v-for="item in dictStore.getDictData('formula')"
               :key="item.id"
-              :label="item.label"
+              :name="item.name"
               :value="item.code"
             />
           </el-select>
           </el-form-item>
-          <el-form-item label='参数缺省值' :label-width='100' prop='defaultValue'>
+          <el-form-item label='排序' :label-width='140'>
+            <el-input-number v-model='formContent.sort' :min="0" controls-position="right" style="width: 300px;"/>
+          </el-form-item>
+          <el-divider >拓展数据</el-divider>
+          <el-form-item label='参数缺省值' :label-width='140' prop='defaultValue'>
             <el-input v-model='formContent.defaultValue' placeholder='请输入参数缺省值' autocomplete='off' />
           </el-form-item>
-          <el-form-item label='事件类别' :label-width='100' prop='eventType'>
+          <el-form-item label='事件类别' :label-width='140' prop='eventType'>
             <el-input v-model='formContent.eventType' placeholder='请输入事件类别' autocomplete='off' />
           </el-form-item>
-          <el-form-item label='设置最大值' :label-width='100' prop='maxNum'>
-            <el-input v-model='formContent.maxNum' placeholder='请输入最大值' autocomplete='off' />
+          <el-form-item label='设置最大值' :label-width='140' prop='maxNum'>
+            <el-input-number v-model='formContent.maxNum'  controls-position="right" style="width: 300px;"/>
           </el-form-item>
-          <el-form-item label='设置最小值' :label-width='100' prop='minNum'>
-            <el-input v-model='formContent.minNum' placeholder='请输入最小值' autocomplete='off' />
+          <el-form-item label='设置最小值' :label-width='140' prop='minNum'>
+            <el-input-number v-model='formContent.minNum'  controls-position="right" style="width: 300px;"/>
           </el-form-item>
-          <el-form-item label='枚举序列' :label-width='100' prop='setValue'>
+          <el-form-item label='枚举序列' :label-width='140' prop='setValue'>
             <el-input v-model='formContent.setValue' placeholder='请输入枚举序列' autocomplete='off' />
           </el-form-item>
-          <el-form-item label='字符串长度上限' :label-width='100' prop='strlen'>
-            <el-input v-model='formContent.strlen' placeholder='请输入字符串长度上限' autocomplete='off' />
+          <el-form-item label='字符串长度上限' :label-width='140' prop='strlen'>
+            <el-input-number v-model='formContent.strlen'  controls-position="right" style="width: 300px;"/>
           </el-form-item>
-          <el-form-item label='上送规则' :label-width='100' prop='tranRule'>
+          <el-form-item label='上送规则' :label-width='140' prop='tranRule'>
             <el-input v-model='formContent.tranRule' placeholder='请输入上送规则' autocomplete='off' />
           </el-form-item>
-          <el-form-item label="是否可远程控制" :label-width="100">
+          <el-form-item label='当前值' :label-width='140' prop='curSts'>
+            <el-input v-model='formContent.curSts' placeholder='请输入当前值' autocomplete='off' />
+          </el-form-item>
+          <el-form-item label='二次值转一次值公式' :label-width='140' prop='primaryFormula'>
+            <el-input v-model='formContent.primaryFormula' placeholder='请输入公式' autocomplete='off' />
+          </el-form-item>
+          <el-form-item label="是否可远程控制" :label-width="140">
             <el-radio-group v-model="formContent.ctlSts" >
-              <el-radio-button label="是" :value="1"></el-radio-button>
-              <el-radio-button label="否" :value="0"></el-radio-button>
+              <el-radio label="是" :value="1"></el-radio>
+              <el-radio label="否" :value="0"></el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="是否存储" :label-width="100">
+          <el-form-item label="是否存储" :label-width="140">
             <el-radio-group v-model="formContent.storeFlag" >
-              <el-radio-button label="是" :value="1"></el-radio-button>
-              <el-radio-button label="否" :value="0"></el-radio-button>
+              <el-radio label="是" :value="1"></el-radio>
+              <el-radio label="否" :value="0"></el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="数据是否上送" :label-width="100">
+          <el-form-item label="数据是否上送" :label-width="140">
             <el-radio-group v-model="formContent.tranFlag" >
-              <el-radio-button label="是" :value="1"></el-radio-button>
-              <el-radio-button label="否" :value="0"></el-radio-button>
+              <el-radio label="是" :value="1"></el-radio>
+              <el-radio label="否" :value="0"></el-radio>
             </el-radio-group>
           </el-form-item>
+         
         </el-form>
-      </div>
+     
       <template #footer>
         <div class='dialog-footer'>
           <el-button @click='close()'>取消</el-button>
@@ -148,9 +169,9 @@
   import { computed, type Ref, ref } from 'vue';
   import { useDictStore } from '@/stores/modules/dict'
   const dictStore = useDictStore()
+
   // 定义弹出组件元信息
   const dialogFormRef = ref()
-
   function useMetaInfo() {
     const dialogVisible = ref(false)
     const titleType = ref('add')
@@ -161,12 +182,12 @@
       sort: 100,
       dataType: '',
       state: 1,
+      classId: '',
     })
     return { dialogVisible, titleType, formContent }
   }
   
   const { dialogVisible, titleType, formContent } = useMetaInfo()
-  
   // 清空formContent
   const resetFormContent = () => {
     formContent.value = {
@@ -176,17 +197,20 @@
       sort: 100,
       dataType: '',
       state: 1,
+      classId: '',
     }
   }
   
   let dialogTitle = computed(() => {
-    return titleType.value === 'add' ? '新增字典类型' : '编辑字典类型'
+    return titleType.value === 'add' ? '新增字典' : '编辑字典'
   })
   
   // 定义表单校验规则
   const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
-    name: [{ required: true, message: '类型名称必填！', trigger: 'blur' }],
-    code: [{ required: true, message: '类型编码必填！', trigger: 'blur' }],
+    dataType: [{ required: true, message: '数据模型必选！', trigger: 'change' }],
+    name: [{ required: true, message: '指标名称必填！', trigger: 'blur' }],
+    phase: [{ required: true, message: '相别必选！', trigger: 'change' }],
+    classId: [{ required: true, message: '数据库表名必选！', trigger: 'change' }],
   })
   
   
@@ -202,8 +226,9 @@
   // 保存数据
   const save = () => {
     try {
-      dialogFormRef.value?.validate(async (valid: boolean) => {
+        dialogFormRef.value?.validate(async (valid: boolean) => {
         if (valid) {
+       
           if (formContent.value.id) {
             await updateDictPq(formContent.value)
           } else {
@@ -221,9 +246,10 @@
   }
   
   // 打开弹窗，可能是新增，也可能是编辑
-  const open = (sign: string, data: Dict.ResDictType) => {
+  const open = (sign: string, data: Dict.ResDictPq) => {
     titleType.value = sign
     dialogVisible.value = true
+    console.log('123456',dictStore)
     if (data.id) {
       formContent.value = { ...data }
     } else {

frontend/src/views/system/dictionary/dictPq/index.vue

@@ -24,7 +24,7 @@
   
   <script setup lang='tsx' name='dict'>
   import {CirclePlus, Delete, EditPen, Download, View} from '@element-plus/icons-vue'
-  import {Dict} from '@/api/system/dictionary/interface'
+  import {type Dict} from '@/api/system/dictionary/interface'
   import {ProTableInstance, ColumnProps} from '@/components/ProTable/interface'
   import PqPopup from '@/views/system/dictionary/dictPq/components/pqPopup.vue'
   import {useDictStore} from '@/stores/modules/dict'
@@ -50,9 +50,9 @@
       prop: 'dataType',
       label: '数据模型',
       width: 180,
-      search: {
-        el: 'select',
-      },
+      enum: dictStore.getDictData('High_Cate'),
+      search: { el: 'select', props: { filterable: true } },
+      fieldNames: { label: 'name', value: 'code' },
     },
     {
       prop: 'name',
@@ -107,6 +107,16 @@
       prop: 'statMethod',
       label: '数据统计类型',
       width: 180,
+      render: (row) => {
+        const methods = row.statMethod || []; // 确保statMethod存在
+        if (methods.length === 0) {
+          return '/'; // 空值时显示/
+        } else if (methods.length > 2) {
+          return methods.join(', '); // 超过两个用逗号分隔
+        } else {
+          return methods.join(' '); // 少于等于两个时用空格分隔
+        }
+      },
     },    
     {
       prop: 'classId',