From 4d0cb487e17eceda66029680e8b827e4c0936e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Mon, 28 Nov 2022 10:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/.env.production                        |   1 +
 client/src/api/ability.js                     |   7 ++++
 client/src/views/ability/mQualityTask.vue     |  18 +++++-----
 client/src/views/ability/qualityTask.vue      |  29 ++++++++++++---
 client/src/views/ability/qualityTaskDo.vue    |  10 ++++--
 server/server/settings_dev.py                 |  34 +++++++++---------
 .../570eef2524c1a8e683521a9e16a59039.djcache  | Bin 0 -> 48 bytes
 7 files changed, 67 insertions(+), 32 deletions(-)
 create mode 100644 server/temp/570eef2524c1a8e683521a9e16a59039.djcache

diff --git a/client/.env.production b/client/.env.production
index 8802f8c..4b8949b 100644
--- a/client/.env.production
+++ b/client/.env.production
@@ -3,4 +3,5 @@ ENV = 'production'
 
 # base api
 VUE_APP_BASE_API = 'https://testsearch.ctc.ac.cn/api'
+#VUE_APP_BASE_API = 'http://47.95.0.242:2222/api'
 
diff --git a/client/src/api/ability.js b/client/src/api/ability.js
index 4f7fe26..d7b9218 100644
--- a/client/src/api/ability.js
+++ b/client/src/api/ability.js
@@ -155,6 +155,13 @@ export function updateQtask(id,data) {
   })
 }
 
+export function deleteQtask(id) {
+  return request({
+    url:`/ability/qtask/${id}/`,
+    method:'delete'
+  })
+}
+
 export function qtaskStart(id) {
   return request({
     url:`/ability/qtask/${id}/start/`,
diff --git a/client/src/views/ability/mQualityTask.vue b/client/src/views/ability/mQualityTask.vue
index e091f75..789e94e 100644
--- a/client/src/views/ability/mQualityTask.vue
+++ b/client/src/views/ability/mQualityTask.vue
@@ -289,11 +289,11 @@
         label-position="right"
         :rules="rule"
       >
-        <el-form-item label="资质认定" prop="type">
+        <el-form-item label="资质名称" prop="type">
           <el-select
             style="width: 100%;"
             v-model="qualiForm.type"
-            placeholder="资质认定"
+            placeholder="资质名称"
             @change="qualiTypeChange"
           >
             <el-option
@@ -304,8 +304,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="资质名称" prop="name" v-if="qualiForm.type==='OTHER'">
-          <el-input v-model="qualiForm.name" placeholder="资质名称"/>
+        <el-form-item label="具体名称" prop="name" v-if="qualiForm.type==='OTHER'">
+          <el-input v-model="qualiForm.name" placeholder="具体名称"/>
         </el-form-item>
         <el-form-item label="资质类型" v-if="qualiForm.type==='CMA'">
           <el-select
@@ -494,11 +494,11 @@
         label-position="right"
         :rules="rule"
       >
-        <el-form-item label="资质认定" prop="type">
+        <el-form-item label="资质名称" prop="type">
           <el-select
             style="width: 100%;"
             v-model="qualiForm.type"
-            placeholder="资质认定"
+            placeholder="资质名称"
             @change="qualiTypeChange"
           >
             <el-option
@@ -509,8 +509,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="资质名称" prop="name" v-if="qualiForm.type==='OTHER'">
-          <el-input v-model="qualiForm.name" placeholder="资质名称"/>
+        <el-form-item label="具体名称" prop="name" v-if="qualiForm.type==='OTHER'">
+          <el-input v-model="qualiForm.name" placeholder="具体名称"/>
         </el-form-item>
         <el-form-item label="资质类型" v-if="qualiForm.type==='CMA'">
           <el-select
@@ -728,7 +728,7 @@
     cityLists,
     qactionItem,
     qualiNoChange,
-    abilityNoChange
+    abilityNoChange,
   } from "@/api/ability";
   import {getDictList} from "@/api/dict";
   import {genTree} from "@/utils";
diff --git a/client/src/views/ability/qualityTask.vue b/client/src/views/ability/qualityTask.vue
index c6e3bbf..900118c 100644
--- a/client/src/views/ability/qualityTask.vue
+++ b/client/src/views/ability/qualityTask.vue
@@ -65,18 +65,23 @@
               size="small"
               @click="handleClick(scope)"
             >执行</el-link>
-           <!-- <el-link
-              v-if="scope.row.state==='待发布'"
+           <el-link
+              v-if="scope.row.state!='已关闭'"
               type="primary"
               size="small"
               @click="handleEdit(scope)"
-            >编辑</el-link>-->
+            >编辑</el-link>
             <el-link
               v-if="scope.row.state==='待发布'"
               type="warning"
               size="small"
               @click="handleStart(scope)"
             >发布</el-link>
+            <el-link
+              type="danger"
+              size="small"
+              @click="handleDelete(scope)"
+            >删除</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -135,7 +140,7 @@
 
 <script>
   import { getOrgList } from "@/api/org";
-  import {getQtask,createQtask,updateQtask,qtaskStart} from "@/api/ability";
+  import {getQtask,createQtask,updateQtask,qtaskStart, deleteQtask} from "@/api/ability";
   import {genTree} from "@/utils";
   import checkPermission from "@/utils/permission";
   import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
@@ -280,6 +285,22 @@
       resetFilter() {
         this.pageForm.search = '';
         this.getQtaskList();
+      },
+            //删除操作
+      handleDelete(scope) {
+        let that = this;
+        that.$confirm("确认删除吗?", "提示")
+          .then(async () => {
+            await deleteQtask(scope.row.id).then(res => {
+              if (res.code >= 200 && res.code < 400) {
+                that.getQtaskList();
+                that.$message.success("成功");
+              }
+            });
+          })
+          .catch((err) => {
+            console.error(err);
+          });
       },
     },
 
diff --git a/client/src/views/ability/qualityTaskDo.vue b/client/src/views/ability/qualityTaskDo.vue
index b91d6f2..1df7a06 100644
--- a/client/src/views/ability/qualityTaskDo.vue
+++ b/client/src/views/ability/qualityTaskDo.vue
@@ -278,6 +278,10 @@
         <p style="font-size: 20px;font-weight: bold;">新增能力</p>
         <p><span style="display: inline-block;width: 100px;font-weight: bold;">能力类型 ：</span>{{atype_name}}</p>
         <p><span style="display: inline-block;width: 100px;font-weight: bold;">能力领域：</span>{{afield_name}}</p>
+        <p><span style="display: inline-block;width: 160px;font-weight: bold;">新增对象数量：</span>{{item.num}}</p>
+        <p><span style="display: inline-block;width: 160px;font-weight: bold;">新增参数数量：</span>{{item.num2}}</p>
+        <p><span style="display: inline-block;width: 160px;font-weight: bold;">新增方法标准数量：</span>{{item.num3}}</p>
+        <p><span style="display: inline-block;width: 160px;font-weight: bold;">新增产品标准数量：</span>{{item.num4}}</p>
         <p><span style="display: inline-block;width: 100px;font-weight: bold;">上传文件：</span>{{showData.data.file_.name}}</p>
         <el-link :href="showData.data.file_.file" target="_blank" type="primary">{{showData.data.file_.name}}</el-link>
         <el-divider></el-divider>
@@ -357,7 +361,8 @@
         atypeOptions: {},
         afieldOptions: {},
         atype_name:'',
-        afield_name:''
+        afield_name:'',
+        item:{}
       };
     },
     created() {
@@ -415,6 +420,7 @@
       },
       //操作处理
       handleRecord(type, item) {
+        this.item = item
         this.showData.id = item.id;
         this.showData.data = item;
         this.showData.type = item.action;
@@ -481,7 +487,7 @@
       clickRow(row, col, e) {
         this.listLoading2 = true;
         this.detailItem = row;
-        this.listQuery = {pageoff: true, qtask: row.qtask, belong_dept: row.dept};
+        this.listQuery = {pageoff: true, qtask: row.qtask, belong_dept: row.org};
         this.getQactionList();
       },
       handleSelectRecords(val) {
diff --git a/server/server/settings_dev.py b/server/server/settings_dev.py
index 0e60099..28f1715 100644
--- a/server/server/settings_dev.py
+++ b/server/server/settings_dev.py
@@ -1,21 +1,21 @@
 from .settings import *
 DEBUG = True
 DATABASES = {
-     'default': {
-         'ENGINE': 'django.db.backends.postgresql',
-         'NAME': 'cma',
-         'USER': 'postgres',
-         'PASSWORD': 'zctest1234',
-         'HOST': '47.95.0.242',
-         'PORT': '5432',
-     },
-#    'default': {
-#         'ENGINE': 'django.db.backends.postgresql',
-#         'NAME': 'cma',
-#         'USER': 'cma',
-#         'PASSWORD': 'cma123',
-#         'HOST': '172.16.80.102',
-#         # 'HOST': '1.203.161.102',
-#         'PORT': '5432',
-#     }
+    #  'default': {
+    #      'ENGINE': 'django.db.backends.postgresql',
+    #      'NAME': 'cma',
+    #      'USER': 'postgres',
+    #      'PASSWORD': 'zctest1234',
+    #      'HOST': '47.95.0.242',
+    #      'PORT': '5432',
+    #  },
+   'default': {
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': 'cma',
+        'USER': 'cma',
+        'PASSWORD': 'cma123',
+        'HOST': '172.16.80.102',
+        # 'HOST': '1.203.161.102',
+        'PORT': '5432',
+    }
 }
diff --git a/server/temp/570eef2524c1a8e683521a9e16a59039.djcache b/server/temp/570eef2524c1a8e683521a9e16a59039.djcache
new file mode 100644
index 0000000000000000000000000000000000000000..f2514f02da48222f899c89b56ace77fb96726813
GIT binary patch
literal 48
zcmZo*oyx@k0q%}BHZtesnC{T4n3J6__taqq#*M*M5yHVm#-Ep|ykcaq@MFCS0A2hL
AApigX

literal 0
HcmV?d00001