From dd565f7c10a4dc18662dc8af4e2c3bad8f305bd3 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 08 十一月 2023 08:52:03 +0800
Subject: [PATCH] Changes
---
web/src/views/modules/project/Project-AddOrUpdate.vue | 16 +++++---
web/src/views/modules/project/Project.vue | 51 +++++++++----------------
modules/mainPart/src/main/resources/mapper/newplan/TaskCenterDao.xml | 2
3 files changed, 30 insertions(+), 39 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/newplan/TaskCenterDao.xml b/modules/mainPart/src/main/resources/mapper/newplan/TaskCenterDao.xml
index 193b598..ee32184 100644
--- a/modules/mainPart/src/main/resources/mapper/newplan/TaskCenterDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/newplan/TaskCenterDao.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zt.life.modules.maintain.newplan.dao.TaskCenterDao">
+<mapper namespace="com.zt.life.modules.mainPart.task.dao.TaskCenterDao">
<delete id="deleteTable">
drop table ${tableName}
</delete>
diff --git a/web/src/views/modules/project/Project-AddOrUpdate.vue b/web/src/views/modules/project/Project-AddOrUpdate.vue
index e0f1801..529c85e 100644
--- a/web/src/views/modules/project/Project-AddOrUpdate.vue
+++ b/web/src/views/modules/project/Project-AddOrUpdate.vue
@@ -1,6 +1,6 @@
<template>
<zt-dialog ref="dialog" column="2" @confirm="formSubmit">
- <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="120px">
+ <el-form :model="dataForm" ref="dataForm" :disabled="dataForm.disabled" label-width="160px">
<zt-form-item label="濮旀墭鍗曚綅鍚嶇О" prop="entrustUnitName" rules="required">
<el-input v-model="dataForm.entrustUnitName"></el-input>
</zt-form-item>
@@ -25,8 +25,8 @@
<zt-form-item label="寮�鍙戝崟浣嶈仈绯绘柟寮�" prop="developUnitContWay" rules="required">
<el-input v-model="dataForm.developUnitContWay"></el-input>
</zt-form-item>
- <zt-form-item label="杞欢鍚嶇О" prop="software" rules="required">
- <el-input v-model="dataForm.software"></el-input>
+ <zt-form-item label="杞欢鍚嶇О" prop="softwareName" rules="required">
+ <el-input v-model="dataForm.softwareName"></el-input>
</zt-form-item>
<zt-form-item label="椤圭洰缂栧彿" prop="code" rules="required">
<el-input v-model="dataForm.code"></el-input>
@@ -42,6 +42,9 @@
</zt-form-item>
<zt-form-item label="娴嬭瘯绾у埆" prop="testLevel" rules="required">
<zt-dict v-model="dataForm.testLevel" dict="test_level"></zt-dict>
+ </zt-form-item>
+ <zt-form-item label="杞欢绫诲瀷" prop="softwareType" rules="required">
+ <zt-dict v-model="dataForm.softwareType" dict="software_type"></zt-dict>
</zt-form-item>
<zt-form-item label="椤圭洰璐熻矗浜�" prop="projectLeader" rules="required">
<el-input v-model="dataForm.projectLeader"></el-input>
@@ -73,12 +76,13 @@
developUnitAddress: '',
developUnitContact: '',
developUnitContWay: '',
- software: '',
+ softwareName: '',
code: '',
identity: '',
secretClass: '',
criticalLevel: '',
testLevel: '',
+ softwareType: '',
projectLeader: '',
projectTesters: '',
projectReviewer: '',
@@ -89,7 +93,7 @@
methods: {
// 鑾峰彇淇℃伅
async getInfo() {
- let res = await this.$http.get(`/project//${this.dataForm.id}`)
+ let res = await this.$http.get(`/project/Project/${this.dataForm.id}`)
this.dataForm = {
...this.dataForm,
...res.data
@@ -97,7 +101,7 @@
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
- let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project//', this.dataForm)
+ let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/project/Project/', this.dataForm)
if (res.success) {
await this.$tip.success()
this.$refs.dialog.close()
diff --git a/web/src/views/modules/project/Project.vue b/web/src/views/modules/project/Project.vue
index 599ad11..5fb52f9 100644
--- a/web/src/views/modules/project/Project.vue
+++ b/web/src/views/modules/project/Project.vue
@@ -1,26 +1,14 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-project-project}">
- <zt-table-wraper query-url="/project//page" delete-url="/project/" v-slot="{ table }">
+ <zt-table-wraper query-url="/project/Project/page" delete-url="/project/Project" v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
- <el-input v-model="dataForm.entrustUnitName" placeholder="璇疯緭鍏ュ鎵樺崟浣嶅悕绉�" clearable></el-input>
+ <el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�" clearable></el-input>
</el-form-item>
<el-form-item>
- <el-input v-model="dataForm.developUnitName" placeholder="璇疯緭鍏ュ紑鍙戝崟浣嶅悕绉�" clearable></el-input>
-
- </el-form-item>
- <el-form-item>
- <el-input v-model="dataForm.software" placeholder="璇疯緭鍏ヨ蒋浠跺悕绉�" clearable></el-input>
-
- </el-form-item>
- <el-form-item>
- <el-input v-model="dataForm.code" placeholder="璇疯緭鍏ラ」鐩紪鍙�" clearable></el-input>
-
- </el-form-item>
- <el-form-item>
- <el-input v-model="dataForm.identity" placeholder="璇疯緭鍏ラ」鐩爣璇�" clearable></el-input>
+ <zt-dict v-model="dataForm.secretClass" dict="secret_class" clearable></zt-dict>
</el-form-item>
<el-form-item>
@@ -32,33 +20,33 @@
</el-form-item>
<el-form-item>
+ <zt-dict v-model="dataForm.softwareType" dict="software_type" clearable></zt-dict>
+
+ </el-form-item>
+ <el-form-item>
+ <zt-dict v-model="dataForm.isContract" dict="is_or_not" clearable></zt-dict>
+
+ </el-form-item>
+ <el-form-item>
<zt-button type="query" @click="table.query()"/>
<zt-button type="add" perm="project:add" @click="table.editHandle()"/>
<zt-button type="delete" perm="project:delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
- <el-table v-loading="table.dataLoading" :data="table.dataList" border @selection-change="table.selectionChangeHandle">
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle">
<el-table-column type="selection" width="40"/>
<el-table-column prop="entrustUnitName" label="濮旀墭鍗曚綅鍚嶇О"/>
- <el-table-column prop="entrustUnitAddress" label="濮旀墭鍗曚綅鍦板潃"/>
- <el-table-column prop="entrustUnitContact" label="濮旀墭鍗曚綅鑱旂郴浜�"/>
- <el-table-column prop="entrustUnitContWay" label="濮旀墭鍗曚綅鑱旂郴鏂瑰紡"/>
<el-table-column prop="developUnitName" label="寮�鍙戝崟浣嶅悕绉�"/>
- <el-table-column prop="developUnitAddress" label="寮�鍙戝崟浣嶅湴鍧�"/>
- <el-table-column prop="developUnitContact" label="寮�鍙戝崟浣嶈仈绯讳汉"/>
- <el-table-column prop="developUnitContWay" label="寮�鍙戝崟浣嶈仈绯绘柟寮�"/>
- <el-table-column prop="software" label="杞欢鍚嶇О"/>
+ <el-table-column prop="softwareName" label="杞欢鍚嶇О"/>
<el-table-column prop="code" label="椤圭洰缂栧彿"/>
<el-table-column prop="identity" label="椤圭洰鏍囪瘑"/>
<zt-table-column-dict prop="secretClass" label="瀵嗙骇" dict="secret_class"/>
<zt-table-column-dict prop="criticalLevel" label="鍏抽敭绛夌骇" dict="critical_level"/>
<zt-table-column-dict prop="testLevel" label="娴嬭瘯绾у埆" dict="test_level"/>
+ <zt-table-column-dict prop="softwareType" label="杞欢绫诲瀷" dict="software_type"/>
<el-table-column prop="projectLeader" label="椤圭洰璐熻矗浜�"/>
- <el-table-column prop="projectTesters" label="椤圭洰娴嬭瘯浜哄憳"/>
- <el-table-column prop="projectReviewer" label="椤圭洰瀹℃牳浜哄憳"/>
<zt-table-column-dict prop="isContract" label="鏄惁绛剧讲鍚堝悓" dict="is_or_not"/>
-
- <zt-table-column-handle :table="table" edit-perm="project:update" delete-perm="project::delete"/>
+ <zt-table-column-handle :table="table" edit-perm="project:update" delete-perm="project::delete"/>
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update @refreshDataList="table.query"/>
@@ -73,13 +61,12 @@
data() {
return {
dataForm: {
- entrustUnitName: '',
- developUnitName: '',
- software: '',
- code: '',
- identity: '',
+ softwareName: '',
+ secretClass: '',
criticalLevel: '',
testLevel: '',
+ softwareType: '',
+ isContract: '',
}
}
},
--
Gitblit v1.9.1