Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/src/view/signupActivity/infoActivity copy.vue

@@ -88,7 +88,7 @@
             <TabPane label="评审管理" name="2">
                 <div class="tab-header">
                     <Button @click="processShow = true">添加评审专家</Button>
-                    <Button style="margin-left: 20px;">自动分配评审作品</Button>
+                    <Button style="margin-left: 20px;" @click="workPro = true">自动分配评审作品</Button>
                     <Button style="float: right;" @click="ruleDrawer = true">评审规则</Button>
                 </div>
                 <div>
@@ -104,18 +104,35 @@
             </TabPane>
             <TabPane label="成绩统计" name="3">
                 <div class="tab-header">
-                    <Button v-show="!awardsing" @click="setAwards()">设置奖项</Button>
-                    <Button v-show="awardsing" @click="awardsShow = true">批量设置</Button>
-                    <Button style="margin-left: 20px;">公示成绩</Button>
+                    <div v-show="!awardsing">
+                        <Button @click="setAwards()">设置奖项</Button>
+                        <Button @click="openAch()" style="margin-left: 20px;">公示成绩</Button>
+                    </div>
+                    <div v-show="awardsing">
+                        <Button @click="awardsShow = true">批量设置</Button>
+                        <Button @click="awardTypes()" style="margin-left: 20px;">取消</Button>
+                    </div>
                 </div>
                 <div style="height: 80%;">
                     <Table :columns="scoreColumns" :data="scoreList" height="600">
+                        <template #score1="{row}">
+                            <div v-show="!row.edit">
+                                <span>{{ row.score1 }}</span>
+                                <Icon type="md-nutrition" @click="row.edit = true" />
+                            </div>
+                            <div v-show="row.edit">
+                                <InputNumber :min="0" v-model="row.score1" />
+                                <Icon type="md-checkmark-circle" @click="row.edit = false" />
+                                <Icon type="md-close-circle" @click="row.edit = false" />
+                            </div>
+                        </template>
                         <template #awards="{row}">
-                            <span v-if="!awardsing">{{ row.awards }}</span>
+                            <span v-if="!awardsing">{{ row.awards ? row.awards : '-' }}</span>
                             <div v-else>
                                 <Select v-model="row.awards" style="width:200px" :transfer="true">
                                     <Option v-for="item in awardsList" :value="item.value" :key="item.value">{{ item.label }}</Option>
                                 </Select>
+                                <Icon type="md-add-circle" @click="addAward = true" />
                             </div>
                         </template>
                     </Table>
@@ -123,17 +140,33 @@
             </TabPane>
         </Tabs>
         <Modal v-model="processShow" title="邀请评审专家" width="800" :footer-hide="true">
-            <Table :columns="inviteColumns" :data="processList">
+            <!-- <Table :columns="inviteColumns" :data="processList">
                 <template #process="{row, index}">
                     <Progress :percent="25" :stroke-width="10" />
                 </template>
                 <template #actions="{row, index}">
                     <Button type="error" size="small" @click="deleteApplica(row, index, 'process')">删除</Button>
                 </template>
-            </Table>
-            <div style="margin: 30px 0 10px 0; text-align: center;">
-                <Button type="primary" long>邀请</Button>
+            </Table> -->
+            <div style="margin-bottom: 10px;">
+                <Input search enter-button placeholder="输入手机号查找" @on-search="searchPro" />
             </div>
+            <template v-if="isSearch">
+                <div style="display: flex; justify-content: space-between; align-items: center; margin: 20px; margin-bottom: 30px;" v-show="isTmd">
+                    <img src="./demo.jpeg" alt="" style="width: 50px; height: 50px; border-radius: 50px;">
+                    <p>罗老师</p>
+                    <p>1595321354</p>
+                    <Button type="success" size="small">邀请</Button>
+                </div>
+                <div style="text-align: center; margin: 30px 0;" v-show="!isTmd">
+                    <p style="font-size: 20px; margin-bottom: 10px;">手机号未创建醍摩豆帐号，是否邀请该手机号并创建醍摩豆帐号？</p>
+                    <Button type="success" size="small" style="margin-right: 10px;">邀请并创建</Button>
+                    <Button size="small">取消</Button>
+                </div>
+            </template>
+            <!-- <div style="margin: 30px 0 10px 0; text-align: center;">
+                <Button type="primary" long>邀请</Button>
+            </div> -->
         </Modal>
         <Drawer title="评审规则" :width="50" :closable="false" v-model="ruleDrawer">
             <p style="font-size: 18px; font-weight: bold;">{{ ruleInfo.name }}</p>
@@ -148,6 +181,16 @@
                 <Option v-for="item in awardsList" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select>
         </Modal>
+        <Modal v-model="workPro" title="自动分配评审作品">
+            <p>
+                每个作品被评审次数
+                <InputNumber v-model="workProNum" controls-outside />
+            </p>
+            <p>系统将根据参赛作品数量和评审专家数量，随机将作品分配给评审专家。</p>
+        </Modal>
+        <Modal v-model="addAward" title="新增奖项" @on-ok="addAwardOK()">
+            <Input v-model="addAwardWord" placeholder="Enter something..." style="width: 300px" />
+        </Modal>
     </div>
 </template>
 
@@ -354,7 +397,7 @@ export default {
                 },
                 {
                     title: '建议分数',
-                    key: 'score1'
+                    slot: 'score1'
                 },
                 {
                     title: '奖项',
@@ -491,84 +534,42 @@ export default {
                     score: '67',
                     score1: '85',
                     awards: '',
+                    edit: false,
                 },
                 {
                     name: '语文组',
                     score: '92',
                     score1: '85',
                     awards: '',
+                    edit: false,
                 },
                 {
                     name: '数学组',
                     score: '67',
                     score1: '85',
                     awards: '',
+                    edit: false,
                 },
                 {
                     name: '语文组',
                     score: '92',
                     score1: '85',
                     awards: '',
+                    edit: false,
                 },
                 {
                     name: '数学组',
                     score: '67',
                     score1: '85',
                     awards: '',
+                    edit: false,
                 },
                 {
                     name: '语文组',
                     score: '92',
                     score1: '85',
                     awards: '',
-                },
-                {
-                    name: '数学组',
-                    score: '67',
-                    score1: '85',
-                    awards: '',
-                },
-                {
-                    name: '语文组',
-                    score: '92',
-                    score1: '85',
-                    awards: '',
-                },
-                {
-                    name: '数学组',
-                    score: '67',
-                    score1: '85',
-                    awards: '',
-                },
-                {
-                    name: '语文组',
-                    score: '92',
-                    score1: '85',
-                    awards: '',
-                },
-                {
-                    name: '数学组',
-                    score: '67',
-                    score1: '85',
-                    awards: '',
-                },
-                {
-                    name: '语文组',
-                    score: '92',
-                    score1: '85',
-                    awards: '',
-                },
-                {
-                    name: '数学组',
-                    score: '67',
-                    score1: '85',
-                    awards: '',
-                },
-                {
-                    name: '语文组',
-                    score: '92',
-                    score1: '85',
-                    awards: '',
+                    edit: false,
                 },
             ],
             ruleDrawer: false,
@@ -693,6 +694,16 @@ export default {
             processShow: false,
             awardsShow: false,
             awardsSel: '',
+            tmdid: {
+                id: '',
+            },
+            scoreEdit: 0,
+            isTmd: false,
+            isSearch: false,
+            workPro: false,
+            workProNum: 1,
+            addAward: false,
+            addAwardWord: '',
         }
     },
     mounted () {
@@ -846,6 +857,30 @@ export default {
             })
             this.$forceUpdate()
         },
+        openAch() {
+            this.$Modal.confirm({
+                content: '确认公示本次活动的成绩吗？',
+                okText: '公示',
+                onOk: () => {
+
+                }
+            })
+        },
+        searchPro(value) {
+            this.isSearch = true
+            console.log(value);
+            this.isTmd = value === '111'
+        },
+        addAwardOK() {
+            this.awardsList.push({
+                value: this.addAwardWord,
+                label: this.addAwardWord
+            })
+        },
+        awardTypes() {
+            this.awardsing = false
+            this.scoreColumns.splice(0, 1)
+        },
     }
 }
 </script>

TEAMModelOS/ClientApp/src/view/signupActivity/infoActivity.vue

@@ -9,6 +9,9 @@
                 <span class="type-box">校级</span>
                 {{ actInfo.name }}
             </p>
+            <div style="float: right;">
+                <Button style="margin-top: 16px" type="primary" @click="openlast()">立即发布</Button>
+            </div>
         </div>
         <div class="info-box">
             <vuescroll>
@@ -64,8 +67,8 @@
                         </TabPane>
                     </Tabs>
                 </div>
-                <Button style="margin-top: 16px; margin-right: 10px;" type="success" @click="next">通过审核</Button>
-                <Button style="margin-top: 16px" type="error" @click="last">不通过</Button>
+                <!-- <Button style="margin-top: 16px; margin-right: 10px;" type="success" @click="next">通过审核</Button>
+                <Button style="margin-top: 16px" type="error" @click="last">不通过</Button> -->
             </vuescroll>
         </div>
     </div>
@@ -115,6 +118,14 @@ export default {
         last() {
             this.steps -= 1
         },
+        openlast() {
+            this.$router.push({
+                name: this.isArea === 'area' ? 'areaInfoActivity' : 'infoActivity',
+                params: {
+                    id: this.actInfo
+                }
+            })
+        },
     }
 }
 </script>

TEAMModelOS/ClientApp/src/view/signupActivity/processActivity.vue

@@ -3,9 +3,13 @@
         <div class="list-header">
             <RadioGroup v-model="processType" type="button" button-style="solid">
                 <Radio :label="-1">全部</Radio>
-                <Radio :label="0">未审核</Radio>
-                <Radio :label="1">已审核</Radio>
+                <Radio :label="0">未发布</Radio>
+                <Radio :label="1">已发布</Radio>
             </RadioGroup>
+            <span class="creat-activity" @click="createActivity">
+                <Icon type="md-add" />
+                创建活动
+            </span>
         </div>
         <vuescroll>
             <div class="activitya-list">
@@ -23,9 +27,10 @@
                         <p>主办：{{ item.host }}</p>
                         <!-- <p>简介：{{ item.jianjie }}</p> -->
                         <div class="process-type">
-                            <span v-show="!item.type" style="color: #ec8130;">待审核</span>
-                            <span v-show="item.type === 1" style="color: #1e9a1e;">已通过</span>
-                            <span v-show="item.type === 2" style="color: #e03f3f;">不通过</span>
+                            <span v-show="!item.type" style="color: #ec8130;">待发布</span>
+                            <!-- <span v-show="item.type === 1" style="color: #1e9a1e;">已通过</span>
+                            <span v-show="item.type === 2" style="color: #e03f3f;">不通过</span> -->
+                            <span v-show="item.type === 2" style="color: #696969;">已结束</span>
                         </div>
                     </div>
                 </div>
@@ -173,13 +178,27 @@ export default {
             this.activityListShow = this.activityList
         },
         goInfo(data) {
-            this.$router.push(
+            if(data.type) {
+                this.$router.push({
+                    name: this.isArea === 'area' ? 'areaInfoActivity' : 'infoActivity',
+                    params: {
+                        id: data
+                    }
+                })
+            } else {
+                this.$router.push(
                 {
                     name: this.isArea === 'area' ? 'areaInfoProcess' : 'infoProcess',
                     params: {
                         info: data
                     },
                 })
+            }
+        },
+        createActivity() {
+            this.$router.push({
+                name: this.isArea === 'area' ? 'areaCreateActivity' : "createActivity",
+            })
         },
     }
 }
@@ -193,6 +212,12 @@ export default {
     padding-right: 20px;
     margin-bottom: 5px;
     line-height: 45px;
+    .creat-activity {
+        float: right;
+        user-select: none;
+        cursor: pointer;
+        color: #40a8f0;
+    }
 }
 .activitya-list {
     display: flex;

TEAMModelOS/ClientApp/src/view/signupActivity/setActivity.vue

@@ -1,21 +1,26 @@
 <template>
-    <div>
+    <div class="setting">
         <Tabs v-model="activeName">
             <TabPane label="分站管理" name="subs">
                 <Form :model="formItem" :label-width="120" style="width: 98%;">
                     <FormItem label="授权单位/组织">
-                        <Input v-model="formItem.unit" placeholder="请输入..." disabled></Input>
+                        <Input v-model="formItem.unit" placeholder="请输入..." :disabled="!editType"></Input>
                     </FormItem>
                     <FormItem label="分站代码">
-                        <Input v-model="formItem.code" placeholder="请输入..." disabled></Input>
+                        <Input v-model="formItem.code" placeholder="请输入..." :disabled="!editType"></Input>
                     </FormItem>
                     <FormItem label="分站路由">
                         <Input v-model="formItem.route" placeholder="请输入..." disabled></Input>
                     </FormItem>
+                    <FormItem>
+                        <Button @click="editType = true" v-show="!editType">更改</Button>
+                        <Button type="primary" @click="editType = false" v-show="editType">保存</Button>
+                    </FormItem>
                 </Form>
             </TabPane>
             <TabPane label="首页管理" name="homepage">
-                <Table :columns="columns" :data="data" class="banner-set">
+                <Button @click="bannerShow = true">新增</Button>
+                <Table :columns="columns" :data="bannnerdata" class="banner-set">
                     <template #type="{row}">
                         <span>{{ row.type ? '区级' : '公开' }}</span>
                     </template>
@@ -34,6 +39,11 @@
                 </Table>
             </TabPane>
         </Tabs>
+        <Modal v-model="bannerShow" title="新增首页展示" @on-ok="addBanner()">
+            <Select v-model="awardsSel" style="width:200px">
+                <Option v-for="(item, index) in awardsList" :value="index" :key="index">{{ item.name }}</Option>
+            </Select>
+        </Modal>
     </div>
 </template>
 
@@ -91,7 +101,7 @@ export default {
                     align: 'center',
                 }
             ],
-            data: [
+            bannnerdata: [
                 {
                     name: '2019第八届科技领导卓越奖',
                     people: '罗老师',
@@ -100,8 +110,26 @@ export default {
                     state: 0,
                     image: require('./demo.jpeg'),
                 },
-            ]
+            ],
+            editType: false,
+            bannerShow: false,
+            awardsList: [
+                {
+                    name: '2019第八届科技领导卓越奖',
+                    people: '罗老师',
+                    tmdid: '1595321266',
+                    type: 0,
+                    state: 0,
+                    image: require('./demo.jpeg'),
+                },
+            ],
+            awardsSel: [],
         }
+    },
+    methods: {
+        addBanner() {
+            this.bannnerdata.push(this.awardsList[this.awardsSel])
+        },
     }
 }
 </script>
@@ -116,4 +144,12 @@ export default {
         padding: 5px 0;
     }
 }
+</style>
+<style lang="less">
+.setting {
+    .ivu-input[disabled],
+    fieldset[disabled]{
+        color: #4e4e4e;
+    }
+}
 </style>