Merge remote-tracking branch 'origin/master'

zzw

2023-11-29 0b08d373869c91dda58dd0e33b13fe59688234f9

 web/src/views/modules/project/Project.vue

@@ -1,7 +1,6 @@
<template>
  <el-card shadow="never" class="aui-card--fill">
    <div class="mod-project-project}">
      <zt-table-wraper query-url="/project/Project/page" delete-url="/project/Project" v-slot="{ table }">
    <div class="fa-card-a">
      <zt-table-wraper query-url="/project/Project/page" delete-url="/project/Project/deleteProject" v-slot="{ table }">
        <el-form :inline="true" class="form-input-width-1"  :model="dataForm" @keyup.enter.native="table.query()">
          <el-form-item>
            <el-input v-model="dataForm.softwareName" placeholder="请输入软件名称" clearable></el-input>
@@ -15,10 +14,10 @@
            <zt-dict v-model="dataForm.criticalLevel" placeholder="关键等级" dict="critical_level" clearable></zt-dict>

          </el-form-item>
          <el-form-item>
            <zt-dict v-model="dataForm.testLevel" placeholder="测试级别" dict="test_level" clearable></zt-dict>
<!--          <el-form-item>-->
<!--            <zt-dict v-model="dataForm.testLevel" placeholder="测试级别" dict="test_level" clearable></zt-dict>-->

          </el-form-item>
<!--          </el-form-item>-->
          <el-form-item >
            <zt-dict v-model="dataForm.softwareType" placeholder="软件类型" dict="software_type" clearable></zt-dict>

@@ -39,10 +38,10 @@
          <el-table-column prop="developUnitName" label="开发单位名称"/>
          <el-table-column prop="softwareName" label="软件名称"/>
          <el-table-column prop="code" label="项目编号"/>
          <el-table-column prop="identity" label="项目标识"/>
          <el-table-column prop="softwareIdentity" 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="testLevel" label="测试级别" dict="test_level"/>-->
          <zt-table-column-dict prop="softwareType" label="软件类型" dict="software_type"/>
          <el-table-column prop="projectLeader" label="项目负责人"/>
          <zt-table-column-dict prop="isContract" label="是否签署合同" dict="is_or_not"/>
@@ -52,7 +51,6 @@
        <add-or-update @refreshDataList="table.query"/>
      </zt-table-wraper>
    </div>
  </el-card>
</template>

<script>