修改文字

2022-11-28 10:13:35 +08:00 · 2022-11-28 10:13:35 +08:00 · 4d0cb487e1
parent 7b956f5ef5
commit 4d0cb487e1
7 changed files with 67 additions and 32 deletions
--- 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'

--- 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/`,
--- 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";
--- 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);
+          });
      },
    },

--- 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) {
--- 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',
+    }
 }
--- a/server/temp/570eef2524c1a8e683521a9e16a59039.djcache
+++ b/server/temp/570eef2524c1a8e683521a9e16a59039.djcache