From e8672494e4302651ecb087caf26cbc9974ffeb37 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 10 Aug 2023 10:34:23 +0800
Subject: [PATCH] fix

---
 src/components/Header.vue              |    2 +-
 src/setting.js                         |    2 +-
 src/utils/api.js                       |    1 +
 src/views/customer/customer.vue        |  618 ++++++----
 src/views/match/add/set.vue            |    8 +-
 src/views/match/manage/matchReport.vue |  563 +++++----
 src/views/parner/rate.vue              |  962 ++++++++-------
 src/views/serve/projectAdd.vue         | 1548 +++++++++++++-----------
 src/views/serve/projectList.vue        |    6 +-
 src/views/shop/addProduct/index.vue    |    3 +-
 10 files changed, 2036 insertions(+), 1677 deletions(-)

diff --git a/src/components/Header.vue b/src/components/Header.vue
index 6a85fb8..e4081eb 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -87,13 +87,13 @@ export default {
 
     getUserInfo () {
       this.$get(this.api.queryUserInfoDetails).then(({ result }) => {
-        this.initSocket(result.userAccount)
         let userInfo = result.hrUserInfo
         if (userInfo.userAvatars) this.$store.commit('userAvatar', { avatar: userInfo.userAvatars })
         this.userName = userInfo.userName
         const { id } = result.userAccount
         id && this.$store.commit('SET_ACCOUNTID', id)
         this.$store.commit('SET_USERNAME', this.userName)
+        this.initSocket(result.userAccount)
       }).catch(err => { })
     },
   },
diff --git a/src/setting.js b/src/setting.js
index 8550266..b8f4811 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -11,7 +11,7 @@ if (isDev) {
   jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
   host = 'http://121.37.12.51/'
   // host = 'https://huorantech.cn/'
-  host = 'http://192.168.31.152:9000/'// 榕
+  host = 'http://192.168.31.217:9000/'// 榕
   // host = 'http://192.168.31.51:9000/'// 赓
 } else if (isPro) {
   jumpPath = 'https://www.huorantech.cn/judgmentPoint/'
diff --git a/src/utils/api.js b/src/utils/api.js
index b9faaf0..263102f 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -45,6 +45,7 @@ export default {
     orderBulkDisableEnable: `nakadai/nakadai/orderOther/orderBulkDisableEnable`,
     exportSubscribedRecords: `nakadai/nakadai/order/exportSubscribedRecords`,
     addNewCustomersByOneself: `nakadai/nakadai/school/addNewCustomersByOneself`,
+    exportClient: `${host}nakadai/nakadai/customer/exportClient`,
 
     resetPwdCustomer: `nakadai/nakadai/customer/resetPwd`,
     queryCustomerIsExists: `nakadai/nakadai/customer/queryCustomerIsExists`,
diff --git a/src/views/customer/customer.vue b/src/views/customer/customer.vue
index eddfcc9..79634d3 100644
--- a/src/views/customer/customer.vue
+++ b/src/views/customer/customer.vue
@@ -1,263 +1,389 @@
 <template>
-    <div>
-        <el-card shadow="hover" class="mgb20">
-            <div>
-                <div class="flex-center mgb20">
-                    <p class="hr_tag"></p>
-                    <span>筛选</span>
-                </div>
-                <div>
-                    <el-form label-width="80px">
-                        <el-col :span="4">
-                            <el-form-item label="国家">
-                                <el-select v-model="form.countries" placeholder="请选择国家">
-                                    <el-option v-for="(item,index) in countryList" :key="index" :label="item.name" :value="item.name"></el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="4">
-                            <el-form-item label="省份">
-                                <el-select v-model="form.provinces" clearable placeholder="请选择省份" @change="getCity" @clear="clearprovince">
-                                    <el-option v-for="(item,index) in provinceList" :key="index" :label="item.provinceName" :value="item.provinceId"></el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="4">
-                            <el-form-item label="城市">
-                                <el-select v-model="form.city" clearable placeholder="请选择城市" :disabled="form.provinces ? false : true" @change="initData">
-                                    <el-option v-for="(item,index) in cityList" :key="index" :label="item.cityName" :value="item.cityId"></el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="6">
-                            <el-form-item>
-                                <el-input placeholder="支持客户,联系人,账号搜索" prefix-icon="el-icon-search" v-model="form.keyword" clearable></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-form>
-                </div>
-            </div>  
-        </el-card>
+  <div>
+    <el-card shadow="hover"
+             class="mgb20">
+      <div>
+        <div class="flex-center mgb20">
+          <p class="hr_tag"></p>
+          <span>筛选</span>
+        </div>
+        <div>
+          <el-form label-width="80px">
+            <el-col :span="4">
+              <el-form-item label="省份">
+                <el-select v-model="form.provinces"
+                           clearable
+                           placeholder="请选择省份"
+                           @change="getCity"
+                           @clear="clearprovince">
+                  <el-option v-for="(item,index) in provinceList"
+                             :key="index"
+                             :label="item.provinceName"
+                             :value="item.provinceId"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="城市">
+                <el-select v-model="form.city"
+                           clearable
+                           placeholder="请选择城市"
+                           :disabled="form.provinces ? false : true"
+                           @change="initData">
+                  <el-option v-for="(item,index) in cityList"
+                             :key="index"
+                             :label="item.cityName"
+                             :value="item.cityId"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="客户类型">
+                <el-select v-model="form.customerType"
+                           placeholder="请选择客户类型"
+                           @change="initData">
+                  <el-option v-for="(item,index) in customerTypeList"
+                             :key="index"
+                             :label="item.name"
+                             :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item>
+                <el-input placeholder="支持客户,联系人,账号搜索"
+                          prefix-icon="el-icon-search"
+                          v-model="form.keyword"
+                          clearable></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </div>
+      </div>
+    </el-card>
 
-        <el-card shadow="hover" class="card">
-            <div class="flex-between mgb20">
-                <div class="flex-center">
-                    <p class="hr_tag"></p>
-                    <span>客户列表</span>
-                </div>
-                <div>
-                    <el-button type="primary" round class="mag" @click="addcustomer" v-auth>新增</el-button>
-                    <el-button type="primary" round @click="delAllSelection" v-auth>批量删除</el-button>
-                </div>
-            </div>
-            <el-table v-loading="loading" :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="customerId">
-                <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
-                <el-table-column type="index" width="100" label="序号" align="center">
-                    <template slot-scope="scope">
-                        {{scope.$index + (page - 1) * pageSize + 1}}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="customerName" label="客户名称" align="center">
-                </el-table-column>
-                <el-table-column label="行业" align="center">
-                    <template slot-scope="scope">
-                        <span class="ellipsis">{{scope.row.industryName}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="countries" label="国家" align="center">
-                </el-table-column>
-                <el-table-column prop="provinceName" label="省份" align="center">
-                </el-table-column>
-                <el-table-column prop="cityName" label="城市" align="center">
-                </el-table-column>
-                <el-table-column prop="name" label="联系人" align="center">
-                </el-table-column>
-                <el-table-column prop="account" label="账号" align="center">
-                </el-table-column>
-                <el-table-column prop="loginNumber" label="登录次数" align="center">
-                </el-table-column>
-                <el-table-column label="操作" width="270" align="center">
-                    <template slot-scope="scope">
-                        <el-button type="text" @click="resetPassword(scope.row)" v-auth>重置密码</el-button>
-                        <el-button type="text" @click="show(scope.row)" v-auth>查看</el-button>
-                        <el-button type="text" @click="edit(scope.row)" v-auth>编辑</el-button>
-                        <el-button type="text" @click="handleDelete(scope.row)" v-auth>删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <div class="pagination">
-                <el-pagination background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" :current-page="page">
-                </el-pagination>
-            </div>
-        </el-card>
-    </div>
+    <el-card shadow="hover"
+             class="card">
+      <div class="flex-between mgb20">
+        <div class="flex-center">
+          <p class="hr_tag"></p>
+          <span>客户列表</span>
+        </div>
+        <div>
+          <el-button type="primary"
+                     round
+                     class="mag"
+                     @click="exportData">导出客户列表</el-button>
+          <el-button type="primary"
+                     round
+                     class="mag"
+                     @click="addcustomer"
+                     v-auth>新增</el-button>
+          <el-button type="primary"
+                     round
+                     @click="delAllSelection"
+                     v-auth>批量删除</el-button>
+        </div>
+      </div>
+      <el-table v-loading="loading"
+                :data="listData"
+                class="table"
+                ref="table"
+                stripe
+                header-align="center"
+                @selection-change="handleSelectionChange"
+                row-key="customerId">
+        <el-table-column type="selection"
+                         width="55"
+                         align="center"
+                         :reserve-selection="true"></el-table-column>
+        <el-table-column type="index"
+                         width="100"
+                         label="序号"
+                         align="center">
+          <template slot-scope="scope">
+            {{scope.$index + (page - 1) * pageSize + 1}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="customerName"
+                         label="客户名称"
+                         align="center">
+        </el-table-column>
+        <el-table-column label="行业"
+                         align="center">
+          <template slot-scope="scope">
+            <span class="ellipsis">{{scope.row.industryName}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="countries"
+                         label="客户类型"
+                         align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.customerType">{{ customerTypeList.find(e => e.value == scope.row.customerType).name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="provinceName"
+                         label="省份"
+                         align="center">
+        </el-table-column>
+        <el-table-column prop="cityName"
+                         label="城市"
+                         align="center">
+        </el-table-column>
+        <el-table-column prop="name"
+                         label="联系人"
+                         align="center">
+        </el-table-column>
+        <el-table-column prop="account"
+                         label="账号"
+                         align="center">
+        </el-table-column>
+        <el-table-column prop="loginNumber"
+                         label="登录次数"
+                         align="center">
+        </el-table-column>
+        <el-table-column label="操作"
+                         width="270"
+                         align="center">
+          <template slot-scope="scope">
+            <el-button type="text"
+                       @click="resetPassword(scope.row)"
+                       v-auth>重置密码</el-button>
+            <el-button type="text"
+                       @click="show(scope.row)"
+                       v-auth>查看</el-button>
+            <el-button type="text"
+                       @click="edit(scope.row)"
+                       v-auth>编辑</el-button>
+            <el-button type="text"
+                       @click="handleDelete(scope.row)"
+                       v-auth>删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination">
+        <el-pagination background
+                       layout="total, prev, pager, next"
+                       :total="total"
+                       @current-change="handleCurrentChange"
+                       :current-page="page">
+        </el-pagination>
+      </div>
+    </el-card>
+  </div>
 </template>
 
 <script>
 import Setting from '@/setting'
+import axios from 'axios';
+import util from "@/libs/util";
 export default {
-    name: 'customer',
-    data() {
-        return {
-            loading:false,
-            searchTimer: null,
-            countryList: [{
-                name:'中国'
-            }],
-            listData: [],
-            form: {
-                countries:'中国',
-                provinces: '',
-                city: '',
-                keyword: ''
-            },
-            multipleSelection: [],
-            provinceList: [],
-            cityList: [],
-            page: +this.$route.query.page || 1,
-            pageSize: 10,
-            total: 0,
-            ruleIds: []
-        };
-    },
-    watch: {
-        'form.keyword': function(val) {
-            clearTimeout(this.searchTimer)
-            this.searchTimer = setTimeout(() => {
-                this.initData()
-            },500)
-        },
-    },
-    mounted() {
-        this.getData()
-        this.getProvince()
-    },
-    methods: {
-        getData() {
-            const sid = this.$store.state.dataPer.find(e => e.permissionName === '客户管理')
-            this.loading = true
-            this.$post(this.api.queryCustomer,{
-                countries: this.form.countries,
-                provinceId: this.form.provinces,
-                cityId: this.form.city,
-                searchContent: this.form.keyword,
-                page: this.page,
-                size: this.pageSize,
-                supplierId: (sid && !sid.all) ? sid.supplierId : ''
-            }).then(res => {
-                this.listData = res.message.list
-                this.total = res.message.totalCount
-                this.loading = false
-            }).catch(res => {
-                this.loading = false
-            })
-        },
-        initData(){
-            this.page = 1
-            this.getData()
-        },
-        getProvince(){
-            this.$get(this.api.queryProvince).then(res => {
-                this.provinceList = res.list
-                this.$store.commit("provinceData", { provinceList : this.provinceList})
-            }).catch(res => {})
-        },
-        clearprovince(){
-            this.form.city = ''
-        },
-        getCity(){
-           this.clearprovince()
-           this.getCityData()
-           this.page = 1
-           this.initData()
+  name: 'customer',
+  data () {
+    return {
+      loading: false,
+      searchTimer: null,
+      countryList: [{
+        name: '中国'
+      }],
+      customerTypeList: [
+        {
+          value: '',
+          name: '不限'
         },
-        getCityData(){
-            let data = {
-                provinceId: this.form.provinces
-            }
-            this.$get(this.api.queryCity,data).then(res => {
-                this.cityList = res.list
-            }).catch(res => {})
-        },
-        permission(row){
-            this.$router.push(`/permission?name=${row.customerName}`)
-        },
-        addcustomer(){
-            this.$router.push('addcustomer')
+        {
+          name: '正式',
+          value: 1
         },
-        edit(row){
-            this.$router.push(`addcustomer?id=${row.customerId}`)
+        {
+          name: '试用',
+          value: 2
         },
-        show(row){
-            this.$router.push(`addcustomer?id=${row.customerId}&show=true`)
+        {
+          name: '到期',
+          value: 3
+        }],
+      listData: [],
+      form: {
+        customerType: '',
+        provinces: '',
+        city: '',
+        keyword: ''
+      },
+      multipleSelection: [],
+      provinceList: [],
+      cityList: [],
+      page: +this.$route.query.page || 1,
+      pageSize: 10,
+      total: 0,
+      ruleIds: []
+    };
+  },
+  watch: {
+    'form.keyword': function (val) {
+      clearTimeout(this.searchTimer)
+      this.searchTimer = setTimeout(() => {
+        this.initData()
+      }, 500)
+    },
+  },
+  mounted () {
+    this.getData()
+    this.getProvince()
+  },
+  methods: {
+    getData () {
+      const sid = this.$store.state.dataPer.find(e => e.permissionName === '客户管理')
+      this.loading = true
+      this.$post(this.api.queryCustomer, {
+        provinceId: this.form.provinces,
+        cityId: this.form.city,
+        customerType: this.form.customerType,
+        searchContent: this.form.keyword,
+        page: this.page,
+        size: this.pageSize,
+        supplierId: (sid && !sid.all) ? sid.supplierId : ''
+      }).then(res => {
+        this.listData = res.message.list
+        this.total = res.message.totalCount
+        this.loading = false
+      }).catch(res => {
+        this.loading = false
+      })
+    },
+    initData () {
+      this.page = 1
+      this.getData()
+    },
+    getProvince () {
+      this.$get(this.api.queryProvince).then(res => {
+        this.provinceList = res.list
+        this.$store.commit("provinceData", { provinceList: this.provinceList })
+      }).catch(res => { })
+    },
+    clearprovince () {
+      this.form.city = ''
+    },
+    getCity () {
+      this.clearprovince()
+      this.getCityData()
+      this.page = 1
+      this.initData()
+    },
+    getCityData () {
+      let data = {
+        provinceId: this.form.provinces
+      }
+      this.$get(this.api.queryCity, data).then(res => {
+        this.cityList = res.list
+      }).catch(res => { })
+    },
+    permission (row) {
+      this.$router.push(`/permission?name=${row.customerName}`)
+    },
+    // 导出
+    async exportData () {
+      let sid = this.$store.state.dataPer.find(e => e.permissionName === '客户管理')
+      sid = (sid && !sid.all) ? sid.supplierId : ''
+      let list = this.multipleSelection
+      // 没勾选，则查询所有成绩
+      if (!list.length) {
+        const res = await this.$post(this.api.queryCustomer, {
+          page: 1,
+          size: 1000,
+          supplierId: sid
+        })
+        list = res.message.list
+      }
+      const ids = list.map(e => e.customerId)
+      axios.post(this.api.exportClient, {
+        exportCustomerIds: ids,
+        supplierId: sid
+      }, {
+        headers: {
+          token: this.token
         },
-        handleDelete(row) {
-            this.$confirm('确定要删除吗？', '提示', {
-                type: 'warning'
-            }).then(() => {
-                this.$post(this.api.delCustomers,[row.customerId]).then(res => {
-                    this.$message.success('删除成功')
-                    if(this.listData.length == 2){
+        responseType: 'blob'
+      }).then((res) => {
+        util.downloadFileDirect(`客户列表.xlsx`, new Blob([res.data]))
+      }).catch(res => { })
+    },
+    addcustomer () {
+      this.$router.push('addcustomer')
+    },
+    edit (row) {
+      this.$router.push(`addcustomer?id=${row.customerId}`)
+    },
+    show (row) {
+      this.$router.push(`addcustomer?id=${row.customerId}&show=true`)
+    },
+    handleDelete (row) {
+      this.$confirm('确定要删除吗？', '提示', {
+        type: 'warning'
+      }).then(() => {
+        this.$post(this.api.delCustomers, [row.customerId]).then(res => {
+          this.$message.success('删除成功')
+          if (this.listData.length == 2) {
 
-                    }else{
-                        if(this.page > 1){
-                            this.page = this.page-1
-                        }
-                    }
-                    this.getData()
-                }).catch(res => {})
-            }).catch(() => {})
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val
-        },
-        delAllSelection() {
-            if(this.multipleSelection.length != ''){
-                let arr = this.multipleSelection
-                let delList = arr.map(item => {
-                    return item.customerId
-                })
-                this.$confirm('确定要删除吗？', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    this.$post(this.api.delCustomers,delList).then(res => {
-                        this.multipleSelection = [];
-                        if(delList.length == this.listData.length){
-                            if(this.page > 1){
-                                this.page = this.page-1
-                            }
-                        }
-                        this.$refs.table.clearSelection()
-                        this.$message.success('删除成功')
-                        this.getData()
-                    }).catch(res => {})
-                }).catch(() => {})
-            }else{
-                this.$message.error('请先选择数据')
+          } else {
+            if (this.page > 1) {
+              this.page = this.page - 1
             }
-        },
-        handleCurrentChange(val) {
-            this.page = val
-            this.$store.commit('SET_C_PAGE', val)
-            this.$router.push(`customer?page=${val}`)
+          }
+          this.getData()
+        }).catch(res => { })
+      }).catch(() => { })
+    },
+    handleSelectionChange (val) {
+      this.multipleSelection = val
+    },
+    delAllSelection () {
+      if (this.multipleSelection.length != '') {
+        let arr = this.multipleSelection
+        let delList = arr.map(item => {
+          return item.customerId
+        })
+        this.$confirm('确定要删除吗？', '提示', {
+          type: 'warning'
+        }).then(() => {
+          this.$post(this.api.delCustomers, delList).then(res => {
+            this.multipleSelection = [];
+            if (delList.length == this.listData.length) {
+              if (this.page > 1) {
+                this.page = this.page - 1
+              }
+            }
+            this.$refs.table.clearSelection()
+            this.$message.success('删除成功')
             this.getData()
-        },
-        resetPassword(row){
-            this.$confirm(`重置后的密码为：${Setting.initialPassword}，确定重置？`, '提示', {
-                }).then(() => {
-                    this.$get(this.api.resetPwdCustomer,{
-                        customerId: row.customerId,
-                    }).then(res => {
-                        if(res.message == 'success'){
-                            this.$message.success('重置成功')
-                        }else{
-                            this.$message.error('重置失败')
-                        }
-                    }).catch(res => {});
-                }).catch(() => {
-            });
-        },
-    }
+          }).catch(res => { })
+        }).catch(() => { })
+      } else {
+        this.$message.error('请先选择数据')
+      }
+    },
+    handleCurrentChange (val) {
+      this.page = val
+      this.$store.commit('SET_C_PAGE', val)
+      this.$router.push(`customer?page=${val}`)
+      this.getData()
+    },
+    resetPassword (row) {
+      this.$confirm(`重置后的密码为：${Setting.initialPassword}，确定重置？`, '提示', {
+      }).then(() => {
+        this.$get(this.api.resetPwdCustomer, {
+          customerId: row.customerId,
+        }).then(res => {
+          if (res.message == 'success') {
+            this.$message.success('重置成功')
+          } else {
+            this.$message.error('重置失败')
+          }
+        }).catch(res => { });
+      }).catch(() => {
+      });
+    },
+  }
 };
 </script>
 
diff --git a/src/views/match/add/set.vue b/src/views/match/add/set.vue
index c3cf8ac..01c8fae 100644
--- a/src/views/match/add/set.vue
+++ b/src/views/match/add/set.vue
@@ -172,7 +172,13 @@ export default {
       }).then(({ page }) => {
         const list = page.records
         this.curriculumList = page.records
-        if (!this.form.mallId && list.length) this.form.mallId = list[0].mallId
+        if (list.length) {
+          const { mallId, cid, systemId } = this.form
+          const first = list[0]
+          this.form.mallId = mallId || first.mallId
+          this.form.cid = cid || +first.associatedProduct
+          this.sysId = systemId || +first.systemId
+        }
 
         this.courseChange()
       }).catch(err => {
diff --git a/src/views/match/manage/matchReport.vue b/src/views/match/manage/matchReport.vue
index 39db21b..70f2700 100644
--- a/src/views/match/manage/matchReport.vue
+++ b/src/views/match/manage/matchReport.vue
@@ -1,244 +1,308 @@
 <template>
-    <div class="wrap">
-        <el-card shadow="hover" class="m-b-20">
-            <el-page-header @back="$router.back()" content="查看报告"></el-page-header>
-        </el-card>
+  <div class="wrap">
+    <el-card shadow="hover"
+             class="m-b-20">
+      <el-page-header @back="$router.back()"
+                      content="查看报告"></el-page-header>
+    </el-card>
 
-        <div class="content">
-            <div class="text-right">
-              <el-button type="primary" @click="exportPage">导出报告</el-button>
+    <div class="content">
+      <div class="text-right">
+        <el-button type="primary"
+                   @click="exportPage">导出报告</el-button>
+      </div>
+      <h6 class="r-title">标准实验报告</h6>
+      <div class="info">
+        <h6 class="l-title">
+          <img src="@/assets/img/info1.png"
+               alt="">
+          基本信息
+        </h6>
+        <ul :class="['info-list', {edit: editing}]">
+          <li>
+            <label>学生姓名：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.userName"
+                      disabled></el-input>
+            <span v-else>{{ infoData.userName }}</span>
+          </li>
+          <li>
+            <label>学生学号：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.workNumber"
+                      disabled></el-input>
+            <span v-else>{{ infoData.workNumber }}</span>
+          </li>
+          <li>
+            <label>实验时间：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.submitTime"
+                      disabled></el-input>
+            <span v-else>{{ infoData.submitTime }}</span>
+          </li>
+          <li>
+            <label>实验成绩：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.score"
+                      disabled></el-input>
+            <div v-else
+                 class="score-wrap">
+              <em>{{ infoData.score }}</em>
+              <img src="@/assets/img/point.png"
+                   alt="">
             </div>
-            <h6 class="r-title">标准实验报告</h6>
-            <div class="info">
-                <h6 class="l-title">
-                    <img src="@/assets/img/info1.png" alt="">
-                    基本信息
-                </h6>
-                <ul :class="['info-list', {edit: editing}]">
-                    <li>
-                        <label>学生姓名：</label>
-                        <el-input v-if="editing" v-model="infoData.userName" disabled></el-input>
-                        <span v-else>{{ infoData.userName }}</span>
-                    </li>
-                    <li>
-                        <label>学生学号：</label>
-                        <el-input v-if="editing" v-model="infoData.workNumber" disabled></el-input>
-                        <span v-else>{{ infoData.workNumber }}</span>
-                    </li>
-                    <li>
-                        <label>实验时间：</label>
-                        <el-input v-if="editing" v-model="infoData.submitTime" disabled></el-input>
-                        <span v-else>{{ infoData.submitTime }}</span>
-                    </li>
-                    <li>
-                        <label>实验成绩：</label>
-                        <el-input v-if="editing" v-model="infoData.score" disabled></el-input>
-                        <div v-else class="score-wrap">
-                            <em>{{ infoData.score }}</em>
-                            <img src="@/assets/img/point.png" alt="">
-                        </div>
-                    </li>
-                    <li>
-                        <label>学生班级：</label>
-                        <el-input v-if="editing" v-model="infoData.className"></el-input>
-                        <span v-else>{{ infoData.className }}</span>
-                    </li>
-                    <li>
-                        <label>指导老师：</label>
-                        <el-input v-if="editing" v-model="infoData.instructor"></el-input>
-                        <span v-else>{{ infoData.instructor }}</span>
-                    </li>
-                    <li>
-                        <label>实验学时：</label>
-                        <el-input v-if="editing" v-model="infoData.period"></el-input>
-                        <span v-else>{{ infoData.period }}</span>
-                    </li>
-                </ul>
-                <div class="m-b-20">
-                    <h6 class="l-title">
-                        <img src="@/assets/img/report2.png" alt="">
-                        实验项目名称
-                    </h6>
-                    <el-input v-if="editing" v-model="form.projectName" type="textarea"></el-input>
-                    <div v-else class="pre-wrap" v-html="form.projectName"></div>
-                </div>
-                <div class="m-b-20">
-                    <h6 class="l-title">
-                        <img src="@/assets/img/report3.png" alt="">
-                        实验目的
-                    </h6>
-                    <div :class="['pre-wrap', {edit: editing}]" v-html="form.purpose"></div>
+          </li>
+          <li>
+            <label>学生班级：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.className"></el-input>
+            <span v-else>{{ infoData.className }}</span>
+          </li>
+          <li>
+            <label>指导老师：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.instructor"></el-input>
+            <span v-else>{{ infoData.instructor }}</span>
+          </li>
+          <li>
+            <label>实验学时：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.period"></el-input>
+            <span v-else>{{ infoData.period }}</span>
+          </li>
+        </ul>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report2.png"
+                 alt="">
+            实验项目名称
+          </h6>
+          <el-input v-if="editing"
+                    v-model="form.projectName"
+                    type="textarea"></el-input>
+          <div v-else
+               class="pre-wrap"
+               v-html="form.projectName"></div>
+        </div>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report3.png"
+                 alt="">
+            实验目的
+          </h6>
+          <div :class="['pre-wrap', {edit: editing}]"
+               v-html="form.purpose"></div>
+        </div>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report4.png"
+                 alt="">
+            实验数据
+          </h6>
+          <el-table :data="expData"
+                    class="table"
+                    border
+                    stripe
+                    header-align="center">
+            <el-table-column type="index"
+                             label="序号"
+                             align="center"
+                             width="60">
+              <template slot-scope="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="judgmentName"
+                             label="判分点"
+                             width="270"
+                             align="center"></el-table-column>
+            <el-table-column v-if='project'
+                             prop="judgmentName"
+                             label="考核点"
+                             align="center"
+                             width="150">
+              <template slot-scope="scope">
+                <div v-for="(item, index) in scope.row.lcRuleRecords"
+                     :key="index">
+                  <span>
+                    <span>{{index+1}}. </span>{{item.name}}
+                  </span>
                 </div>
-                <div class="m-b-20">
-                    <h6 class="l-title">
-                        <img src="@/assets/img/report4.png" alt="">
-                        实验数据
-                    </h6>
-                    <el-table :data="expData" class="table" border stripe header-align="center">
-                        <el-table-column type="index" label="序号" align="center" width="60">
-                            <template slot-scope="scope">
-                                {{ scope.$index + 1 }}
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="judgmentName" label="判分点" width="270" align="center"></el-table-column>
-                        <el-table-column v-if='project' prop="judgmentName" label="考核点" align="center" width="150">
-                            <template slot-scope="scope">
-                                <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                                    <span>
-                                        <span>{{index+1}}. </span>{{item.name}}
-                                    </span>
-                                </div>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="ruleAnswer" label="参考答案" style='word-wrap: break-word'>
-                            <template slot-scope="scope">
-                                <div v-if='scope.row.lcRuleRecords'>
-                                    <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                                    <span>
-                                        <span>{{index+1}}. </span>{{item.ruleAnswer}}
-                                    </span>
-                                    </div>
-                                </div>
-                                <div v-else v-html="scope.row.referenceAnswer"></div>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="userAnswer" label="学生答案">
-                            <template slot-scope="scope">
-                                <div v-if='scope.row.lcRuleRecords'>
-                                    <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                                        <span v-if='item.userAnswer'>
-                                            <span>{{index+1}}. </span>{{item.userAnswer}}
-                                        </span>
-                                        <span v-else>
-                                            <span>{{index+1}}. </span>未填写
-                                        </span>
-                                    </div>
-                                </div>
-                                <div v-else v-html='scope.row.answer' style='white-space: pre-wrap'></div>
-                                <template v-if="scope.row.runThePictureList">
-                                  <img v-for="(img, i) in scope.row.runThePictureList" :key="i" width="200" class="result-pic" :src="img" alt="">
-                                </template>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="score" label="得分" width="80" align="center"></el-table-column>
-                    </el-table>
+              </template>
+            </el-table-column>
+            <el-table-column prop="ruleAnswer"
+                             label="参考答案"
+                             style='word-wrap: break-word'>
+              <template slot-scope="scope">
+                <div v-if='scope.row.lcRuleRecords'>
+                  <div v-for="(item, index) in scope.row.lcRuleRecords"
+                       :key="index">
+                    <span>
+                      <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                    </span>
+                  </div>
                 </div>
-                <div class="m-b-20">
-                    <h6 class="l-title">
-                        <img src="@/assets/img/report5.png" alt="">
-                        实验总结与体会
-                    </h6>
-                    <quill v-if="editing" :border="true" v-model="form.summarize" :minHeight="150" :height="150" />
-                    <div v-else class="pre-wrap" v-html="form.summarize"></div>
+                <div v-else
+                     v-html="scope.row.referenceAnswer"></div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="userAnswer"
+                             label="学生答案">
+              <template slot-scope="scope">
+                <div v-if='scope.row.lcRuleRecords'>
+                  <div v-for="(item, index) in scope.row.lcRuleRecords"
+                       :key="index">
+                    <span v-if='item.userAnswer'>
+                      <span>{{index+1}}. </span>{{item.userAnswer}}
+                    </span>
+                    <span v-else>
+                      <span>{{index+1}}. </span>未填写
+                    </span>
+                  </div>
                 </div>
-            </div>
+                <div v-else
+                     v-html='scope.row.answer'
+                     style='white-space: pre-wrap'></div>
+                <template v-if="scope.row.runThePictureList">
+                  <img v-for="(img, i) in scope.row.runThePictureList"
+                       :key="i"
+                       width="200"
+                       class="result-pic"
+                       :src="img"
+                       alt="">
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column prop="score"
+                             label="得分"
+                             width="80"
+                             align="center"></el-table-column>
+          </el-table>
+        </div>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report5.png"
+                 alt="">
+            实验总结与体会
+          </h6>
+          <quill v-if="editing"
+                 :border="true"
+                 v-model="form.summarize"
+                 :minHeight="150"
+                 :height="150" />
+          <div v-else
+               class="pre-wrap"
+               v-html="form.summarize"></div>
         </div>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
 import util from "@/libs/util";
 export default {
-    data() {
-        return {
-            reportId: this.$route.query.reportId,
-            title: "实验报告",
-            form: {
-                className: "",
-                instructor: "",
-                period: "",
-                projectName: "",
-                summarize: "",
-            },
-            infoData: {},
-            expData: [],
-            editing: false,
-            loadIns: null,
-            loading: false,
-            project:false,
-            userScores: []
-        };
-    },
-    mounted() {
-        this.getData()
+  data () {
+    return {
+      reportId: this.$route.query.reportId,
+      title: "实验报告",
+      form: {
+        className: "",
+        instructor: "",
+        period: "",
+        projectName: "",
+        summarize: "",
+      },
+      infoData: {},
+      expData: [],
+      editing: false,
+      loadIns: null,
+      loading: false,
+      project: false,
+      userScores: []
+    };
+  },
+  mounted () {
+    this.getData()
+  },
+  methods: {
+    getData () { // 查询详情
+      this.$get(`${this.api.reportDetail}?reportId=${this.reportId}`).then(({ report, userScores }) => {
+        this.form = report
+        this.expData = userScores
+        this.project = this.expData.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
+        let form = this.form;
+        this.infoData = {
+          workNumber: form.workNumber,
+          experimentalClassName: form.experimentalClassName,
+          instructor: form.instructor,
+          period: form.period,
+          laboratory: form.laboratory,
+          submitTime: form.submitTime,
+          score: form.score,
+          className: form.className,
+          userName: form.userName
+        }
+        const data = report.data
+        this.userScores = userScores
+        // 如果没有data，则添加，否则，直接使用
+        if (!data) {
+          this.handleList(userScores)
+          this.$post(this.api.editExperimentalData, {
+            reportId,
+            data: JSON.stringify(userScores)
+          }).then(res => { }).catch(err => { })
+        } else {
+          this.handleList(userScores.find(e => e.lcRuleRecords) ? userScores : JSON.parse(data))
+        }
+      }).catch(res => { })
     },
-    methods: {
-        getData() { // 查询详情
-            this.$get(`${this.api.reportDetail}?reportId=${this.reportId}`).then(({ report, userScores }) => {
-                this.form = report
-                this.expData = userScores
-                this.project = this.expData.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
-                let form = this.form;
-                this.infoData = {
-                    workNumber: form.workNumber,
-                    experimentalClassName: form.experimentalClassName,
-                    instructor: form.instructor,
-                    period: form.period,
-                    laboratory: form.laboratory,
-                    submitTime: form.submitTime,
-                    score: form.score,
-                    userName: form.userName
-                }
-                const data = report.data
-                this.userScores = userScores
-                // 如果没有data，则添加，否则，直接使用
-                if (!data) {
-                  this.handleList(userScores)
-                  this.$post(this.api.editExperimentalData, {
-                    reportId,
-                    data: JSON.stringify(userScores)
-                  }).then(res => {}).catch(err => {})
-                } else {
-                  this.handleList(userScores.find(e => e.lcRuleRecords) ? userScores : JSON.parse(data))
-                }
-            }).catch(res => {})
-        },
-        // 处理实验数据
-        handleList(list) {
-          this.project = list.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
-          if (this.project) {
-            list.map(e => {
-              e.assessmentPoint = ''
-              e.referenceAnswer = ''
-              e.answer = ''
-              e.lcRuleRecords.map((n, i) => {
-                e.assessmentPoint += `${i + 1}.${n.name}`
-                e.referenceAnswer += `${i + 1}.${n.ruleAnswer}`
-                e.answer += `${i + 1}.${n.userAnswer}`
-              })
-            })
-          } else { // python系统显示图片（从userScores里取）
-            list.forEach(e => {
-              const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
-              if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
-            })
-          }
-          this.expData = list
-        },
-        exportPage() {
-          const form = Object.assign(this.form, this.infoData)
-          const list = JSON.parse(JSON.stringify(this.expData))
-          list.map((e, i) => {
-            const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
-            if (item && item.runThePicture) e.runThePicture = item.runThePicture
-            if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
-            e.id = i + 1
-            // if (e.referenceAnswer && typeof e.referenceAnswer === 'string') e.referenceAnswer = e.referenceAnswer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
-            if (e.answer && typeof e.answer === 'string') e.answer = e.answer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
+    // 处理实验数据
+    handleList (list) {
+      this.project = list.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
+      if (this.project) {
+        list.map(e => {
+          e.assessmentPoint = ''
+          e.referenceAnswer = ''
+          e.answer = ''
+          e.lcRuleRecords.map((n, i) => {
+            e.assessmentPoint += `${i + 1}.${n.name}`
+            e.referenceAnswer += `${i + 1}.${n.ruleAnswer}`
+            e.answer += `${i + 1}.${n.userAnswer}`
           })
-          for (const i in form) {
-            if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
-          }
-          form.purpose = form.purpose.replace(/<[^>]+>/g, '')
-          this.$post(this.project ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
-            ...form,
-            experimentalData: list
-          }).then(res => {
-            console.log(res)
-            util.downloadFileDirect(`实验报告.docx`,new Blob([res]))
-          }).catch(res => {})
-        },
-    }
+        })
+      } else { // python系统显示图片（从userScores里取）
+        list.forEach(e => {
+          const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
+          if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
+        })
+      }
+      this.expData = list
+    },
+    exportPage () {
+      const form = Object.assign(this.form, this.infoData)
+      const list = JSON.parse(JSON.stringify(this.expData))
+      list.map((e, i) => {
+        const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
+        if (item && item.runThePicture) e.runThePicture = item.runThePicture
+        if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
+        e.id = i + 1
+        // if (e.referenceAnswer && typeof e.referenceAnswer === 'string') e.referenceAnswer = e.referenceAnswer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
+        if (e.answer && typeof e.answer === 'string') e.answer = e.answer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
+      })
+      for (const i in form) {
+        if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
+      }
+      form.purpose = form.purpose.replace(/<[^>]+>/g, '')
+      this.$post(this.project ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
+        ...form,
+        experimentalData: list
+      }).then(res => {
+        console.log(res)
+        util.downloadFileDirect(`实验报告.docx`, new Blob([res]))
+      }).catch(res => { })
+    },
+  }
 };
 </script>
 
@@ -247,24 +311,26 @@ export default {
     padding: 12px 300px 20px;
 }
 .text-right {
-  text-align: right;
+    text-align: right;
 }
-code, kbd, samp{
-    font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
+code,
+kbd,
+samp {
+    font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
     word-wrap: break-word;
     white-space: pre-wrap;
 }
-/deep/ pre{
-    white-space: pre-wrap;       /* css-3 */
-    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-    white-space: pre-wrap;      /* Opera 4-6 */
-    white-space: -o-pre-wrap;    /* Opera 7 */
-    word-wrap: break-word;       /* Internet Explorer 5.5+ */
-    word-break:break-all;
-    overflow:hidden;
+/deep/ pre {
+    white-space: pre-wrap; /* css-3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: pre-wrap; /* Opera 4-6 */
+    white-space: -o-pre-wrap; /* Opera 7 */
+    word-wrap: break-word; /* Internet Explorer 5.5+ */
+    word-break: break-all;
+    overflow: hidden;
     font-size: 12px;
-    font-weight:400;
-    font-family:'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif
+    font-weight: 400;
+    font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
 }
 .content {
     padding: 16px 40px;
@@ -280,7 +346,7 @@ code, kbd, samp{
     }
     .info {
         padding: 20px 16px;
-        border: 1px solid #E1E6F2;
+        border: 1px solid #e1e6f2;
     }
     .l-title {
         display: flex;
@@ -314,7 +380,7 @@ code, kbd, samp{
         span {
             min-width: 150px;
             padding: 0 10px 3px;
-            border-bottom: 1px solid #E1E6F2;
+            border-bottom: 1px solid #e1e6f2;
         }
         /deep/.el-input {
             width: 174px;
@@ -323,7 +389,7 @@ code, kbd, samp{
     .score-wrap {
         position: relative;
         min-width: 150px;
-        border-bottom: 1px solid #E1E6F2;
+        border-bottom: 1px solid #e1e6f2;
         em {
             position: absolute;
             top: -12px;
@@ -331,7 +397,7 @@ code, kbd, samp{
             font-family: din;
             font-size: 30px;
             font-weight: 600;
-            color: #0B1D30;
+            color: #0b1d30;
         }
         img {
             position: absolute;
@@ -339,16 +405,17 @@ code, kbd, samp{
             left: 0;
         }
     }
-    /deep/.el-textarea .el-textarea__inner, .pre-wrap {
+    /deep/.el-textarea .el-textarea__inner,
+    .pre-wrap {
         min-height: 72px;
         padding: 10px 16px;
         font-size: 14px;
         color: #333;
         &.edit {
-            color: #ABB3C6;
-            border: 1px solid #CACFDB;
+            color: #abb3c6;
+            border: 1px solid #cacfdb;
             border-radius: 4px;
-            background-color: #F6F7F9;
+            background-color: #f6f7f9;
         }
     }
     /deep/ .table th {
@@ -360,7 +427,7 @@ code, kbd, samp{
     }
 }
 .result-pic {
-  margin: 10px 0;
+    margin: 10px 0;
 }
 @media (max-width: 1650px) {
     .wrap {
diff --git a/src/views/parner/rate.vue b/src/views/parner/rate.vue
index ee0185f..12f803b 100644
--- a/src/views/parner/rate.vue
+++ b/src/views/parner/rate.vue
@@ -1,63 +1,67 @@
 <template>
-    <div class="wrap">
-        <!-- 左边的组织 -->
-        <div class="side">
-          <div>
-              <div class="flex-between">
-                  <h6 class="p-title" style="margin-bottom: 0">城市合伙人区域管理</h6>
-              </div>
-
-              <div style="height: 504px; max-height: 504px; overflow: auto">
-                  <el-tree
-                      :data="orgList"
-                      default-expand-all
-                      ref="orgTree"
-                      node-key="id"
-                      highlight-current
-                      :expand-on-click-node="false"
-                      @node-click="handleNodeClick"
-                      :props="{children: 'children', label: 'partnerClassificationName', isLeaf: 'leaf'}"
-                  >
-                      <span class="custom-tree-node" slot-scope="{ node, data }">
-                          <span class="org-name">{{ node.label }}</span>
-                      </span>
-                  </el-tree>
-              </div>
-          </div>
+  <div class="wrap">
+    <!-- 左边的组织 -->
+    <div class="side">
+      <div>
+        <div class="flex-between">
+          <h6 class="p-title"
+              style="margin-bottom: 0">城市合伙人区域管理</h6>
+        </div>
 
-          <el-dialog
-            :title="typeForm.id ? '编辑' : '新增' + '分类'"
-            :visible.sync="orgVisible"
-            :close-on-click-modal="false"
-            width="50%"
-            @close="closeType"
-          >
-              <el-form v-if="orgVisible" ref="typeForm" :model="typeForm" :rules="orgRules" label-width="100px">
-                  <el-form-item label="分类名称" prop="partnerClassificationName">
-                      <el-input v-model.trim="typeForm.partnerClassificationName" placeholder="请输入"></el-input>
-                  </el-form-item>
-                  <el-form-item label="上级部门">
-                    <span v-if="typeForm.parentName">{{ typeForm.parentName }}</span>
-                    <el-cascader
-                      v-else
-                      :options="orgListDia"
-                      v-model="cascaderValue"
-                      :props="cascaderProps"
-                      clearable
-                      style="width: 100%"
-                    >
-                    </el-cascader>
-                  </el-form-item>
-              </el-form>
-              <span slot="footer" class="dialog-footer">
-                  <el-button @click="closeOrg">取 消</el-button>
-                  <el-button type="primary" @click="orgSubmit">确 定</el-button>
-              </span>
-          </el-dialog>
+        <div style="height: 504px; max-height: 504px; overflow: auto">
+          <el-tree :data="orgList"
+                   default-expand-all
+                   ref="orgTree"
+                   node-key="id"
+                   highlight-current
+                   :expand-on-click-node="false"
+                   @node-click="handleNodeClick"
+                   :props="{children: 'children', label: 'partnerClassificationName', isLeaf: 'leaf'}">
+            <span class="custom-tree-node"
+                  slot-scope="{ node, data }">
+              <span class="org-name">{{ node.label }}</span>
+            </span>
+          </el-tree>
         </div>
-        <!-- 右边的员工 -->
-        <div class="right">
-          <!-- <h6 class="p-title">筛选</h6>
+      </div>
+
+      <el-dialog :title="typeForm.id ? '编辑' : '新增' + '分类'"
+                 :visible.sync="orgVisible"
+                 :close-on-click-modal="false"
+                 width="50%"
+                 @close="closeType">
+        <el-form v-if="orgVisible"
+                 ref="typeForm"
+                 :model="typeForm"
+                 :rules="orgRules"
+                 label-width="100px">
+          <el-form-item label="分类名称"
+                        prop="partnerClassificationName">
+            <el-input v-model.trim="typeForm.partnerClassificationName"
+                      placeholder="请输入"></el-input>
+          </el-form-item>
+          <el-form-item label="上级部门">
+            <span v-if="typeForm.parentName">{{ typeForm.parentName }}</span>
+            <el-cascader v-else
+                         :options="orgListDia"
+                         v-model="cascaderValue"
+                         :props="cascaderProps"
+                         clearable
+                         style="width: 100%">
+            </el-cascader>
+          </el-form-item>
+        </el-form>
+        <span slot="footer"
+              class="dialog-footer">
+          <el-button @click="closeOrg">取 消</el-button>
+          <el-button type="primary"
+                     @click="orgSubmit">确 定</el-button>
+        </span>
+      </el-dialog>
+    </div>
+    <!-- 右边的员工 -->
+    <div class="right">
+      <!-- <h6 class="p-title">筛选</h6>
           <div class="tool">
               <ul class="filter">
                   <li>
@@ -66,55 +70,121 @@
               </ul>
           </div> -->
 
-          <el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id">
-              <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
-              <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-              <el-table-column prop="teamName" label="团队名称" align="center" min-width="120" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="userName" label="团队负责人" align="center" min-width="100"></el-table-column>
-              <el-table-column prop="phone" label="手机号" align="center" min-width="120"></el-table-column>
-              <el-table-column prop="account" label="账号" align="center" min-width="100"></el-table-column>
-              <el-table-column prop="invitationAccount" label="邀请人" align="center" min-width="120"></el-table-column>
-              <el-table-column prop="phone" label="团队年费" align="center" min-width="120">
-                <template slot-scope="scope">
-                  固定年费{{ scope.row.annualTeamFee !== underfined  ? scope.row.annualTeamFee + 'w' : '' }}
-                  <el-button v-auth="'/parner:费率管理:修改固定年费'" type="primary" size="mini" @click="editAnnualTeamFee(scope.row)">修改</el-button>
-                </template>
-              </el-table-column>
-              <el-table-column prop="phone" label="市场服务年费" align="center" min-width="120">
-                <template slot-scope="scope">
-                  项目抽成{{ scope.row.annualMarketingFee !== underfined  ? scope.row.annualMarketingFee + '%' : '' }}
-                  <el-button v-auth="'/parner:费率管理:修改项目抽成'" type="primary" size="mini" @click="editAnnualMarketingFee(scope.row)">修改</el-button>
-                </template>
-              </el-table-column>
-          </el-table>
-          <div class="pagination">
-              <el-pagination background @current-change="currentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>
-          </div>
-          
-          <el-dialog title="请设置团队年费" :visible.sync="annualTeamFeeVisible" width="300px" class="dialog" :close-on-click-modal="false">
-              <el-form ref="form" label-width="75px" style='margin-right: 0;'>
-                  <el-form-item label="固定年费">
-                      <el-input style="width: 150px;" type="number" v-model.number="annualTeamFee" placeholder="请输入数字"></el-input> 万
-                  </el-form-item>
-              </el-form>
-              <span slot="footer" class="dialog-footer">
-                  <el-button @click="annualTeamFeeVisible = false">取消</el-button>
-                  <el-button type="primary" @click="submitAnnualTeamFee">确定</el-button>
-              </span>
-          </el-dialog>
-          <el-dialog title="请设置市场服务年费" :visible.sync="annualMarketingFeeVisible" width="300px" class="dialog" :close-on-click-modal="false">
-              <el-form ref="form" label-width="75px" style='margin-right: 0;'>
-                  <el-form-item label="项目抽成">
-                      <el-input style="width: 150px;" type="number" v-model.number="annualMarketingFee" placeholder="请输入数字"></el-input> %
-                  </el-form-item>
-              </el-form>
-              <span slot="footer" class="dialog-footer">
-                  <el-button @click="annualMarketingFeeVisible = false">取消</el-button>
-                  <el-button type="primary" @click="submitAnnualMarketingFee">确定</el-button>
-              </span>
-          </el-dialog>
-        </div>
+      <el-table :data="listData"
+                class="table"
+                ref="table"
+                stripe
+                header-align="center"
+                @selection-change="handleSelectionChange"
+                row-key="id">
+        <el-table-column type="selection"
+                         width="55"
+                         align="center"
+                         :reserve-selection="true"></el-table-column>
+        <el-table-column type="index"
+                         width="60"
+                         label="序号"
+                         align="center"></el-table-column>
+        <el-table-column prop="teamName"
+                         label="团队名称"
+                         align="center"
+                         min-width="120"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="userName"
+                         label="团队负责人"
+                         align="center"
+                         min-width="100"></el-table-column>
+        <el-table-column prop="phone"
+                         label="手机号"
+                         align="center"
+                         min-width="120"></el-table-column>
+        <el-table-column prop="account"
+                         label="账号"
+                         align="center"
+                         min-width="100"></el-table-column>
+        <el-table-column prop="invitationAccount"
+                         label="邀请人"
+                         align="center"
+                         min-width="120"></el-table-column>
+        <el-table-column prop="phone"
+                         label="团队年费"
+                         align="center"
+                         min-width="120">
+          <template slot-scope="scope">
+            固定年费{{ scope.row.annualTeamFee !== underfined  ? scope.row.annualTeamFee + '元' : '' }}
+            <el-button v-auth="'/parner:费率管理:修改固定年费'"
+                       type="primary"
+                       size="mini"
+                       @click="editAnnualTeamFee(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column prop="phone"
+                         label="市场服务年费"
+                         align="center"
+                         min-width="120">
+          <template slot-scope="scope">
+            项目抽成{{ scope.row.annualMarketingFee !== underfined  ? scope.row.annualMarketingFee + '%' : '' }}
+            <el-button v-auth="'/parner:费率管理:修改项目抽成'"
+                       type="primary"
+                       size="mini"
+                       @click="editAnnualMarketingFee(scope.row)">修改</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination">
+        <el-pagination background
+                       @current-change="currentChange"
+                       :current-page="page"
+                       layout="total, prev, pager, next"
+                       :total="total"></el-pagination>
+      </div>
+
+      <el-dialog title="请设置团队年费"
+                 :visible.sync="annualTeamFeeVisible"
+                 width="300px"
+                 class="dialog"
+                 :close-on-click-modal="false">
+        <el-form ref="form"
+                 label-width="75px"
+                 style='margin-right: 0;'>
+          <el-form-item label="固定年费">
+            <el-input style="width: 150px;"
+                      type="number"
+                      v-model.number="annualTeamFee"
+                      placeholder="请输入数字"></el-input> 元
+          </el-form-item>
+        </el-form>
+        <span slot="footer"
+              class="dialog-footer">
+          <el-button @click="annualTeamFeeVisible = false">取消</el-button>
+          <el-button type="primary"
+                     @click="submitAnnualTeamFee">确定</el-button>
+        </span>
+      </el-dialog>
+      <el-dialog title="请设置市场服务年费"
+                 :visible.sync="annualMarketingFeeVisible"
+                 width="300px"
+                 class="dialog"
+                 :close-on-click-modal="false">
+        <el-form ref="form"
+                 label-width="75px"
+                 style='margin-right: 0;'>
+          <el-form-item label="项目抽成">
+            <el-input style="width: 150px;"
+                      type="number"
+                      v-model.number="annualMarketingFee"
+                      placeholder="请输入数字"></el-input> %
+          </el-form-item>
+        </el-form>
+        <span slot="footer"
+              class="dialog-footer">
+          <el-button @click="annualMarketingFeeVisible = false">取消</el-button>
+          <el-button type="primary"
+                     @click="submitAnnualMarketingFee">确定</el-button>
+        </span>
+      </el-dialog>
     </div>
+  </div>
 </template>
 
 <script>
@@ -124,380 +194,380 @@ import OrgTree from "@/components/org-tree/src/tree";
 import clipboard from '@/libs/clipboard'
 import axios from 'axios'
 export default {
-    components: { OrgTree },
-    data() {
-        return {
-          accountId: this.$store.state.accountId,
-          userName: this.$store.state.userName,
-          type: 1,
-          orgList: [],
-          orgListDia: [],
-          orgVisible: false, // 员工组织架对话框
-          typeForm: {
-            id: '',
-            partnerClassificationName: ''
-          },
-          cascaderValue: [], // 上级部门
-          cascaderProps: {
-              checkStrictly: true,
-              label: "partnerClassificationName",
-              value: "id"
-          },
-          treeVisible: true,
-          treeNode: {},
-          treeResolve: [],
-          isDetail: false,
-          keyWord: '',
-          listData: [],
-          page: 1,
-          pageSize: 10,
-          total: 0,
-          multipleSelection: [],
-
-          orgRules: {
-              partnerClassificationName: [
-                { required: true, message: "请输入部门名称", trigger: "blur" }
-              ]
-          },
-          parnerVisible: false,
-          casProps: {
-            multiple: true,
-            checkStrictly: true,
-            label: 'partnerClassificationName',
-            value: 'id',
-            isLeaf: 'leaf'
-          },
-          link: '',
-          qrcode: '',
-          expireTime: '',
-          curTeamId: '',
-          submiting: false, // 新增编辑防抖标识
-          setKey: '',
-          transferVisible: false,
-          chooseVisible: false,
-          members: [],
-          choosePartnerId: '',
-          curRow: '',
-          annualTeamFeeVisible: false,
-          annualTeamFee: '',
-          annualMarketingFeeVisible: false,
-          annualMarketingFee: '',
-        };
-    },
-    watch: {
-      keyWord: function(val) {
-        clearTimeout(this.searchTimer);
-        this.searchTimer = setTimeout(this.initData, 500);
-      }
-    },
-    mounted() {
-      this.getOrg()
-    },
-    methods: {
-      // 获取组织
-      async getOrg() {
-        const res = await this.$post(this.api.listParner)
-        const list = res.treeList
-        // 没有子级，删除children属性
-        const handleLeaf = (list, ids) => {
-          list.map(e => {
-            e.ids = ids ? [...ids, e.id] : [e.id]
-            if (e.children.length) {
-              if (e.isTeam) {
-                delete e.children
-              } else {
-                handleLeaf(e.children, e.ids)
-              }
-            } else {
-              delete e.children
-            }
-          })
-        }
-        handleLeaf(list)
-        this.orgList = list
-        // 如果刚编辑完，则选中刚编辑的分类
-        this.setKey && this.$nextTick(() => {
-          this.$refs.orgTree.setCurrentKey(this.setKey)
-        })
-        this.getList()
-      },
-      // 类型回调
-      typeChange() {
-        this.$refs.orgTree.setCurrentKey(null)
-        this.curTeamId = ''
-        this.initData()
+  components: { OrgTree },
+  data () {
+    return {
+      accountId: this.$store.state.accountId,
+      userName: this.$store.state.userName,
+      type: 1,
+      orgList: [],
+      orgListDia: [],
+      orgVisible: false, // 员工组织架对话框
+      typeForm: {
+        id: '',
+        partnerClassificationName: ''
       },
-      // 添加部门
-      addOrg(node, data) {
-        const list = JSON.parse(JSON.stringify(this.orgList))
-        this.handleOrg(list)
-        this.orgListDia = list
-        this.typeForm = {
-          id: '',
-          parentId: data ? data.id : 1,
-          level: data ? data.level + 1 : 1,
-          parentName: data ? data.partnerClassificationName : '',
-          partnerClassificationName: ''
-        }
-        this.cascaderValue = []
-        this.orgVisible = true
+      cascaderValue: [], // 上级部门
+      cascaderProps: {
+        checkStrictly: true,
+        label: "partnerClassificationName",
+        value: "id"
       },
-      // 编辑部门
-      editOrg(node, data) {
-        const list = JSON.parse(JSON.stringify(this.orgList))
-        this.handleOrg(list)
-        this.orgListDia = list
-        this.typeForm = {
-          id: data.id,
-          partnerClassificationName: data.partnerClassificationName,
-          isTeam: data.isTeam
-        }
-        this.orgVisible = true
-        const { ids } = data
-        ids.splice(ids.length - 1, 1)
-        this.cascaderValue = ids
+      treeVisible: true,
+      treeNode: {},
+      treeResolve: [],
+      isDetail: false,
+      keyWord: '',
+      listData: [],
+      page: 1,
+      pageSize: 10,
+      total: 0,
+      multipleSelection: [],
+
+      orgRules: {
+        partnerClassificationName: [
+          { required: true, message: "请输入部门名称", trigger: "blur" }
+        ]
       },
-      // 关闭分类弹框
-      closeType() {
-        this.typeForm = {
-          id: '',
-          partnerClassificationName: ''
-        }
+      parnerVisible: false,
+      casProps: {
+        multiple: true,
+        checkStrictly: true,
+        label: 'partnerClassificationName',
+        value: 'id',
+        isLeaf: 'leaf'
       },
-      // 处理更换部门的禁选
-      handleOrg(list) {
-        for (const i in list) {
-          const e = list[i]
-          // 如果是团队，则禁选
-          if (e.isTeam) {
-            e.disabled = true
+      link: '',
+      qrcode: '',
+      expireTime: '',
+      curTeamId: '',
+      submiting: false, // 新增编辑防抖标识
+      setKey: '',
+      transferVisible: false,
+      chooseVisible: false,
+      members: [],
+      choosePartnerId: '',
+      curRow: '',
+      annualTeamFeeVisible: false,
+      annualTeamFee: '',
+      annualMarketingFeeVisible: false,
+      annualMarketingFee: '',
+    };
+  },
+  watch: {
+    keyWord: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(this.initData, 500);
+    }
+  },
+  mounted () {
+    this.getOrg()
+  },
+  methods: {
+    // 获取组织
+    async getOrg () {
+      const res = await this.$post(this.api.listParner)
+      const list = res.treeList
+      // 没有子级，删除children属性
+      const handleLeaf = (list, ids) => {
+        list.map(e => {
+          e.ids = ids ? [...ids, e.id] : [e.id]
+          if (e.children.length) {
+            if (e.isTeam) {
+              delete e.children
+            } else {
+              handleLeaf(e.children, e.ids)
+            }
           } else {
-            this.handleOrg(e.children)
+            delete e.children
           }
+        })
+      }
+      handleLeaf(list)
+      this.orgList = list
+      // 如果刚编辑完，则选中刚编辑的分类
+      this.setKey && this.$nextTick(() => {
+        this.$refs.orgTree.setCurrentKey(this.setKey)
+      })
+      this.getList()
+    },
+    // 类型回调
+    typeChange () {
+      this.$refs.orgTree.setCurrentKey(null)
+      this.curTeamId = ''
+      this.initData()
+    },
+    // 添加部门
+    addOrg (node, data) {
+      const list = JSON.parse(JSON.stringify(this.orgList))
+      this.handleOrg(list)
+      this.orgListDia = list
+      this.typeForm = {
+        id: '',
+        parentId: data ? data.id : 1,
+        level: data ? data.level + 1 : 1,
+        parentName: data ? data.partnerClassificationName : '',
+        partnerClassificationName: ''
+      }
+      this.cascaderValue = []
+      this.orgVisible = true
+    },
+    // 编辑部门
+    editOrg (node, data) {
+      const list = JSON.parse(JSON.stringify(this.orgList))
+      this.handleOrg(list)
+      this.orgListDia = list
+      this.typeForm = {
+        id: data.id,
+        partnerClassificationName: data.partnerClassificationName,
+        isTeam: data.isTeam
+      }
+      this.orgVisible = true
+      const { ids } = data
+      ids.splice(ids.length - 1, 1)
+      this.cascaderValue = ids
+    },
+    // 关闭分类弹框
+    closeType () {
+      this.typeForm = {
+        id: '',
+        partnerClassificationName: ''
+      }
+    },
+    // 处理更换部门的禁选
+    handleOrg (list) {
+      for (const i in list) {
+        const e = list[i]
+        // 如果是团队，则禁选
+        if (e.isTeam) {
+          e.disabled = true
+        } else {
+          this.handleOrg(e.children)
         }
-      },
-      // 删除部门
-      delOrg(node, data) {
-        this.$confirm(data.isTeam ? '确定删除该城市合伙人？删除后，该团队同步解散，且不可恢复！' : '确定要删除吗？', "提示", {
-            type: "warning"
-        }).then(() => {
-            this.$post(`${this.api.deleteParner}?id=${data.id}`).then(res => {
-              util.successMsg("删除成功")
-              this.getOrg()
-            }).catch(res => {})
-        }).catch(() => {})
-      },
-      // 提交组织架构新增/编辑
-      orgSubmit() {
-          this.$refs.typeForm.validate((valid) => {
-              if (valid) {
-                  const form = this.typeForm
-                  const cas = this.cascaderValue
-                  const len = cas.length
-                  if (cas && len) {
-                      this.typeForm.parentId = cas[len - 1]
-                      this.typeForm.level = len + 1
-                  }
-                  if (!form.id) {
-                      // 添加
-                      this.$post(this.api.saveParner, form).then(res => {
-                          util.successMsg("新增成功！")
-                          this.closeOrg()
-                      }).catch(err => {})
-                  } else {
-                      // 编辑
-                      this.$post(this.api.updateParner, form).then(res => {
-                          util.successMsg("编辑成功！")
-                          this.setKey = form.id
-                          this.closeOrg()
-                      }).catch(err => {})
-                  }
-              }
-          });
-      },
-      // 获得点击层级里的第一个城市合伙人id
-      getTeamId(list) {
-        for (const i in list) {
-          const e = list[i]
-          if (e.isTeam && !this.curTeamId) {
-            this.curTeamId = e.id
-            break
+      }
+    },
+    // 删除部门
+    delOrg (node, data) {
+      this.$confirm(data.isTeam ? '确定删除该城市合伙人？删除后，该团队同步解散，且不可恢复！' : '确定要删除吗？', "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$post(`${this.api.deleteParner}?id=${data.id}`).then(res => {
+          util.successMsg("删除成功")
+          this.getOrg()
+        }).catch(res => { })
+      }).catch(() => { })
+    },
+    // 提交组织架构新增/编辑
+    orgSubmit () {
+      this.$refs.typeForm.validate((valid) => {
+        if (valid) {
+          const form = this.typeForm
+          const cas = this.cascaderValue
+          const len = cas.length
+          if (cas && len) {
+            this.typeForm.parentId = cas[len - 1]
+            this.typeForm.level = len + 1
+          }
+          if (!form.id) {
+            // 添加
+            this.$post(this.api.saveParner, form).then(res => {
+              util.successMsg("新增成功！")
+              this.closeOrg()
+            }).catch(err => { })
           } else {
-            this.getTeamId(e.children)
+            // 编辑
+            this.$post(this.api.updateParner, form).then(res => {
+              util.successMsg("编辑成功！")
+              this.setKey = form.id
+              this.closeOrg()
+            }).catch(err => { })
           }
         }
-      },
-      // 点击树节点查询列表数据
-      handleNodeClick(data) {
-        this.type = ''
-        this.curTeamId = ''
-        if (data.isTeam) {
-          this.curTeamId = data.id
+      });
+    },
+    // 获得点击层级里的第一个城市合伙人id
+    getTeamId (list) {
+      for (const i in list) {
+        const e = list[i]
+        if (e.isTeam && !this.curTeamId) {
+          this.curTeamId = e.id
+          break
         } else {
-          // this.getTeamId(data.children)
+          this.getTeamId(e.children)
         }
-        if (!this.curTeamId) this.curTeamId = data.id
-        this.initData()
-        this.$refs.table.clearSelection()
-      },
-      // 关闭组织新增编辑弹框
-      closeOrg() {
-        this.orgVisible = false
-        this.cascaderValue = []
-        this.getOrg()
-      },
-      // 查询全部
-      getAll() {
-        this.curTeamId = ''
-        this.getList()
-      },
-      // 员工列表
-      getList() {
-        this.$post(this.api.teamPartnerList, {
-          type: this.type || 1,
-          partnerClassificationId: this.curTeamId,
-          keyWord: this.keyWord,
-          pageNum: this.page,
-          pageSize: this.pageSize
-        }).then(({ pageList }) => {
-          pageList.records.forEach((e, i) => {
-            e.id = i
-          })
-          this.listData = pageList.records
-          console.log("🚀 ~ file: staff.vue:479 ~ getList ~ this.listData:", this.listData)
+      }
+    },
+    // 点击树节点查询列表数据
+    handleNodeClick (data) {
+      this.type = ''
+      this.curTeamId = ''
+      if (data.isTeam) {
+        this.curTeamId = data.id
+      } else {
+        // this.getTeamId(data.children)
+      }
+      if (!this.curTeamId) this.curTeamId = data.id
+      this.initData()
+      this.$refs.table.clearSelection()
+    },
+    // 关闭组织新增编辑弹框
+    closeOrg () {
+      this.orgVisible = false
+      this.cascaderValue = []
+      this.getOrg()
+    },
+    // 查询全部
+    getAll () {
+      this.curTeamId = ''
+      this.getList()
+    },
+    // 员工列表
+    getList () {
+      this.$post(this.api.teamPartnerList, {
+        type: this.type || 1,
+        partnerClassificationId: this.curTeamId,
+        keyWord: this.keyWord,
+        pageNum: this.page,
+        pageSize: this.pageSize
+      }).then(({ pageList }) => {
+        pageList.records.forEach((e, i) => {
+          e.id = i
+        })
+        this.listData = pageList.records
+        console.log("🚀 ~ file: staff.vue:479 ~ getList ~ this.listData:", this.listData)
 
-          this.total = pageList.total
-        }).catch(err => {})
-      },
-      // 切换页码
-      currentChange(val) {
-        this.page = val
+        this.total = pageList.total
+      }).catch(err => { })
+    },
+    // 切换页码
+    currentChange (val) {
+      this.page = val
+      this.getList()
+    },
+    handleSelectionChange (val) { // 多选
+      this.multipleSelection = val
+    },
+    initData () {
+      this.$refs.table.clearSelection()
+      this.page = 1
+      this.getList()
+    },
+    // 编辑团队年费
+    editAnnualTeamFee (row) {
+      this.curRow = row
+      this.annualTeamFee = row.annualTeamFee
+      this.annualTeamFeeVisible = true
+    },
+    // 团队年费提交
+    submitAnnualTeamFee () {
+      this.$post(this.api.editPartnerTeamRates, {
+        annualTeamFee: this.annualTeamFee,
+        annualMarketingFee: this.curRow.annualMarketingFee,
+        partnerId: this.curRow.partnerId,
+        teamId: this.curRow.teamId,
+      }).then(res => {
+        this.annualTeamFeeVisible = false
+        util.successMsg('修改成功')
         this.getList()
-      },
-      handleSelectionChange(val) { // 多选
-        this.multipleSelection = val
-      },
-      initData() {
-        this.$refs.table.clearSelection()
-        this.page = 1
+      }).catch(res => { })
+    },
+    // 编辑市场服务年费
+    editAnnualMarketingFee (row) {
+      this.curRow = row
+      this.annualMarketingFee = row.annualMarketingFee
+      this.annualMarketingFeeVisible = true
+    },
+    // 团队年费提交
+    submitAnnualMarketingFee () {
+      this.$post(this.api.editPartnerTeamRates, {
+        annualMarketingFee: this.annualMarketingFee,
+        annualTeamFee: this.curRow.annualTeamFee,
+        partnerId: this.curRow.partnerId,
+        teamId: this.curRow.teamId,
+      }).then(res => {
+        this.annualMarketingFeeVisible = false
+        util.successMsg('修改成功')
         this.getList()
-      },
-      // 编辑团队年费
-      editAnnualTeamFee(row) {
-        this.curRow = row
-        this.annualTeamFee = row.annualTeamFee
-        this.annualTeamFeeVisible = true
-      },
-      // 团队年费提交
-      submitAnnualTeamFee() {
-        this.$post(this.api.editPartnerTeamRates, {
-          annualTeamFee: this.annualTeamFee,
-          annualMarketingFee: this.curRow.annualMarketingFee,
-          partnerId: this.curRow.partnerId,
-          teamId: this.curRow.teamId,
-        }).then(res => {
-          this.annualTeamFeeVisible = false
-          util.successMsg('修改成功')
-          this.getList()
-        }).catch(res => {})
-      },
-      // 编辑市场服务年费
-      editAnnualMarketingFee(row) {
-        this.curRow = row
-        this.annualMarketingFee = row.annualMarketingFee
-        this.annualMarketingFeeVisible = true
-      },
-      // 团队年费提交
-      submitAnnualMarketingFee() {
-        this.$post(this.api.editPartnerTeamRates, {
-          annualMarketingFee: this.annualMarketingFee,
-          annualTeamFee: this.curRow.annualTeamFee,
-          partnerId: this.curRow.partnerId,
-          teamId: this.curRow.teamId,
-        }).then(res => {
-          this.annualMarketingFeeVisible = false
-          util.successMsg('修改成功')
-          this.getList()
-        }).catch(res => {})
-      },
-    }
+      }).catch(res => { })
+    },
+  }
 };
 </script>
 
 <style lang="scss" scoped>
 .m-b-20 {
-  margin-bottom: 20px;
+    margin-bottom: 20px;
 }
 .org-name {
-  margin-right: 20px;
+    margin-right: 20px;
 }
 .w-100 {
-  width: 100%;
+    width: 100%;
 }
 .wrap {
-  display: flex;
-  padding: 0 24px;
-  .side {
-      width: 300px;
-      padding: 24px 10px 24px 0;
-      margin-right: 24px;
-      border-right: 1px solid rgba(0, 0, 0, 0.06);
-  }
-  .right {
-      width: calc(100% - 324px);
-      padding: 24px 0;
-  }
+    display: flex;
+    padding: 0 24px;
+    .side {
+        width: 300px;
+        padding: 24px 10px 24px 0;
+        margin-right: 24px;
+        border-right: 1px solid rgba(0, 0, 0, 0.06);
+    }
+    .right {
+        width: calc(100% - 324px);
+        padding: 24px 0;
+    }
 }
 .add-dia {
-  .tips {
-    font-size: 12px;
-    color: #f00;
-  }
-  .title {
-    margin: 10px 0;
-    font-size: 14px;
-    em {
-      font-style: normal;
+    .tips {
+        font-size: 12px;
+        color: #f00;
     }
-  }
-  .des {
-    font-size: 13px;
-    color: #7a7a7a;
-  }
-  .link-wrap {
-    display: flex;
-    align-items: center;
-    margin: 10px 0 20px;
-  }
-  .link {
-    padding: 10px;
-    margin-right: 15px;
-    background-color: #e7f5ff;
-    border-radius: 4px;
-  }
-}
-/deep/.choose-dia {
-  .member-list {
-    li {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin-bottom: 10px;
+    .title {
+        margin: 10px 0;
+        font-size: 14px;
+        em {
+            font-style: normal;
+        }
     }
-    .info {
-      display: inline-flex;
-      align-items: center;
+    .des {
+        font-size: 13px;
+        color: #7a7a7a;
     }
-    img {
-      width: 40px;
-      height: 40px;
+    .link-wrap {
+        display: flex;
+        align-items: center;
+        margin: 10px 0 20px;
     }
-    .name {
-      margin-left: 10px; 
+    .link {
+        padding: 10px;
+        margin-right: 15px;
+        background-color: #e7f5ff;
+        border-radius: 4px;
     }
-    .el-radio__label {
-      display: none;
+}
+/deep/.choose-dia {
+    .member-list {
+        li {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 10px;
+        }
+        .info {
+            display: inline-flex;
+            align-items: center;
+        }
+        img {
+            width: 40px;
+            height: 40px;
+        }
+        .name {
+            margin-left: 10px;
+        }
+        .el-radio__label {
+            display: none;
+        }
     }
-  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/serve/projectAdd.vue b/src/views/serve/projectAdd.vue
index fcc8763..cca07b6 100644
--- a/src/views/serve/projectAdd.vue
+++ b/src/views/serve/projectAdd.vue
@@ -1,195 +1,271 @@
 <template>
-    <div ref="main" class="main">
-        <el-row :gutter="20">
-            <el-col :span="24">
-                <el-card shadow="hover" class="mgb20">
-                    <div class="flex-between">
-                        <el-page-header @back="back" content="项目配置"></el-page-header>
-                        <div v-if="!isDetail">
-                            <el-button type="success" @click="handleSubmit(0,projectManage.isOpen=1,projectManage.ztOpen = 1)">保存为草稿
-                            </el-button>
-                            <el-button type="primary" @click="handleSubmit(1)">确定并发布</el-button>
-                        </div>
-                    </div>
-                </el-card>
-
-                <el-card shadow="hover" class="mgb20">
-                    <div class="flex-center mgb20">
-                        <p class="addhr_tag"></p>
-                        <span>课程信息</span>
-                    </div>
-                    <div class="border-b-dashed"></div>
+  <div ref="main"
+       class="main">
+    <el-row :gutter="20">
+      <el-col :span="24">
+        <el-card shadow="hover"
+                 class="mgb20">
+          <div class="flex-between">
+            <el-page-header @back="back"
+                            content="项目配置"></el-page-header>
+            <div v-if="!isDetail">
+              <el-button type="success"
+                         @click="handleSubmit(0,projectManage.isOpen=1,projectManage.ztOpen = 1)">保存为草稿
+              </el-button>
+              <el-button type="primary"
+                         @click="handleSubmit(1)">确定并发布</el-button>
+            </div>
+          </div>
+        </el-card>
 
-                    <div>
-                        <el-form label-width="80px">
-                            <div style="display: flex">
-                                <el-form-item label="项目名称">
-                                    <el-input :disabled="isDetail" v-model.trim="projectManage.projectName"
-                                              placeholder="20个字符以内" @blur="projectNameExistis"></el-input>
-                                </el-form-item>
-                                <el-form-item label="备注">
-                                    <el-input v-model.trim="projectManage.remark" placeholder="20个字符以内"></el-input>
-                                </el-form-item>
-                                <el-form-item label="项目权限">
-                                    <el-select :disabled="isDetail" v-model="projectManage.permissions"
-                                               placeholder="请选择" @change="permissionChange">
-                                        <el-option label="练习" :value="0"></el-option>
-                                        <el-option label="考核" :value="1"></el-option>
-                                        <el-option label="竞赛" :value="2"></el-option>
-                                    </el-select>
-                                </el-form-item>
-                            </div>
-                        </el-form>
-                    </div>
-                </el-card>
+        <el-card shadow="hover"
+                 class="mgb20">
+          <div class="flex-center mgb20">
+            <p class="addhr_tag"></p>
+            <span>课程信息</span>
+          </div>
+          <div class="border-b-dashed"></div>
 
-                <el-card shadow="hover" class="mgb20">
-                    <div class="flex-center mgb20">
-                        <p class="addhr_tag"></p>
-                        <span>实验目标</span>
-                    </div>
-                    <div class="border-b-dashed"></div>
-                    <div>
-                        <el-form label-width="0">
-                            <el-form-item>
-                                <quill :border="true" :readonly="isDetail" v-model="projectManage.experimentTarget"
-                                       :minHeight="150" :height="150" />
-                            </el-form-item>
-                        </el-form>
-                    </div>
-                </el-card>
+          <div>
+            <el-form label-width="80px">
+              <div style="display: flex">
+                <el-form-item label="项目名称">
+                  <el-input :disabled="isDetail"
+                            v-model.trim="projectManage.projectName"
+                            placeholder="20个字符以内"
+                            @blur="projectNameExistis"></el-input>
+                </el-form-item>
+                <el-form-item label="备注">
+                  <el-input v-model.trim="projectManage.remark"
+                            placeholder="20个字符以内"></el-input>
+                </el-form-item>
+                <el-form-item label="项目用途">
+                  <el-select :disabled="isDetail"
+                             v-model="projectManage.permissions"
+                             placeholder="请选择"
+                             @change="permissionChange">
+                    <el-option label="练习"
+                               :value="0"></el-option>
+                    <el-option label="考核"
+                               :value="1"></el-option>
+                    <el-option label="竞赛"
+                               :value="2"></el-option>
+                  </el-select>
+                </el-form-item>
+              </div>
+            </el-form>
+          </div>
+        </el-card>
 
-                <el-card shadow="hover" class="mgb20">
-                    <div class="flex-center mgb20">
-                        <p class="addhr_tag"></p>
-                        <span>项目背景</span>
-                    </div>
-                    <div class="border-b-dashed"></div>
-                    <div>
-                        <el-form label-width="0">
-                            <el-form-item>
-                                <quill :border="true" :readonly="isDetail" v-model="projectManage.experimentDescription"
-                                       :minHeight="150" :height="150" />
-                            </el-form-item>
-                        </el-form>
-                    </div>
-                </el-card>
+        <el-card shadow="hover"
+                 class="mgb20">
+          <div class="flex-center mgb20">
+            <p class="addhr_tag"></p>
+            <span>实验目标</span>
+          </div>
+          <div class="border-b-dashed"></div>
+          <div>
+            <el-form label-width="0">
+              <el-form-item>
+                <quill :border="true"
+                       :readonly="isDetail"
+                       v-model="projectManage.experimentTarget"
+                       :minHeight="150"
+                       :height="150" />
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-card>
 
-                <el-card shadow="hover" class="mgb20">
-                    <div class="flex-between mgb20">
-                        <div class="flex-center">
-                            <p class="addhr_tag"></p>
-                            <span>实验任务</span>
-                        </div>
-                        <div>
-                            <el-button :disabled="isDetail" type="primary" @click="toJudgePoint('home')">进入判分点
-                            </el-button>
-                        </div>
-                    </div>
-                    <div class="border-b-dashed"></div>
+        <el-card shadow="hover"
+                 class="mgb20">
+          <div class="flex-center mgb20">
+            <p class="addhr_tag"></p>
+            <span>项目背景</span>
+          </div>
+          <div class="border-b-dashed"></div>
+          <div>
+            <el-form label-width="0">
+              <el-form-item>
+                <quill :border="true"
+                       :readonly="isDetail"
+                       v-model="projectManage.experimentDescription"
+                       :minHeight="150"
+                       :height="150" />
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-card>
 
-                    <div class="mgb20 flex-between">
-                        <div class="flex-center">
-                            <div class="m-r-20" style="color: #f00">项目总分值：100分</div>
-                            <!-- <div>权重&emsp;<div class="dib"><el-input></el-input></div></div> -->
-                        </div>
+        <el-card shadow="hover"
+                 class="mgb20">
+          <div class="flex-between mgb20">
+            <div class="flex-center">
+              <p class="addhr_tag"></p>
+              <span>实验任务</span>
+            </div>
+            <div>
+              <el-button :disabled="isDetail"
+                         type="primary"
+                         @click="toJudgePoint('home')">进入判分点
+              </el-button>
+            </div>
+          </div>
+          <div class="border-b-dashed"></div>
 
-                        <div>
-                            <el-button :disabled="isDetail" class="m-r-20" type="text" @click="avgDistributionScore">
-                                平均分配分值
-                            </el-button>
-                            <el-button :disabled="isDetail" class="m-r-20" type="text" @click="manualDistributionScore">
-                                手动分配分值
-                            </el-button>
-                            <span>(待分配分值: {{ handDistributionScore }}/100分)</span>
-                        </div>
-                    </div>
-                    <el-button :disabled="isDetail" type="primary" icon="el-icon-plus" round
-                               @click="handleAddJudgment" style="margin-bottom: 10px">判分点
-                    </el-button>
-                    <el-button :disabled="isDetail" type="primary" icon="el-icon-delete" round
-                               @click="batchDeleteProjectJudgment" style="margin-bottom: 10px">批量删除
-                    </el-button>
-                    <div class="draggable">
-                        <el-table
-                            ref="projectJudgementTable"
-                            :data="projectJudgmentData"
-                            class="table"
-                            stripe
-                            header-align="center"
-                            @selection-change="handleSelectionProjectJudgment"
-                            row-key="judgmentId"
-                            v-loading="listLoading"
-                        >
-                            <el-table-column type="selection" width="55" align="center"></el-table-column>
-                            <el-table-column prop="sort" label="序号" width="80" align="center">
-                                <template slot-scope="scope">
-                                    {{ scope.row.sort }}
-                                </template>
-                            </el-table-column>
-                            <el-table-column prop="name" label="判分指标" align="center"></el-table-column>
-                            <el-table-column prop="name" label="判分点名称" align="center"></el-table-column>
-                            <el-table-column label="实验要求" align="center" width="600">
-                                <template slot-scope="scope">
-                                    <quill :border="true" :readonly="true" elseRead="true"
-                                           v-model="scope.row.experimentalRequirements" :minHeight="100"
-                                           :height="100" />
-                                </template>
-                            </el-table-column>
-                            <el-table-column prop="score" label="分数" align="center" width="120">
-                                <template slot-scope="scope">
-                                    <!--type="number" @blur="updateProjectJudgment"-->
-                                    <el-input :disabled="isDetail" v-model.trim="scope.row.score"
-                                              @input="scoreChange(scope.row, scope.$index,$event)"></el-input>
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="操作" width="140" align="center">
-                                <template slot-scope="scope">
-                                    <el-button :disabled="isDetail" type="text" style="margin-right: 10px" @click="toJudgePoint('edit', scope.row)">自定义</el-button>
-                                    <el-button :disabled="isDetail" type="text" @click="delJudgePoint(scope.$index)">
-                                        删除
-                                    </el-button>
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </div>
-                </el-card>
+          <div class="mgb20 flex-between">
+            <div class="flex-center">
+              <div class="m-r-20"
+                   style="color: #f00">项目总分值：100分</div>
+              <!-- <div>权重&emsp;<div class="dib"><el-input></el-input></div></div> -->
+            </div>
 
-                <el-card shadow="hover" class="mgb20">
-                    <div class="flex-between mgb20">
-                        <div class="flex-center">
-                            <p class="addhr_tag"></p>
-                            <span>实验提示</span>
-                        </div>
-                        <div>
-                            启用
-                            <el-switch :disabled="isDetail" :active-value="0" :inactive-value="1"
-                                       v-model="projectManage.hintOpen"></el-switch>
-                        </div>
-                    </div>
-                    <div class="border-b-dashed"></div>
-                    <div>
-                        <el-form label-width="0">
-                            <el-form-item prop="tips" label="">
-                                <quill :border="true" :readonly="isDetail" v-model="projectManage.experimentHint"
-                                       :minHeight="150" :height="150" />
-                            </el-form-item>
-                        </el-form>
-                    </div>
-                </el-card>
-            </el-col>
-        </el-row>
+            <div>
+              <el-button :disabled="isDetail"
+                         class="m-r-20"
+                         type="text"
+                         @click="avgDistributionScore">
+                平均分配分值
+              </el-button>
+              <el-button :disabled="isDetail"
+                         class="m-r-20"
+                         type="text"
+                         @click="manualDistributionScore">
+                手动分配分值
+              </el-button>
+              <span>(待分配分值: {{ handDistributionScore }}/100分)</span>
+            </div>
+          </div>
+          <el-button :disabled="isDetail"
+                     type="primary"
+                     icon="el-icon-plus"
+                     round
+                     @click="handleAddJudgment"
+                     style="margin-bottom: 10px">判分点
+          </el-button>
+          <el-button :disabled="isDetail"
+                     type="primary"
+                     icon="el-icon-delete"
+                     round
+                     @click="batchDeleteProjectJudgment"
+                     style="margin-bottom: 10px">批量删除
+          </el-button>
+          <div class="draggable">
+            <el-table ref="projectJudgementTable"
+                      :data="projectJudgmentData"
+                      class="table"
+                      stripe
+                      header-align="center"
+                      @selection-change="handleSelectionProjectJudgment"
+                      row-key="judgmentId"
+                      v-loading="listLoading">
+              <el-table-column type="selection"
+                               width="55"
+                               align="center"></el-table-column>
+              <el-table-column prop="sort"
+                               label="序号"
+                               width="80"
+                               align="center">
+                <template slot-scope="scope">
+                  {{ scope.row.sort }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="name"
+                               label="判分指标"
+                               align="center"></el-table-column>
+              <el-table-column prop="name"
+                               label="判分点名称"
+                               align="center"></el-table-column>
+              <el-table-column label="实验要求"
+                               align="center"
+                               width="600">
+                <template slot-scope="scope">
+                  <quill :border="true"
+                         :readonly="true"
+                         elseRead="true"
+                         v-model="scope.row.experimentalRequirements"
+                         :minHeight="100"
+                         :height="100" />
+                </template>
+              </el-table-column>
+              <el-table-column prop="score"
+                               label="分数"
+                               align="center"
+                               width="120">
+                <template slot-scope="scope">
+                  <!--type="number" @blur="updateProjectJudgment"-->
+                  <el-input :disabled="isDetail"
+                            v-model.trim="scope.row.score"
+                            @input="scoreChange(scope.row, scope.$index,$event)"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作"
+                               width="140"
+                               align="center">
+                <template slot-scope="scope">
+                  <el-button :disabled="isDetail"
+                             type="text"
+                             style="margin-right: 10px"
+                             @click="toJudgePoint('edit', scope.row)">自定义</el-button>
+                  <el-button :disabled="isDetail"
+                             type="text"
+                             @click="delJudgePoint(scope.$index)">
+                    删除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-card>
 
-        <!--选择判分点对话框-->
-        <el-dialog title="添加判分点" :visible.sync="dialogVisible" width="40%" :close-on-click-modal="false" @close="closeJudgment">
-            <div class="text-right mgb10">
-                <div>
-                    <el-input placeholder="请输入需要查找的判分点" prefix-icon="el-icon-search" v-model.trim="judgementpointsquery" clearable></el-input>
-                </div>
+        <el-card shadow="hover"
+                 class="mgb20">
+          <div class="flex-between mgb20">
+            <div class="flex-center">
+              <p class="addhr_tag"></p>
+              <span>实验提示</span>
             </div>
+            <div>
+              启用
+              <el-switch :disabled="isDetail"
+                         :active-value="0"
+                         :inactive-value="1"
+                         v-model="projectManage.hintOpen"></el-switch>
+            </div>
+          </div>
+          <div class="border-b-dashed"></div>
+          <div>
+            <el-form label-width="0">
+              <el-form-item prop="tips"
+                            label="">
+                <quill :border="true"
+                       :readonly="isDetail"
+                       v-model="projectManage.experimentHint"
+                       :minHeight="150"
+                       :height="150" />
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <!--选择判分点对话框-->
+    <el-dialog title="添加判分点"
+               :visible.sync="dialogVisible"
+               width="40%"
+               :close-on-click-modal="false"
+               @close="closeJudgment">
+      <div class="text-right mgb10">
+        <div>
+          <el-input placeholder="请输入需要查找的判分点"
+                    prefix-icon="el-icon-search"
+                    v-model.trim="judgementpointsquery"
+                    clearable></el-input>
+        </div>
+      </div>
 
-            <el-table
-                v-loading="visibleLoading"
+      <el-table v-loading="visibleLoading"
                 :data="judgementData"
                 ref="judgementTable"
                 class="table"
@@ -197,27 +273,39 @@
                 header-align="center"
                 max-height="400"
                 @selection-change="handleSelectionJudgment"
-                :row-key="rowKey"
-            >
-                <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
-                <el-table-column prop="id" label="序号" align="center" width="100">
-                    <template slot-scope="scope">
-                        {{ scope.$index + 1 }}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="name" label="判分点名称" align="center"></el-table-column>
-                <el-table-column label="操作" align="center" width="100">
-                    <template slot-scope="scope">
-                        <el-button size="mini" @click="toJudgePoint('view', scope.row)">查看</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <div slot="footer" class="dialog-footer">
-                <el-button @click="closeJudgment">取 消</el-button>
-                <el-button type="primary" @click="saveJudgment">确 定</el-button>
-            </div>
-        </el-dialog>
-    </div>
+                :row-key="rowKey">
+        <el-table-column type="selection"
+                         width="55"
+                         align="center"
+                         :reserve-selection="true"></el-table-column>
+        <el-table-column prop="id"
+                         label="序号"
+                         align="center"
+                         width="100">
+          <template slot-scope="scope">
+            {{ scope.$index + 1 }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="name"
+                         label="判分点名称"
+                         align="center"></el-table-column>
+        <el-table-column label="操作"
+                         align="center"
+                         width="100">
+          <template slot-scope="scope">
+            <el-button size="mini"
+                       @click="toJudgePoint('view', scope.row)">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer"
+           class="dialog-footer">
+        <el-button @click="closeJudgment">取 消</el-button>
+        <el-button type="primary"
+                   @click="saveJudgment">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -226,552 +314,552 @@ import quill from "@/components/quill";
 import Sortable from "sortablejs";
 
 export default {
-    components: {
-        quill
-    },
-    data() {
-        return {
-            projectId: this.$route.query.projectId,
-            founder: this.$route.query.founder,
-            token: btoa(sessionStorage.getItem("token")),
-            isDetail: this.$route.query.show,
-            isDetails:this.$route.query.isDetails,
-            projectManage: {
-                founder: 0, // 创建人角色(0、系统 1、老师)
-                projectName: "", // 项目名称
-                remark: '',
-                permissions: 0, // 项目权限(0、练习 1、考核 2、竞赛)
-                systemId: this.$route.query.systemId, // 系统id
-                hintOpen: 1, // 实验提示是否开启(0开启 1不开启 默认1)
-                experimentHint: "", // 实验提示
-                experimentTarget: "", // 实验目标
-                experimentDescription: "", // 项目背景
-                state: 0, // 状态(0、草稿箱 1、已发布)
-                isOpen: 0, // 是否开启(0开启 1未开启 默认0)
-                ztOpen: 0, // 是否开启(0开启 1未开启 默认0)
-                isDel: 0 // 是否删除(0、未删除 1、已删除 默认0)
-            },
-            projectJudgmentData: [], //实验任务(项目判分点)
-            oriPer: '', // 原始项目权限，用于保存的时候对比是否有修改该值，如果有，要调另一个接口查询提示
-            selectedProjectJudgment: [], // 选中的项目判分点
+  components: {
+    quill
+  },
+  data () {
+    return {
+      projectId: this.$route.query.projectId,
+      founder: this.$route.query.founder,
+      token: btoa(sessionStorage.getItem("token")),
+      isDetail: this.$route.query.show,
+      isDetails: this.$route.query.isDetails,
+      projectManage: {
+        founder: 0, // 创建人角色(0、系统 1、老师)
+        projectName: "", // 项目名称
+        remark: '',
+        permissions: 0, // 项目用途(0、练习 1、考核 2、竞赛)
+        systemId: this.$route.query.systemId, // 系统id
+        hintOpen: 1, // 实验提示是否开启(0开启 1不开启 默认1)
+        experimentHint: "", // 实验提示
+        experimentTarget: "", // 实验目标
+        experimentDescription: "", // 项目背景
+        state: 0, // 状态(0、草稿箱 1、已发布)
+        isOpen: 0, // 是否开启(0开启 1未开启 默认0)
+        ztOpen: 0, // 是否开启(0开启 1未开启 默认0)
+        isDel: 0 // 是否删除(0、未删除 1、已删除 默认0)
+      },
+      projectJudgmentData: [], //实验任务(项目判分点)
+      oriPer: '', // 原始项目用途，用于保存的时候对比是否有修改该值，如果有，要调另一个接口查询提示
+      selectedProjectJudgment: [], // 选中的项目判分点
 
-            dialogVisible: false, // 选择判分点对话框
-            judgementpointsquery: "", //条件筛选判分点
-            judgementData: [], // 判分点列表数据
-            selectedJudgment: [], // 选中的判分点
-            rowKey: "", // 判分点行数据的 Key
-            projectNameRepeat: false, // 项目名称是否重复
-            originName: '',
+      dialogVisible: false, // 选择判分点对话框
+      judgementpointsquery: "", //条件筛选判分点
+      judgementData: [], // 判分点列表数据
+      selectedJudgment: [], // 选中的判分点
+      rowKey: "", // 判分点行数据的 Key
+      projectNameRepeat: false, // 项目名称是否重复
+      originName: '',
 
-            flag: false, //判分点表格分数是否禁用
-            avgValuelist: [], //取得判分点平均分的数组
+      flag: false, //判分点表格分数是否禁用
+      avgValuelist: [], //取得判分点平均分的数组
 
-            searchTimer: null,
-            isToPoint: false, // 判断是否是跳转到判分点系统
-            visibleLoading: false, // 加载判分点数据
-            listLoading:false,// 列表加载
-            submiting: false, // 新增编辑防抖标识
-            updateTime: 0
-        };
+      searchTimer: null,
+      isToPoint: false, // 判断是否是跳转到判分点系统
+      visibleLoading: false, // 加载判分点数据
+      listLoading: false,// 列表加载
+      submiting: false, // 新增编辑防抖标识
+      updateTime: 0
+    };
+  },
+  computed: {
+    lastSystemId () {
+      return this.$store.state.lastSystemId;
     },
-    computed: {
-        lastSystemId() {
-            return this.$store.state.lastSystemId;
-        },
-        projectFields() {
-            return this.$store.state.projectFields;
-        },
-        handDistributionScore: function() {
-            //计算判分点分值，超出100提示，
-            let score = 0;
-            this.projectJudgmentData.forEach(e => {
-                score += parseInt(e.score);
-            });
-            if (isNaN(score)) {
-                return 0;
-            }
-            if (score > 100) {
-                this.$message.error("分配的数值已超过100");
-            }
-            return score;
-        }
+    projectFields () {
+      return this.$store.state.projectFields;
     },
-    watch: {
-      // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
-      projectManage: {
-        handler(){
-          this.updateTime++
-        },
-        deep:true
+    handDistributionScore: function () {
+      //计算判分点分值，超出100提示，
+      let score = 0;
+      this.projectJudgmentData.forEach(e => {
+        score += parseInt(e.score);
+      });
+      if (isNaN(score)) {
+        return 0;
+      }
+      if (score > 100) {
+        this.$message.error("分配的数值已超过100");
+      }
+      return score;
+    }
+  },
+  watch: {
+    // 监听信息是否有更改,有的话页面离开的时候要询问是否要保存
+    projectManage: {
+      handler () {
+        this.updateTime++
       },
-      judgementpointsquery(n) {
-          clearTimeout(this.searchTimer);
-          this.searchTimer = setTimeout(() => {
-              this.handleQueryJudgment();
-          }, 500);
+      deep: true
+    },
+    judgementpointsquery (n) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.handleQueryJudgment();
+      }, 500);
+    }
+  },
+  mounted () {
+    if (this.$route.query.projectId) {
+      this.projectId = this.$route.query.projectId;
+      this.getInfoData();
+    }
+    // 判断有没有缓存数据
+    if (JSON.stringify(this.projectFields) != "{}") {
+      let { projectManage, projectJudgmentData } = this.projectFields;
+      this.projectManage = projectManage;
+      this.projectJudgmentData = projectJudgmentData;
+    }
+    this.rowDrop();
+    this.$refs.main.scrollTop = 0;
+  },
+  beforeDestroy () {
+    if (!this.isToPoint) {
+      this.$store.dispatch("setProject", {});
+    }
+  },
+  methods: {
+    permissionChange () {
+      if (this.projectManage.permissions) {
+        this.projectManage.hintOpen = 1
+      } else {
+        this.projectManage.hintOpen = 0
       }
     },
-    mounted() {
-        if (this.$route.query.projectId) {
-            this.projectId = this.$route.query.projectId;
-            this.getInfoData();
+    getInfoData () { // 获取详情数据
+      if (!this.isToPoint) {
+        this.$get(`${this.api.getProjectDetail}?projectId=${this.projectId}`).then(res => {
+          let { projectManage, projectJudgmentVos } = res;
+          if (!projectManage.remark) projectManage.remark = projectManage.projectName // 如果没有备注，则直接显示项目名称
+          this.projectManage = projectManage;
+          this.projectJudgmentData = projectJudgmentVos;
+          this.oriPer = projectManage.permissions
+          this.projectJudgmentData.forEach((e, i) => {
+            e.sort = i + 1;
+          });
+          this.$nextTick(() => {
+            this.updateTime = 0
+            this.$refs.main.scrollTop = 0;
+          });
+        }).catch(err => {
+          console.log(err);
+        });
+      }
+    },
+    projectNameExistis () { // 项目管理名称判重
+      const { projectName } = this.projectManage
+      if (this.originName === projectName) {
+        this.projectNameRepeat = false
+      } else {
+        this.$post(this.api.queryNameIsExist, { projectName }).then(res => {
+          if (res.status === 200) {
+            this.projectNameRepeat = false
+          }
+        }).catch(err => {
+          this.projectNameRepeat = true
+        })
+      }
+    },
+    systemChange () { // 切换系统
+      if (this.projectJudgmentData.length) {
+        this.$confirm("更换系统会清空实验任务，确认更换？", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.projectJudgmentData = [];
+          this.$store.dispatch("setSystemId", this.projectManage.systemId);
+        }).catch(() => {
+          this.projectManage.systemId = this.lastSystemId;
+          console.log(this.lastSystemId, "this.lastSystemId");
+        });
+      }
+    },
+    // 去除空白标签
+    removeTag (val) {
+      return val.replace('<p><br></p>', '')
+    },
+    judgmentRelease (state) { //判断能否成功发布
+      let {
+        projectName,
+        experimentTarget,
+        experimentDescription,
+        experimentHint,
+        hintOpen
+      } = this.projectManage;
+      if (!projectName) {
+        this.$message.error("请输入项目名称");
+        return false;
+      }
+      if (this.projectNameRepeat) {
+        this.$message.error("项目名称重复!");
+        return false;
+      }
+      if (state) {
+        if (!experimentTarget || !this.removeTag(experimentTarget)) {
+          this.$message.error("请输入实验目标");
+          return false;
+        }
+        if (!experimentDescription || !this.removeTag(experimentDescription)) {
+          this.$message.error("请输入案例描述");
+          return false;
         }
-        // 判断有没有缓存数据
-        if (JSON.stringify(this.projectFields) != "{}") {
-            let { projectManage, projectJudgmentData } = this.projectFields;
-            this.projectManage = projectManage;
-            this.projectJudgmentData = projectJudgmentData;
+        if (this.projectJudgmentData.length == 0) {
+          this.$message.error("请添加判分点");
+          return false;
         }
-        this.rowDrop();
-        this.$refs.main.scrollTop = 0;
+        if (this.handDistributionScore < 100) {
+          this.$message.error("判分点分数未满100");
+          return false;
+        }
+        if (this.handDistributionScore > 100) {
+          this.$message.error("判分点分数已超过100");
+          return false;
+        }
+        if ((!experimentHint || !this.removeTag(experimentHint)) && hintOpen == 0) {
+          this.$message.error("请输入实验提示");
+          return false;
+        }
+      }
+      return true;
     },
-    beforeDestroy() {
-        if (!this.isToPoint) {
-            this.$store.dispatch("setProject", {});
+    handleSubmit (state) { //处理提交
+      if (this.submiting) return false
+      if (!this.judgmentRelease(state)) { //判断页面是否有没有输入的内容
+        return;
+      }
+      this.submiting = true
+      this.$store.dispatch("setSystemId", this.projectManage.systemId);
+      this.projectManage.state = state;
+      this.projectManage.ztOpen = state ? 0 : 1
+      let { systemId } = this.projectManage;
+      if (this.projectId) {
+        if (systemId == 2 || systemId == 3) {
+          console.log("系统id：", systemId);
+        } else {
+          // 先走更新判分点中间表接口，再走更新项目接口
+          this.updateProjectJudgment();
+        }
+      } else {
+        if (systemId == 2 || systemId == 3) {
+          console.log("系统id：", systemId);
+        } else {
+          // 添加
+          let tempArr = this.projectJudgmentData.map(i => {
+            let obj = {
+              projectId: this.projectId ? this.projectId : "",
+              judgmentId: i.judgmentId,
+              score: i.score,
+              sort: i.sort
+            };
+            return obj;
+          });
+
+          let params = {
+            projectManage: this.projectManage,
+            projectJudgmentList: tempArr
+          };
+          this.addProject(params);
         }
+      }
     },
-    methods: {
-        permissionChange(){
-            if (this.projectManage.permissions){
-                this.projectManage.hintOpen = 1
-            }else{
-                this.projectManage.hintOpen = 0
-            }
-        },
-        getInfoData() { // 获取详情数据
-            if (!this.isToPoint) {
-                this.$get(`${this.api.getProjectDetail}?projectId=${this.projectId}`).then(res => {
-                    let { projectManage, projectJudgmentVos } = res;
-                    if (!projectManage.remark) projectManage.remark = projectManage.projectName // 如果没有备注，则直接显示项目名称
-                    this.projectManage = projectManage;
-                    this.projectJudgmentData = projectJudgmentVos;
-                    this.oriPer = projectManage.permissions
-                    this.projectJudgmentData.forEach((e, i) => {
-                        e.sort = i + 1;
-                    });
-                    this.$nextTick(() => {
-                        this.updateTime = 0
-                        this.$refs.main.scrollTop = 0;
-                    });
-                }).catch(err => {
-                    console.log(err);
-                });
-            }
-        },
-        projectNameExistis() { // 项目管理名称判重
-          const { projectName } = this.projectManage
-          if (this.originName === projectName) {
-            this.projectNameRepeat = false
+    updateProject (params) { // 更新项目
+      this.$post(this.api[params.projectManage.state ? 'updateProjectManage' : 'editProjectDraft'], params).then(res => {
+        if (res.status === 200) {
+          // 中台创建的项目，并且更改了项目用途，就需要调这个接口
+          if (!params.projectManage.founder && this.oriPer !== params.projectManage.permissions) {
+            this.$get(`${this.api.checkConfig}?projectId=${this.projectId}`).then(res => {
+              this.$message.success(res.message === 'success' ? '更新实验项目成功' : res.message)
+            }).catch(err => { })
           } else {
-            this.$post(this.api.queryNameIsExist, { projectName }).then(res => {
-              if (res.status === 200) {
-                this.projectNameRepeat = false
-              }
-            }).catch(err => {
-              this.projectNameRepeat = true
-            })
+            this.$message.success('更新实验项目成功')
           }
-        },
-        systemChange() { // 切换系统
-            if (this.projectJudgmentData.length) {
-                this.$confirm("更换系统会清空实验任务，确认更换？", "提示", {
-                    type: "warning"
-                }).then(() => {
-                    this.projectJudgmentData = [];
-                    this.$store.dispatch("setSystemId", this.projectManage.systemId);
-                }).catch(() => {
-                    this.projectManage.systemId = this.lastSystemId;
-                    console.log(this.lastSystemId, "this.lastSystemId");
-                });
-            }
-        },
-        // 去除空白标签
-        removeTag(val) {
-          return val.replace('<p><br></p>', '')
-        },
-        judgmentRelease(state) { //判断能否成功发布
-            let {
-                projectName,
-                experimentTarget,
-                experimentDescription,
-                experimentHint,
-                hintOpen
-            } = this.projectManage;
-            if (!projectName) {
-                this.$message.error("请输入项目名称");
-                return false;
-            }
-            if (this.projectNameRepeat) {
-                this.$message.error("项目名称重复!");
-                return false;
-            }
-            if (state) {
-              if (!experimentTarget || !this.removeTag(experimentTarget)) {
-                  this.$message.error("请输入实验目标");
-                  return false;
-              }
-              if (!experimentDescription || !this.removeTag(experimentDescription)) {
-                  this.$message.error("请输入案例描述");
-                  return false;
-              }
-              if (this.projectJudgmentData.length == 0) {
-                  this.$message.error("请添加判分点");
-                  return false;
-              }
-              if (this.handDistributionScore < 100) {
-                  this.$message.error("判分点分数未满100");
-                  return false;
-              }
-              if (this.handDistributionScore > 100) {
-                  this.$message.error("判分点分数已超过100");
-                  return false;
-              }
-              if ((!experimentHint || !this.removeTag(experimentHint)) && hintOpen == 0) {
-                  this.$message.error("请输入实验提示");
-                  return false;
-              }
-            }
-            return true;
-        },
-        handleSubmit(state) { //处理提交
-            if (this.submiting) return false
-            if (!this.judgmentRelease(state)) { //判断页面是否有没有输入的内容
-                return;
-            }
-            this.submiting = true
-            this.$store.dispatch("setSystemId", this.projectManage.systemId);
-            this.projectManage.state = state;
-            this.projectManage.ztOpen = state ? 0 : 1
-            let { systemId } = this.projectManage;
-            if (this.projectId) {
-                if (systemId == 2 || systemId == 3) {
-                    console.log("系统id：", systemId);
-                } else {
-                    // 先走更新判分点中间表接口，再走更新项目接口
-                    this.updateProjectJudgment();
-                }
-            } else {
-                if (systemId == 2 || systemId == 3) {
-                    console.log("系统id：", systemId);
-                } else {
-                    // 添加
-                    let tempArr = this.projectJudgmentData.map(i => {
-                        let obj = {
-                            projectId: this.projectId ? this.projectId : "",
-                            judgmentId: i.judgmentId,
-                            score: i.score,
-                            sort: i.sort
-                        };
-                        return obj;
-                    });
-
-                    let params = {
-                        projectManage: this.projectManage,
-                        projectJudgmentList: tempArr
-                    };
-                    this.addProject(params);
-                }
-            }
-        },
-        updateProject(params) { // 更新项目
-            this.$post(this.api[params.projectManage.state ? 'updateProjectManage' : 'editProjectDraft'], params).then(res => {
-                if (res.status === 200) {
-                    // 中台创建的项目，并且更改了项目权限，就需要调这个接口
-                    if (!params.projectManage.founder && this.oriPer !== params.projectManage.permissions) {
-                        this.$get(`${this.api.checkConfig}?projectId=${this.projectId}`).then(res => {
-                            this.$message.success(res.message === 'success' ? '更新实验项目成功' : res.message)
-                        }).catch(err => {})
-                    } else {
-                        this.$message.success('更新实验项目成功')
-                    }
-                    this.$router.back();
-                }
-            }).catch(err => {
-                this.submiting = false
-            });
-        },
-        addProject(params) { // 添加项目
-            this.$post(this.api[params.projectManage.state ? 'addProjectManage' : 'saveProjectDraft'], params).then(res => {
-                if (res.status === 200) {
-                    this.$message.success("添加实验项目成功");
-                    this.$router.back();
-                }
-            }).catch(err => {
-                this.submiting = false
-            });
-        },
-        manualDistributionScore() { //点击手动分配分值
+          this.$router.back();
+        }
+      }).catch(err => {
+        this.submiting = false
+      });
+    },
+    addProject (params) { // 添加项目
+      this.$post(this.api[params.projectManage.state ? 'addProjectManage' : 'saveProjectDraft'], params).then(res => {
+        if (res.status === 200) {
+          this.$message.success("添加实验项目成功");
+          this.$router.back();
+        }
+      }).catch(err => {
+        this.submiting = false
+      });
+    },
+    manualDistributionScore () { //点击手动分配分值
 
-        },
-        avgDistributionScore() {
-            //点击平均分配分值
-            if (this.projectJudgmentData.length) {
-                this.$get(this.api.avgValues, {
-                    number: this.projectJudgmentData.length
-                }).then(res => {
-                    if (res.status === 200 && res.data) {
-                        this.projectJudgmentData = this.projectJudgmentData.map((item, index) => {
-                            item.score = res.data[index];
-                            return item;
-                        });
-                        // this.updateProjectJudgment();
-                    }
-                });
-            }
-        },
-        handleMoveUp(index) { // 处理上移(作废)
-            let x = index;
-            let y = index + 1;
-            this.projectJudgmentData.splice(x - 1, 1, ...this.projectJudgmentData.splice(y - 1, 1, this.projectJudgmentData[x - 1]));
-        },
-        handleMoveDown(index) { // 处理下移(作废)
-            let x = index + 1;
-            let y = index + 2;
-            this.projectJudgmentData.splice(x - 1, 1, ...this.projectJudgmentData.splice(y - 1, 1, this.projectJudgmentData[x - 1]));
-        },
-        scoreChange(row, index) { // 暂时解决，输入没有反应
-            this.projectJudgmentData.splice(index, 1, row);
-        },
-        delJudgePoint(index) { // 删除判分点
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.projectJudgmentData.splice(index, 1);
-            }).catch(() => {
-            });
-        },
-        handleSelectionProjectJudgment(val) {
-            this.selectedProjectJudgment = val;
-        },
-        batchDeleteProjectJudgment() { // 批量删除判分点
-            if (this.selectedProjectJudgment.length) {
-                this.$confirm("确定要删除吗？", "提示", {
-                    type: "warning"
-                }).then(() => {
-                    // this.projectJudgmentData.splice(index, 1);
-                    let list = this.projectJudgmentData;
-                    let result = [];
-                    list.map(i => {
-                        this.selectedProjectJudgment.find(j => j.judgmentId === i.judgmentId) || result.push(i);
-                    });
-                    this.projectJudgmentData = result;
-                }).catch(() => {
-                });
-            } else {
-                this.$message.error("请选择判分点");
-            }
-        },
-        handleAddJudgment() { // 处理添加判分点
-            this.dialogVisible = true;
-            this.handleQueryJudgment();
-        },
-        handleQueryJudgment() { // 查询判分点数据
-            let { systemId } = this.projectManage;
-            this.$nextTick(() => {
-                this.$refs.judgementTable.clearSelection();
-            });
-            let params = {
-                name: this.judgementpointsquery,
-                pageNum: 1,
-                pageSize: 10000,
-                enable:0,
-                systemId
-            };
-            if (systemId == 2 || systemId == 3) {
-                console.log("系统id：", systemId);
-            } else if (systemId == 11 || systemId == 12) {
-                // (流程)交易类
-                this.rowKey = "lcId";
-                this.getProcessClassData(params);
-            } else {
-                // 编程类
-                this.rowKey = "bcId";
-                this.getProgrammingClassData(params);
-            }
-        },
-        getProcessClassData(params) { // 获取流程类判分点列表数据
-            this.visibleLoading = true;
-            this.$post(`${this.api.getLcJudgmentPoint}`, params).then(res => {
-                if (res.status === 200) {
-                    let list = res.message.records;
-                    let result = [];
-                    list.map(i => {
-                        i.judgmentId = i.lcId;
-                        this.projectJudgmentData.find(j => j.judgmentId === i.judgmentId) || result.push(i);
-                    });
-                    this.visibleLoading = false;
-                    this.judgementData = result;
-                }
-            }).catch(err => {
-              this.visibleLoading = false
-            });
-        },
-        getProgrammingClassData(params) { // 获取编程类判分点列表数据
-            this.visibleLoading = true;
-            this.$post(this.api.getBcJudgmentPoint, params).then(res => {
-                if (res.status === 200) {
-                    let list = res.message.records;
-                    let result = [];
-                    list.map(i => {
-                        i.judgmentId = i.bcId;
-                        this.projectJudgmentData.find(j => j.judgmentId === i.judgmentId) || result.push(i);
-                    });
-                    this.visibleLoading = false;
-                    this.judgementData = result;
-                }
-            }).catch(err => {
-              this.visibleLoading = false
-            });
-        },
-        handleSelectionJudgment(val) { // 处理多选判分点
-            this.selectedJudgment = val;
-        },
-        closeJudgment() { // 关闭判分点对话框
-            this.judgementpointsquery = "";
-            this.dialogVisible = false;
-        },
-        saveJudgment() { // 确认选择判分点
-            if (this.selectedJudgment.length) {
-                this.judgementpointsquery = "";
-                this.dialogVisible = false;
-                let tempArr = this.selectedJudgment.map(i => {
-                    i.score = 0;
-                    return i;
-                });
-                this.projectJudgmentData = this.projectJudgmentData.concat(tempArr);
-                this.projectJudgmentData.map((e, i) => {
-                    e.sort = i + 1;
-                });
-                this.$nextTick(() => {
-                    this.$refs.projectJudgementTable.clearSelection();
-                });
-            } else {
-                this.$message.error("请选择判分点");
-            }
-        },
-        // 行拖拽
-        rowDrop() {
-            // 此时找到的元素是要拖拽元素的父容器
-            const tbody = document.querySelector(".draggable .el-table__body-wrapper tbody");
-            const _this = this;
-            Sortable.create(tbody, {
-                //  指定父元素下可被拖拽的子元素
-                draggable: ".draggable .el-table__row",
-                onEnd({ newIndex, oldIndex }) {
-                    // 解决拖拽数据不变化的问题:在改变了数据之后 先用一个变量深拷贝这个数据，然后把这个数据清空，最后再在vue的$nextTick函数里面重新给那个数据赋值
-                    _this.projectJudgmentData.splice(newIndex, 0, _this.projectJudgmentData.splice(oldIndex, 1)[0]);
-                    let newArray = _this.projectJudgmentData.slice(0);
-                    _this.projectJudgmentData = [];
-                    _this.$nextTick(function () {
-                        newArray.forEach((e, i) => {
-                            _this.$set(e, "sort", i + 1);// 不更新
-                            _this.$set(e, "name", e.name + "?");
-                            _this.$set(e, "name", e.name.slice(0, e.name.length - 1)); // 不更新的解决方案
-                        });
-                        _this.projectJudgmentData = newArray;
-                    });
-                }
-            });
-        },
-        // 修改判分点中间表
-        async updateProjectJudgment() {
-            let param = this.projectJudgmentData.map((e, i) => {
-                let obj = {
-                    judgmentId: e.judgmentId,
-                    projectId: this.projectId || "",
-                    score: e.score,
-                    sort: i + 1,
-                    id: e.id
-                };
-                return obj;
-            });
-            await this.$post(`${this.api.updateProjectJudgment}?projectId=${this.projectId}`, param).then(res => {
-                let tempArr = this.projectJudgmentData.map(i => {
-                    let obj = {
-                        projectId: this.projectId ? this.projectId : "",
-                        judgmentId: i.judgmentId,
-                        score: i.score,
-                        sort: i.sort
-                    };
-                    return obj;
-                });
-                let params = {
-                    projectManage: this.projectManage,
-                    projectJudgmentList: tempArr
-                };
-                this.updateProject(params);
-            }).catch(err => {
-                console.log(err);
-            });
-        },
-        handleCacheData() { // 处理缓存数据
-            this.isToPoint = true;
-            this.$store.dispatch("setProject", {
-                projectManage: this.projectManage,
-                projectJudgmentData: this.projectJudgmentData
+    },
+    avgDistributionScore () {
+      //点击平均分配分值
+      if (this.projectJudgmentData.length) {
+        this.$get(this.api.avgValues, {
+          number: this.projectJudgmentData.length
+        }).then(res => {
+          if (res.status === 200 && res.data) {
+            this.projectJudgmentData = this.projectJudgmentData.map((item, index) => {
+              item.score = res.data[index];
+              return item;
             });
-        },
-        toJudgePoint(type, row) { // 进入判分点系统
-            this.handleCacheData();
-            let jumpPath = Setting.jumpPath;
-            let { systemId } = this.projectManage;
-            let href = "";
-            if (type === "view") {
-                // 查看
-                if (systemId == 2) {
-                    console.log(systemId);
-                } else if (systemId == 3) {
-                    console.log(systemId);
-                } else if (systemId == 11 || systemId == 12) {
-                    // 交易类判分点（银行综合系统）
-                    href = `${jumpPath}/#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
-                } else {
-                    // 编程类判分点（python子系统）
-                    href = `${jumpPath}/#/program?isView=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
-                }
-            } else if (type === "edit") {
-                // 自定义（老师端隐藏此功能）
-                if (systemId == 2) {
-                    console.log(systemId);
-                } else if (systemId == 3) {
-                    console.log(systemId);
-                } else if (systemId == 11 || systemId == 12) {
-                    // 交易类判分点（银行综合系统）
-                    href = `${jumpPath}/#/Transaction?isEdit=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
-                } else {
-                    // 编程类判分点（python子系统）
-                    href = `${jumpPath}/#/program?isEdit=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
-                }
-            } else if (type === "home") {
-                if (systemId == 2 || systemId == 3) {
-                    href = `${jumpPath}/#/list`;
-                } else {
-                    // 进入判分点系统首页（老师端隐藏此功能）
-                    href = `${jumpPath}#/?systemId=${systemId}&token=${this.token}&referrer=${btoa(location.href)}`;
-                }
-            }
-            location.href = href;
-        },
-        // 返回列表
-        toList() {
-          this.$router.back()
-        },
-        // 返回
-        back() {
-          // 更改了信息才需要提示
-          if(this.updateTime){
-            this.$confirm('编辑的内容未保存，是否保存？', "提示", {
-              type: "warning"
-            }).then(() => {
-              this.handleSubmit(this.projectManage.state)
-            }).catch(() => {
-              this.toList()
-            })
-          } else {
-            this.toList()
+            // this.updateProjectJudgment();
           }
+        });
+      }
+    },
+    handleMoveUp (index) { // 处理上移(作废)
+      let x = index;
+      let y = index + 1;
+      this.projectJudgmentData.splice(x - 1, 1, ...this.projectJudgmentData.splice(y - 1, 1, this.projectJudgmentData[x - 1]));
+    },
+    handleMoveDown (index) { // 处理下移(作废)
+      let x = index + 1;
+      let y = index + 2;
+      this.projectJudgmentData.splice(x - 1, 1, ...this.projectJudgmentData.splice(y - 1, 1, this.projectJudgmentData[x - 1]));
+    },
+    scoreChange (row, index) { // 暂时解决，输入没有反应
+      this.projectJudgmentData.splice(index, 1, row);
+    },
+    delJudgePoint (index) { // 删除判分点
+      this.$confirm("确定要删除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.projectJudgmentData.splice(index, 1);
+      }).catch(() => {
+      });
+    },
+    handleSelectionProjectJudgment (val) {
+      this.selectedProjectJudgment = val;
+    },
+    batchDeleteProjectJudgment () { // 批量删除判分点
+      if (this.selectedProjectJudgment.length) {
+        this.$confirm("确定要删除吗？", "提示", {
+          type: "warning"
+        }).then(() => {
+          // this.projectJudgmentData.splice(index, 1);
+          let list = this.projectJudgmentData;
+          let result = [];
+          list.map(i => {
+            this.selectedProjectJudgment.find(j => j.judgmentId === i.judgmentId) || result.push(i);
+          });
+          this.projectJudgmentData = result;
+        }).catch(() => {
+        });
+      } else {
+        this.$message.error("请选择判分点");
+      }
+    },
+    handleAddJudgment () { // 处理添加判分点
+      this.dialogVisible = true;
+      this.handleQueryJudgment();
+    },
+    handleQueryJudgment () { // 查询判分点数据
+      let { systemId } = this.projectManage;
+      this.$nextTick(() => {
+        this.$refs.judgementTable.clearSelection();
+      });
+      let params = {
+        name: this.judgementpointsquery,
+        pageNum: 1,
+        pageSize: 10000,
+        enable: 0,
+        systemId
+      };
+      if (systemId == 2 || systemId == 3) {
+        console.log("系统id：", systemId);
+      } else if (systemId == 11 || systemId == 12) {
+        // (流程)交易类
+        this.rowKey = "lcId";
+        this.getProcessClassData(params);
+      } else {
+        // 编程类
+        this.rowKey = "bcId";
+        this.getProgrammingClassData(params);
+      }
+    },
+    getProcessClassData (params) { // 获取流程类判分点列表数据
+      this.visibleLoading = true;
+      this.$post(`${this.api.getLcJudgmentPoint}`, params).then(res => {
+        if (res.status === 200) {
+          let list = res.message.records;
+          let result = [];
+          list.map(i => {
+            i.judgmentId = i.lcId;
+            this.projectJudgmentData.find(j => j.judgmentId === i.judgmentId) || result.push(i);
+          });
+          this.visibleLoading = false;
+          this.judgementData = result;
+        }
+      }).catch(err => {
+        this.visibleLoading = false
+      });
+    },
+    getProgrammingClassData (params) { // 获取编程类判分点列表数据
+      this.visibleLoading = true;
+      this.$post(this.api.getBcJudgmentPoint, params).then(res => {
+        if (res.status === 200) {
+          let list = res.message.records;
+          let result = [];
+          list.map(i => {
+            i.judgmentId = i.bcId;
+            this.projectJudgmentData.find(j => j.judgmentId === i.judgmentId) || result.push(i);
+          });
+          this.visibleLoading = false;
+          this.judgementData = result;
+        }
+      }).catch(err => {
+        this.visibleLoading = false
+      });
+    },
+    handleSelectionJudgment (val) { // 处理多选判分点
+      this.selectedJudgment = val;
+    },
+    closeJudgment () { // 关闭判分点对话框
+      this.judgementpointsquery = "";
+      this.dialogVisible = false;
+    },
+    saveJudgment () { // 确认选择判分点
+      if (this.selectedJudgment.length) {
+        this.judgementpointsquery = "";
+        this.dialogVisible = false;
+        let tempArr = this.selectedJudgment.map(i => {
+          i.score = 0;
+          return i;
+        });
+        this.projectJudgmentData = this.projectJudgmentData.concat(tempArr);
+        this.projectJudgmentData.map((e, i) => {
+          e.sort = i + 1;
+        });
+        this.$nextTick(() => {
+          this.$refs.projectJudgementTable.clearSelection();
+        });
+      } else {
+        this.$message.error("请选择判分点");
+      }
+    },
+    // 行拖拽
+    rowDrop () {
+      // 此时找到的元素是要拖拽元素的父容器
+      const tbody = document.querySelector(".draggable .el-table__body-wrapper tbody");
+      const _this = this;
+      Sortable.create(tbody, {
+        //  指定父元素下可被拖拽的子元素
+        draggable: ".draggable .el-table__row",
+        onEnd ({ newIndex, oldIndex }) {
+          // 解决拖拽数据不变化的问题:在改变了数据之后 先用一个变量深拷贝这个数据，然后把这个数据清空，最后再在vue的$nextTick函数里面重新给那个数据赋值
+          _this.projectJudgmentData.splice(newIndex, 0, _this.projectJudgmentData.splice(oldIndex, 1)[0]);
+          let newArray = _this.projectJudgmentData.slice(0);
+          _this.projectJudgmentData = [];
+          _this.$nextTick(function () {
+            newArray.forEach((e, i) => {
+              _this.$set(e, "sort", i + 1);// 不更新
+              _this.$set(e, "name", e.name + "?");
+              _this.$set(e, "name", e.name.slice(0, e.name.length - 1)); // 不更新的解决方案
+            });
+            _this.projectJudgmentData = newArray;
+          });
         }
+      });
+    },
+    // 修改判分点中间表
+    async updateProjectJudgment () {
+      let param = this.projectJudgmentData.map((e, i) => {
+        let obj = {
+          judgmentId: e.judgmentId,
+          projectId: this.projectId || "",
+          score: e.score,
+          sort: i + 1,
+          id: e.id
+        };
+        return obj;
+      });
+      await this.$post(`${this.api.updateProjectJudgment}?projectId=${this.projectId}`, param).then(res => {
+        let tempArr = this.projectJudgmentData.map(i => {
+          let obj = {
+            projectId: this.projectId ? this.projectId : "",
+            judgmentId: i.judgmentId,
+            score: i.score,
+            sort: i.sort
+          };
+          return obj;
+        });
+        let params = {
+          projectManage: this.projectManage,
+          projectJudgmentList: tempArr
+        };
+        this.updateProject(params);
+      }).catch(err => {
+        console.log(err);
+      });
+    },
+    handleCacheData () { // 处理缓存数据
+      this.isToPoint = true;
+      this.$store.dispatch("setProject", {
+        projectManage: this.projectManage,
+        projectJudgmentData: this.projectJudgmentData
+      });
+    },
+    toJudgePoint (type, row) { // 进入判分点系统
+      this.handleCacheData();
+      let jumpPath = Setting.jumpPath;
+      let { systemId } = this.projectManage;
+      let href = "";
+      if (type === "view") {
+        // 查看
+        if (systemId == 2) {
+          console.log(systemId);
+        } else if (systemId == 3) {
+          console.log(systemId);
+        } else if (systemId == 11 || systemId == 12) {
+          // 交易类判分点（银行综合系统）
+          href = `${jumpPath}/#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
+        } else {
+          // 编程类判分点（python子系统）
+          href = `${jumpPath}/#/program?isView=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
+        }
+      } else if (type === "edit") {
+        // 自定义（老师端隐藏此功能）
+        if (systemId == 2) {
+          console.log(systemId);
+        } else if (systemId == 3) {
+          console.log(systemId);
+        } else if (systemId == 11 || systemId == 12) {
+          // 交易类判分点（银行综合系统）
+          href = `${jumpPath}/#/Transaction?isEdit=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
+        } else {
+          // 编程类判分点（python子系统）
+          href = `${jumpPath}/#/program?isEdit=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`;
+        }
+      } else if (type === "home") {
+        if (systemId == 2 || systemId == 3) {
+          href = `${jumpPath}/#/list`;
+        } else {
+          // 进入判分点系统首页（老师端隐藏此功能）
+          href = `${jumpPath}#/?systemId=${systemId}&token=${this.token}&referrer=${btoa(location.href)}`;
+        }
+      }
+      location.href = href;
+    },
+    // 返回列表
+    toList () {
+      this.$router.back()
+    },
+    // 返回
+    back () {
+      // 更改了信息才需要提示
+      if (this.updateTime) {
+        this.$confirm('编辑的内容未保存，是否保存？', "提示", {
+          type: "warning"
+        }).then(() => {
+          this.handleSubmit(this.projectManage.state)
+        }).catch(() => {
+          this.toList()
+        })
+      } else {
+        this.toList()
+      }
     }
+  }
 };
 </script>
 
@@ -781,9 +869,9 @@ export default {
     padding: 0;
     border-bottom: 0;
 }
-.main{
+.main {
     overflow: auto;
     overflow-x: hidden;
-    height: calc(100vh - 152px );
+    height: calc(100vh - 152px);
 }
 </style>
\ No newline at end of file
diff --git a/src/views/serve/projectList.vue b/src/views/serve/projectList.vue
index b0c657e..98be09e 100644
--- a/src/views/serve/projectList.vue
+++ b/src/views/serve/projectList.vue
@@ -44,7 +44,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="权限">
+            <el-form-item label="用途">
               <el-select v-model="queryData.permissions"
                          placeholder="请选择"
                          @change="initData">
@@ -120,7 +120,7 @@
             {{ queryData.founder == 1 ? scope.row.schoolName : scope.row.creator }}
           </template>
         </el-table-column>
-        <el-table-column label="权限"
+        <el-table-column label="用途"
                          min-width="120"
                          align="center">
           <template slot-scope="scope">
@@ -208,7 +208,7 @@ export default {
         platformId: 3, // 平台：职站:1 中台:3
         founder: 0, // 创建人角色(0:系统 1:老师)
         state: "", // 状态(0:草稿箱 1:已发布)
-        permissions: "", // 项目权限(0:练习 1:考核 2:竞赛)
+        permissions: "", // 项目用途(0:练习 1:考核 2:竞赛)
       },
       keyword: '',
       status: '',
diff --git a/src/views/shop/addProduct/index.vue b/src/views/shop/addProduct/index.vue
index b8f6331..222285f 100644
--- a/src/views/shop/addProduct/index.vue
+++ b/src/views/shop/addProduct/index.vue
@@ -306,7 +306,8 @@
                   :offset="5">
             <el-form-item class="req"
                           label="市场建议单价"
-                          prop="briefIntroduction">
+                          prop="briefIntroduction"
+                          label-width="120px">
               <el-input type="number"
                         style="width: 250px"
                         placeholder="请输入市场建议单价"