提交

src/styles/global.css

@@ -7,7 +7,7 @@
 
 /* 搜索行边距 */
 .search{
-    margin-bottom:20px;
+    margin-bottom:5px;
 }
 
 /* 搜索行样式*/
@@ -16,7 +16,7 @@
 }
 .search .el-form-item{
     margin-right:40px;
-    margin-bottom:35px;
+    margin-bottom:10px;
 }
 
 .search-btn{

src/views/assessingTarget/basicTarget.vue

@@ -11,28 +11,22 @@
         v-loading="loading"
         :span-method="arraySpanMethod"
       >
-        <el-table-column type="index" label="序号" align="center">
+        <el-table-column type="index" label="序号" align="center" width="50">
         </el-table-column>
         <template>
           <el-table-column
             label="一级指标"
-            min-width="150"
+            min-width="100"
             align="center"
             prop="quota1"
           ></el-table-column>
           <el-table-column
             label="二级指标"
-            min-width="150"
+            min-width="100"
             align="center"
             prop="quota2"
           ></el-table-column>
         </template>
-        <el-table-column
-          label="考核指标"
-          min-width="150"
-          align="center"
-          prop=""
-        ></el-table-column>
         <el-table-column
           label="分值"
           min-width="60"
@@ -43,14 +37,14 @@
           <template slot-scope="{ row, $index }">
             <div @dblclick="showText($index, true)" style="height: 100%">
               <el-input
-                v-model="row.expectedPoints"
+                v-model="row.deptPoints"
                 v-if="row.focus"
                 @blur="
                   showText($index, false);
                   updatePoints(row);
                 "
               ></el-input>
-              <span v-else>{{ row.expectedPoints }}</span>
+              <span v-else>{{ row.deptPoints }}</span>
             </div>
           </template>
         </el-table-column>
@@ -83,8 +77,13 @@
         ></el-table-column>
         <el-table-column label="操作" min-width="100" align="center">
           <template slot-scope="{ row }">
-            <el-button type="warning" size="small" @click="showLeaderDept(row)"
-              >设置牵头部门</el-button
+            <el-link
+              slot="reference"
+              icon="el-icon-setting"
+              type="warning"
+              :underline="false"
+              @click="showLeaderDept(row)"
+              >设置牵头部门</el-link
             >
           </template>
         </el-table-column>
@@ -155,7 +154,7 @@ export default {
       dataList: [],
       loading: false,
       count: 0,
-      tableHeight: document.documentElement.clientHeight - 470,
+      tableHeight: document.documentElement.clientHeight - 350,
       page: {
         page: 1,
         limit: Math.floor(
@@ -173,7 +172,7 @@ export default {
       },
       updateData: [],
       showDep: false,
-      type:{type:0}
+      type: { type: 0 },
     };
   },
   created() {
@@ -190,8 +189,8 @@ export default {
     },
   },
   methods: {
-    updateType(data){
-      this.type=data;
+    updateType(data) {
+      this.type = data;
       this.resetCurrentPage();
       this.getDataList();
     },
@@ -249,7 +248,7 @@ export default {
     getDataList() {
       this.loading = true;
       api
-        .getList(Object.assign({},this.type, this.searchParams, this.page))
+        .getList(Object.assign({}, this.type, this.searchParams, this.page))
         .then((res) => {
           this.loading = false;
           let data = res.data.data.records;

src/views/assessingTarget/commonquotatask.vue

@@ -8,23 +8,25 @@
         :height="tableHeight"
         v-loading="loading"
       >
-         <el-table-column
+        <el-table-column type="index" label="序号" 
+        width="50"
+        align="center">
+        </el-table-column>
+        <el-table-column
           label="类别"
-          min-width="80"
+          width="80"
           align="center"
           prop="categoryName"
         ></el-table-column>
-        <el-table-column type="index" label="序号" align="center">
-        </el-table-column>
         <el-table-column
           label="指标名称"
-          min-width="150"
+          min-width="100"
           align="center"
           prop="quotaName"
         ></el-table-column>
         <el-table-column
           label="单位"
-          min-width="60"
+          min-width="50"
           align="center"
           prop="quotaUnit"
         ></el-table-column>
@@ -47,7 +49,7 @@
           prop="binjiangDevzone"
         ></el-table-column>
       </el-table>
-      <!-- <el-pagination
+      <el-pagination
         :current-page.sync="page.page"
         :page-size="page.limit"
         :total="count"
@@ -56,28 +58,26 @@
         :pager-count="5"
         class="ele-pagination-circle"
         @current-change="getDataList()"
-      /> -->
+      />
     </el-card>
   </div>
 </template>
 
 <script>
 import api from "@/api/assessingTarget/commonquotatask";
-import {quota} from "@/utils/mixin"
+import { quota } from "@/utils/mixin";
 export default {
-  components: {
-
-    },
+  components: {},
   data() {
     return {
       dataList: [],
       loading: false,
       count: 0,
-      tableHeight:document.documentElement.clientHeight - 220,
+      tableHeight: document.documentElement.clientHeight - 220,
       page: {
         page: 1,
         limit: Math.floor(
-          (document.documentElement.clientHeight - 470 - 45) / 45
+          (document.documentElement.clientHeight - 220 - 45) / 45
         ),
       },
     };
@@ -86,15 +86,14 @@ export default {
     this.getDataList();
   },
   methods: {
-   
     getDataList() {
       this.loading = true;
       api
-        .getList( this.page )
+        .getList(this.page)
         .then((res) => {
           this.loading = false;
-          let data = res.data.data
-          this.dataList = data;
+          let data = res.data.data;
+          this.dataList = data.records;
           this.count = res.data.data.total;
         })
         .catch(() => {

src/views/assessingTarget/constraint.vue

@@ -11,42 +11,42 @@
         v-loading="loading"
         :span-method="arraySpanMethod"
       >
-        <el-table-column type="index" label="序号" align="center">
+        <el-table-column type="index" label="序号" align="center" width="50">
         </el-table-column>
         <el-table-column
           label="考核指标"
-          min-width="150"
+          min-width="60"
           align="center"
           prop="quota"
         ></el-table-column>
         <el-table-column
           label="考核内容和计分细则"
-          min-width="200"
+          min-width="250"
           align="center"
           prop="content"
         ></el-table-column>
-        <el-table-column label="预计扣分" min-width="60" align="center">
+        <el-table-column label="预计扣分" width="80" align="center">
           <template slot-scope="{ row, $index }">
             <div @dblclick="showText($index, true)" style="height: 100%">
               <el-input
-                v-model="row.expectedPoints"
+                v-model="row.deptPoints"
                 v-if="row.focus"
                 @blur="
                   showText($index, false);
                   updatePoints(row);
                 "
               ></el-input>
-              <span v-else>{{ row.expectedPoints }}</span>
+              <span v-else>{{ row.deptPoints }}</span>
             </div>
           </template>
         </el-table-column>
         <el-table-column
           label="区牵头单位"
-          min-width="80"
+          width="95"
           align="center"
           prop="leaderUnit"
         ></el-table-column>
-        <el-table-column label="牵头部门" min-width="150" align="center">
+        <el-table-column label="牵头部门" min-width="100" align="center">
           <template slot-scope="{ row }">
             <span>{{ row.leaderDeptList | formatList }}</span>
           </template>
@@ -64,13 +64,18 @@
         <el-table-column
           label="备注"
           align="center"
-          min-width="150"
+          min-width="100"
           prop="note"
         ></el-table-column>
-        <el-table-column label="操作" min-width="100" align="center">
+        <el-table-column label="操作" min-width="80" align="center">
           <template slot-scope="{ row }">
-            <el-button type="warning" size="small" @click="showLeaderDept(row)"
-              >设置牵头部门</el-button
+            <el-link
+              slot="reference"
+              icon="el-icon-setting"
+              type="warning"
+              :underline="false"
+               @click="showLeaderDept(row)"
+              >设置牵头部门</el-link
             >
           </template>
         </el-table-column>
@@ -233,7 +238,7 @@ export default {
     getDataList() {
       this.loading = true;
       api
-        .getList(Object.assign({},this.type, this.searchParams, this.page))
+        .getList(Object.assign({}, this.type, this.searchParams, this.page))
         .then((res) => {
           this.loading = false;
           let data = res.data.data.records;

src/views/assessingTarget/reward.vue

@@ -16,23 +16,18 @@
         <template>
           <el-table-column
             label="一级指标"
-            min-width="150"
+            min-width="100"
             align="center"
             prop="quota1"
           ></el-table-column>
           <el-table-column
             label="二级指标"
-            min-width="150"
+            min-width="100"
             align="center"
             prop="quota2"
           ></el-table-column>
         </template>
-        <el-table-column
-          label="考核指标"
-          min-width="150"
-          align="center"
-          prop=""
-        ></el-table-column>
+
         <el-table-column
           label="封顶分值"
           min-width="60"
@@ -43,14 +38,14 @@
           <template slot-scope="{ row, $index }">
             <div @dblclick="showText($index, true)" style="height: 100%">
               <el-input
-                v-model="row.expectedPoints"
+                v-model="row.deptPoints"
                 v-if="row.focus"
                 @blur="
                   showText($index, false);
                   updatePoints(row);
                 "
               ></el-input>
-              <span v-else>{{ row.expectedPoints }}</span>
+              <span v-else>{{ row.deptPoints }}</span>
             </div>
           </template>
         </el-table-column>
@@ -83,8 +78,13 @@
         ></el-table-column>
         <el-table-column label="操作" min-width="100" align="center">
           <template slot-scope="{ row }">
-            <el-button type="warning" size="small" @click="showLeaderDept(row)"
-              >设置牵头部门</el-button
+            <el-link
+              slot="reference"
+              icon="el-icon-setting"
+              type="warning"
+              :underline="false"
+              @click="showLeaderDept(row)"
+              >设置牵头部门</el-link
             >
           </template>
         </el-table-column>
@@ -247,7 +247,7 @@ export default {
     getDataList() {
       this.loading = true;
       api
-        .getList(Object.assign({},this.type, this.searchParams, this.page))
+        .getList(Object.assign({}, this.type, this.searchParams, this.page))
         .then((res) => {
           this.loading = false;
           let data = res.data.data.records;

src/views/assessingTarget/search.vue

@@ -91,18 +91,16 @@
           "
         />
       </el-form-item>
-      <el-form-item>
-        <el-button type="primary" size="small" @click="search">查询</el-button>
-        <el-button
-          type="default"
-          size="small"
-          @click="
-            clear();
-            search();
-          "
-          >清空</el-button
-        >
-      </el-form-item>
+      <el-button type="primary" size="small" @click="search">查询</el-button>
+      <el-button
+        type="default"
+        size="small"
+        @click="
+          clear();
+          search();
+        "
+        >清空</el-button
+      >
     </el-form>
   </div>
 </template>
@@ -177,5 +175,12 @@ export default {
 };
 </script>
 
-<style>
+<style scoped>
+ .vue-treeselect,
+/deep/ .vue-treeselect__control,
+/deep/ .vue-treeselect__value-container {
+  height: 20px;
+  line-height: 32px;
+  box-sizing: border-box;
+}
 </style>

src/views/assessingTarget/tab.vue

@@ -25,9 +25,12 @@ export default {
 <style scoped>
 .el-radio-button,
 /deep/ .el-radio-button__inner {
-  height: 45px;
-  width: 120px;
-  line-height: 23px;
-  font-size: 16px;
+  height: 35px;
+  width: 100px;
+  line-height: 14px;
+  font-size: 14px;
+}
+.el-radio-group{
+  margin-bottom: 10px!important;
 }
 </style>

src/views/summary/basicTarget.vue

@@ -44,7 +44,7 @@
           label="预计得分"
           min-width="60"
           align="center"
-          prop="expectedPoints"
+          prop="expectedScore"
         ></el-table-column>
         <el-table-column
           label="区牵头单位"