Merge branch 'master' of http://git.taauav.net/gitadmin/jndz_admin_web

src/views/chain/assessmentContent.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="software ele-body">
     <el-card shadow="never" element-loading-background="rgba(255, 255, 255, 1)">
-      <search @search:task="updateParams($event)" />
+      <search @search:task="updateParams($event)" :category-list="dataList"/>
       <div class="operating">
         <el-button size="small" type="primary" @click="edit()"
           >新增考核内容</el-button
@@ -13,7 +13,7 @@
             <el-col :span="2" align="center" class="thead td"
               ><span class="cell">编号</span></el-col
             >
-            <el-col :span="5" align="center" class="thead td"
+            <el-col :span="8" align="center" class="thead td"
               ><span class="cell">指标名称与全年目标</span></el-col
             >
             <el-col :span="2" align="center" class="thead td"
@@ -28,64 +28,70 @@
             <el-col :span="3" align="center" class="thead td"
               ><span class="cell">配合部门</span></el-col
             >
-            <el-col :span="3" align="center" class="thead td"
+            <!-- <el-col :span="3" align="center" class="thead td"
               ><span class="cell">打分操作记录</span></el-col
-            >
+            > -->
             <el-col :span="4" align="center" class="thead td"
               ><span class="cell">操作</span></el-col
             >
           </el-row>
         </div>
         <div class="body" :style="{ height: tableHeight + 'px' }">
-          <div class="title">软件与人工智能产业链</div>
           <div v-for="(data, index) of dataList" :key="index">
-            <div class="title">121212</div>
-            <el-row
-              type="flex"
-              style="border-left: 1px solid rgb(237, 237, 237)"
-              v-for="(item, ind) of data"
-              :key="ind"
-            >
-              <el-col :span="2" align="center" class="td"
-                ><span class="cell">编号</span></el-col
-              >
-              <el-col :span="5" align="center" class="td"
-                ><span class="cell">指标名称与全年目标</span></el-col
-              >
-              <el-col :span="2" align="center" class="td"
-                ><span class="cell">分值</span></el-col
-              >
-              <el-col :span="2" align="center" class="td"
-                ><span class="cell">得分</span></el-col
-              >
-              <el-col :span="3" align="center" class="td"
-                ><span class="cell">牵头部门</span></el-col
+            <div class="type title">{{ index + 1 }}、{{ data.name }}</div>
+            <div v-for="(item, ind) of data.children" :key="ind">
+              <div class="title">{{ item.name }}</div>
+              <el-row
+                type="flex"
+                style="border-left: 1px solid rgb(237, 237, 237)"
+                v-for="(detail, i) of item.children"
+                :key="i"
               >
-              <el-col :span="3" align="center" class="td"
-                ><span class="cell">配合部门</span></el-col
-              >
-              <el-col :span="3" align="center" class="td"
-                ><span class="cell">打分操作记录</span></el-col
-              >
-              <el-col :span="4" align="center" class="td"
-                ><span class="cell"
-                  ><el-link
-                    @click="edit(index, ind)"
-                    icon="el-icon-edit"
-                    type="primary"
-                    :underline="false"
-                    >修改</el-link
-                  >
-                  <el-link
-                    slot="reference"
-                    icon="el-icon-delete"
-                    type="danger"
-                    :underline="false"
-                    >删除</el-link
-                  ></span
-                ></el-col
-              >
-            </el-row>
+                <el-col :span="2" align="center" class="td"
+                  ><span class="cell">{{ i + 1 }}</span></el-col
+                >
+                <el-col :span="8" align="center" class="td"
+                  ><span class="cell">{{ detail.content }}</span></el-col
+                >
+                <el-col :span="2" align="center" class="td"
+                  ><span class="cell">{{ detail.points }}</span></el-col
+                >
+                <el-col :span="2" align="center" class="td"
+                  ><span class="cell">{{ detail.score }}</span></el-col
+                >
+                <el-col :span="3" align="center" class="td"
+                  ><span class="cell">
+                    <pre>{{ detail.leaderDeptName }}</pre>
+                  </span></el-col
+                >
+                <el-col :span="3" align="center" class="td"
+                  ><span class="cell">{{
+                    detail.cooperateDeptName
+                  }}</span></el-col
+                >
+                <!-- <el-col :span="3" align="center" class="td"
+                  ><span class="cell">打分操作记录</span></el-col
+                > -->
+                <el-col :span="4" align="center" class="td"
+                  ><span class="cell"
+                    ><el-link
+                      @click="edit(index, ind)"
+                      icon="el-icon-edit"
+                      type="primary"
+                      :underline="false"
+                      >修改</el-link
+                    >
+                    <el-link
+                      slot="reference"
+                      icon="el-icon-delete"
+                      type="danger"
+                      :underline="false"
+                      >删除</el-link
+                    ></span
+                  ></el-col
+                >
+              </el-row>
+            </div>
           </div>
         </div>
         <div class="line"></div>
@@ -101,11 +107,16 @@
       >
         <el-form
           :model="form"
-          label-width="82px"
+          label-width="100px"
           @keyup.enter.native="save"
           @submit.native.prevent
           :rules="rules"
         >
+          <el-form-item label="产业链名称：" prop="">
+            <el-select placeholder="请选择产业链名称">
+              <el-option></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="考核指标：" prop="">
             <el-select placeholder="请选择考核指标">
               <el-option prop=""></el-option>
@@ -180,7 +191,7 @@ import search from "./search";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Treeselect from "@riophae/vue-treeselect"; // 下拉树
 import { mapGetters } from "vuex";
-import api from "@/api/chain/assessmentContent"
+import api from "@/api/chain/assessmentContent";
 export default {
   components: {
     search,
@@ -189,11 +200,7 @@ export default {
   data() {
     return {
       searchParams: {},
-      dataList: [
-        [[], [], [], [], [], [], []],
-        [[], [], [], [], [], []],
-        [[], [], [], []],
-      ],
+      dataList: [],
       tableHeight: document.documentElement.clientHeight - 310,
       showEdit: false,
       title: "",
@@ -203,19 +210,28 @@ export default {
       dialogTitle: "",
     };
   },
-  created(){
+  created() {
     this.getList();
   },
   methods: {
-    getList(){
-      this.loading=true;
-      api.getList(Object.assign({},this.searchParams)).then(res=>{
-        this.dataList=res.data.data;
-      }).catch(e=>{
-        this.dataList=[];
-      }).finally(()=>{
-        this.loading=false;
-      })
+    updateParams(data) {
+      this.searchParams = data;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      api
+        .getList(Object.assign({}, this.searchParams))
+        .then((res) => {
+          this.dataList = res.data.data;
+          console.log(this.dataList);
+        })
+        .catch((e) => {
+          this.dataList = [];
+        })
+        .finally(() => {
+          this.loading = false;
+        });
     },
     edit(index, ind) {
       this.showEdit = true;
@@ -249,7 +265,11 @@ export default {
 }
 .title {
   padding: 10px;
+  font-size: 16px;
+}
+.type {
   font-weight: 700;
+  font-size: 17px;
 }
 .td {
   padding: 10px;

src/views/chain/search.vue

@@ -2,8 +2,23 @@
   <div class="search">
     <el-form :inline="true" :model="searchParams" size="small">
       <el-form-item label="考核指标">
-        <el-select v-model="searchParams.quota">
-          <el-option></el-option>
+        <el-select v-model="searchParams.categoryId">
+          <el-option
+            v-for="(item, index) of categoryList"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="考核指标">
+        <el-select v-model="searchParams.type ">
+          <el-option
+            v-for="(item, index) of quotaList"
+            :key="index"
+            :label="item.quota"
+            :value="item.id"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="考核内容:">
@@ -39,6 +54,12 @@ export default {
         return 1;
       },
     },
+      categoryList:{
+        type:Array,
+        default(){
+          return []
+        }
+      }
   },
   components: {
     Treeselect,
@@ -46,10 +67,15 @@ export default {
   data() {
     return {
       searchParams: {
-        department:'',
-        quota: "",
+        categoryId: "",
+        type: "",
         content: "",
       },
+      quotaList: [
+        { id: 1, quota: "重点指标" },
+        { id: 2, quota: "重点任务" },
+        { id: 3, quota: "加减分考核" },
+      ],
     };
   },
   created() {
@@ -77,5 +103,4 @@ export default {
 </script>
 
 <style scoped>
-
 </style>