2545307760@qq.com il y a 1 an
Parent
commit
c6d0874ffb

+ 1 - 1
web/.env.development

@@ -3,7 +3,7 @@ VITE_CLI_PORT = 8080
 VITE_SERVER_PORT = 8888
 VITE_BASE_API = /api
 VITE_FILE_API = /api
-VITE_BASE_PATH = http://192.168.110.69
+VITE_BASE_PATH = http://192.168.110.116
 VITE_POSITION = close
 VITE_EDITOR = vscode
 // VITE_EDITOR = webstorm 如果使用webstorm开发且要使用dom定位到代码行功能 请先自定添加 webstorm到环境变量 再将VITE_EDITOR值修改为webstorm

+ 0 - 0
web/src/api/projectList.js


+ 6 - 4
web/src/view/login/index.vue

@@ -89,12 +89,12 @@
       </div>
     </div>
 
-    
+
   </div>
 </template>
 
 <script setup>
-import JSEncrypt from 'jsencrypt';  
+import JSEncrypt from 'jsencrypt';
 import { captcha,routerPublicKey } from '@/api/user'
 import { checkDB } from '@/api/initdb'
 import { reactive, ref, onMounted } from 'vue'
@@ -179,11 +179,13 @@ const login = async() => {
   loginFormData.password = instance.encrypt(loginFormData.password)
 
   const bool = await userStore.LoginIn(loginFormData)
-  loginFormData.password = ""
+  loginFormData.password = ''
   return bool
 }
 const submitForm = () => {
   loginForm.value.validate(async(v) => {
+    console.log('登录')
+    console.log(v)
     if (v) {
       const flag = await login()
       if (!flag) {
@@ -195,7 +197,7 @@ const submitForm = () => {
         message: '请正确填写登录信息',
         showClose: true,
       })
-      loginVerify()
+      await loginVerify()
       return false
     }
   })

+ 84 - 1
web/src/view/projectManage/projectDetails/projectDetails.vue

@@ -1,5 +1,88 @@
 <template>
-  <div>项目详情</div>
+  <div>
+    <el-row>
+      <el-col
+          :span="4"
+      >
+        <el-form-item label="项目名称">
+          <el-input placeholder="请输入项目名称" />
+        </el-form-item>
+      </el-col>
+      <el-col
+          :span="4"
+          :offset="1"
+      >
+        <el-form-item label="立项时间">
+          <el-date-picker
+              v-model="approvalTime"
+              type="month"
+              placeholder="请选择立项时间"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col
+          :span="4"
+          :offset="1"
+      >
+        <el-form-item label="项目状态">
+          <el-select />
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="5">
+        <div class="bg-white h-24" />
+      </el-col>
+      <el-col :span="5" :offset="1">
+        <div class="bg-white h-24" />
+      </el-col>
+      <el-col :span="5" :offset="1">
+        <div class="bg-white h-24" />
+      </el-col>
+      <el-col :span="5" :offset="1">
+        <div class="bg-white h-24" />
+      </el-col>
+    </el-row>
+    <el-form>
+      <el-row style="margin-top: 20px">
+        <el-col
+            :span="22"
+        >
+          <el-table :data="projectListData">
+            <el-table-column
+                label="项目编码"
+                width="200"
+            />
+            <el-table-column
+                label="项目名称"
+                width="200"
+            />
+            <el-table-column
+                label="项目负责人"
+                width="200"
+            />
+            <el-table-column
+                label="项目金额"
+                width="200"
+            />
+            <el-table-column
+                label="立项日期"
+                width="200"
+            />
+            <el-table-column
+                label="项目进度"
+                width="200"
+            />
+            <el-table-column
+                label="状态"
+                width="170"
+            />
+          </el-table>
+        </el-col>
+      </el-row>
+    </el-form>
+
+  </div>
 </template>
 
 <script setup>

+ 88 - 42
web/src/view/projectManage/projectList/projectList.vue

@@ -1,59 +1,105 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="24">
-        <el-card style="height: 200px" header="项目数据总览">
-          <el-row justify="space-around">
-            <el-col :span="4">
-              <div class="bg-amber-100 h-24"></div>
-            </el-col>
-            <el-col :span="4">
-              <div class="bg-blue-200 h-24"></div>
-            </el-col>
-            <el-col :span="4">
-              <div class="bg-emerald-200 h-24"></div>
-            </el-col>
-            <el-col :span="4">
-              <div class="bg-red-300 h-24"></div>
-            </el-col>
-          </el-row>
-        </el-card>
+      <el-col
+          :span="4"
+      >
+        <el-form-item label="项目名称">
+          <el-input placeholder="请输入项目名称" />
+        </el-form-item>
       </el-col>
-    </el-row>
-    <el-row class="mt-14">
-      <el-col :span="24">
-        <el-card style="height: 500px;" header="项目列表">
-          <el-form>
-            <el-row>
-              <el-col :span="4" :offset="1">
-                <el-form-item label="项目名称">
-                  <el-input placeholder="请输入项目名称"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="4" :offset="1">
-                <el-form-item label="立项时间">
-                </el-form-item>
-              </el-col>
-              <el-col :span="4" :offset="1">
-                <el-form-item label="项目状态">
-                  <el-select></el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-card>
+      <el-col
+          :span="4"
+          :offset="1"
+      >
+        <el-form-item label="立项时间">
+          <el-date-picker
+              v-model="approvalTime"
+              type="month"
+              placeholder="请选择立项时间"
+          />
+        </el-form-item>
+      </el-col>
+      <el-col
+          :span="4"
+          :offset="1"
+      >
+        <el-form-item label="项目状态">
+          <el-select />
+        </el-form-item>
       </el-col>
     </el-row>
     <el-row>
-
+      <el-col :span="5">
+        <div class="bg-white h-24" />
+      </el-col>
+      <el-col :span="5" :offset="1">
+        <div class="bg-white h-24" />
+      </el-col>
+      <el-col :span="5" :offset="1">
+        <div class="bg-white h-24" />
+      </el-col>
+      <el-col :span="5" :offset="1">
+        <div class="bg-white h-24" />
+      </el-col>
     </el-row>
+    <el-form>
+      <el-row style="margin-top: 20px;">
+        <el-col
+            :span="21"
+        >
+          <el-table :data="projectListData" height="650">
+            <el-table-column
+                label="项目编码"
+                width="200"
+                align="center"
+            />
+            <el-table-column
+                label="项目名称"
+                width="200"
+                align="center"
+            />
+            <el-table-column
+                label="项目负责人"
+                width="200"
+                align="center"
+            />
+            <el-table-column
+                label="项目金额"
+                width="200"
+                align="center"
+            />
+            <el-table-column
+                label="立项日期"
+                width="200"
+                align="center"
+            />
+            <el-table-column
+                label="项目进度"
+                width="200"
+                align="center"
+            />
+            <el-table-column
+                label="状态"
+                width="200"
+                align="center"
+            />
+          </el-table>
+        </el-col>
+      </el-row>
+    </el-form>
   </div>
 </template>
 
 <script setup>
+import { ref, reactive } from 'vue'
 defineOptions({
-  name: 'projectList'
+  name: 'ProjectList'
 })
+
+const approvalTime = ref('')
+const projectListData = reactive([])
+
 </script>
 
 <style scoped lang="less">