ZaiZai 9 mesiacov pred
rodič
commit
7afca385a0

+ 2 - 1
src/renderer/src/views/home/datav.vue

@@ -303,7 +303,7 @@
 
 <script setup>
 import { onMounted, onUnmounted, ref } from 'vue'
-import router from '~src/router/index'
+import { useRouter } from 'vue-router'
 import { useAppStore } from '~src/store'
 import { getStore, setStore } from 'hc-vue3-ui'
 import bgPng from '~src/assets/images/datav-bg.png'
@@ -317,6 +317,7 @@ import { getDictionaryData } from '~src/utils/tools'
 import projectApi from '~api/datav/projectdata'
 import dayjs from 'dayjs'
 
+const router = useRouter()
 const store = useAppStore()
 
 //引导

+ 0 - 1
src/renderer/src/views/login/os.vue

@@ -20,7 +20,6 @@
 import { onMounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { useAppStore } from '~src/store'
-import { delStore } from '~src/utils/storage'
 import { setRouterData, getHomeRouter } from '~store/user'
 
 //图片文件

+ 28 - 7
src/renderer/src/views/project/data.vue

@@ -30,7 +30,7 @@
     <HcAddAndEdit v-model="isViewShow" :data="rowInfo" disabled @close="viewClose">
         <hc-card-item ui="hc-project-data-view-info">
             <div class="hc-flex-center mb-24px">
-                <el-select v-model="selectYear" class="select-year" placeholder="选择年份" @change="changeYear">
+                <el-select v-model="rowInfo.year" class="select-year" placeholder="选择年份" @change="changeYear">
                     <el-option v-for="(item) in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
             </div>
@@ -56,7 +56,7 @@
             </el-form-item>
             <hc-card-item ui="hc-project-data-view-info">
                 <div class="hc-flex-center mb-24px">
-                    <el-select v-model="selectYear" class="select-year" placeholder="选择年份" @change="changeYear">
+                    <el-select v-model="formModel.year" class="select-year" placeholder="选择年份" @change="changeYear">
                         <el-option v-for="(item) in yearOptions" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                 </div>
@@ -142,7 +142,16 @@ const addRowClick = async () => {
 
 //编辑项目
 const editRowClick = async (row) => {
-    addAndEditForm.value = row
+    addAndEditForm.value = {
+        ...row,
+        time1: ['2022-10-02', '2023-09-24'],
+        time2: ['2023-10-02', '2024-10-24'],
+        key10: '40',
+        key11: '40',
+        key12: '40',
+        key13: '40',
+        key14: '40',
+    }
     await nextTick()
     isAddAndEditShow.value = true
 }
@@ -163,8 +172,7 @@ const addAndEditClose = () => {
 }
 
 //选择年份
-const selectYear = ref(null)
-const yearOptions = [{value: '2022', label: '2022年'}]
+const yearOptions = [{value: '2024', label: '2024年'}]
 const changeYear = (val) => {
     console.log(val)
 }
@@ -172,8 +180,21 @@ const changeYear = (val) => {
 //查看数据
 const isViewShow = ref(false)
 const rowInfo = ref({})
-const rowViewClick = async (data) => {
-    rowInfo.value = data
+const rowViewClick = async (row) => {
+    rowInfo.value = {
+        ...row,
+        time1: ['2022-10-02', '2023-09-24'],
+        time2: ['2023-10-02', '2024-10-24'],
+        key10: '40',
+        key11: '40',
+        key12: '40',
+        key13: '40',
+        key14: '40',
+        year: '2024',
+        key20: '40(万元)',
+        key21: '40(万元)',
+        key22: '40(万元)',
+    }
     await nextTick()
     isViewShow.value = true
 }

+ 3 - 3
src/renderer/src/views/project/data/addAndEdit.vue

@@ -1,6 +1,6 @@
 <template>
     <hc-dialog v-model="isShow" widths="40rem" :title="`${disabled?'查看项目':'项目'+formModel.id?'编辑':'新增'}`" :footer="!disabled" is-footer-center @close="dialogClose">
-        <el-form ref="formRef" :model="formModel" :rules="formRules" label-width="auto">
+        <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top" label-width="auto">
             <el-row :gutter="20">
                 <el-col :span="24">
                     <el-form-item label="项目名称:" prop="name">
@@ -9,12 +9,12 @@
                 </el-col>
                 <el-col :span="12">
                     <el-form-item label="运营时间:">
-                        <el-date-picker v-model="formModel.time1" class="block" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD"  :disabled="disabled"/>
+                        <hc-date-picker :dates="formModel.time1" clearable :disabled="disabled"/>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
                     <el-form-item label="收费时间:">
-                        <el-date-picker v-model="formModel.time2" class="block" format="YYYY-MM-DD" type="date" value-format="YYYY-MM-DD"  :disabled="disabled"/>
+                        <hc-date-picker :dates="formModel.time2" clearable :disabled="disabled"/>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">

+ 17 - 1
src/renderer/src/views/system/model.vue

@@ -1,9 +1,25 @@
 <template>
-    <div>模型设置</div>
+    <hc-card title="模型设置">
+        <template #extra>
+            <el-button type="primary">保存</el-button>
+        </template>
+        <el-form ref="formRef" :model="formModel" :rules="formRules" label-position="top" label-width="auto">
+            <el-row :gutter="20">
+                <el-col :span="6">
+                    <el-form-item label="收益年增长率:">
+                        <el-input v-model="formModel.name" placeholder="请输入收益年增长率" clearable/>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+    </hc-card>
 </template>
 
 <script setup>
+import {ref} from "vue";
 
+const formModel = ref({})
+const formRules = ref({})
 </script>
 
 <style scoped lang="scss">