diff --git a/attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue b/attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue
index 3b75bd8271ccf12ca82545bac1f36cb758a8b265..af09a1ee60c03aa51cc14074563022edafddc4ab 100644
--- a/attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue
@@ -6,7 +6,10 @@
<el-tab-pane label="璁捐闂嵎" name="1">
<fc-designer style="height: 79vh;" ref="designer">
<template slot="handle">
- <ElButton icon="el-icon-upload" type="success" size="small" @click="showDrawer" round>绉诲姩绔瑙�
+ <ElButton style="margin-left: 10px;" icon="el-icon-upload" type="primary" size="small"
+ @click="issueBtn" round>闂嵎鍙戝竷
+ </ElButton>
+ <ElButton icon="el-icon-view" type="success" size="small" @click="showDrawer" round>H5棰勮
</ElButton>
</template>
</fc-designer>
@@ -31,6 +34,30 @@
</div>
</div>
</el-drawer>
+
+ <el-dialog title="闂嵎鍙戝竷" :visible.sync="issueDialog" width="30%" top="25vh">
+ <el-form :model="issueForm">
+ <el-form-item label="闂嵎灏侀潰锛�" label-width="125px">
+ <div style="display: flex;align-items: center;">
+ <img style="width:80px; height: 50px; margin-right: 10px;cursor: pointer;"
+ v-for="i in issueForm.cover" :src="i" alt="">
+ </div>
+ <!-- <el-input v-model="issueForm.cover" autocomplete="off"></el-input> -->
+ </el-form-item>
+ <el-form-item label="鍙嶉鏈熼檺锛�" label-width="125px">
+ <el-date-picker v-model="issueForm.time" type="datetimerange" range-separator="鑷�"
+ start-placeholder="寮€濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="閭€璇蜂汉鍛橈細" label-width="125px">
+ <el-button type="success" size="small">閫夋嫨浜哄憳</el-button>
+ </el-form-item>
+ <div style="text-align: center;">
+ <el-button size="small" @click="issueDialog = false">鍙栨秷</el-button>
+ <el-button type="primary" size="small" @click="issueFormBtn">鍙戝竷</el-button>
+ </div>
+ </el-form>
+ </el-dialog>
</el-tab-pane>
</el-tabs>
</div>
@@ -43,8 +70,15 @@ export default {
return {
tabs: '1',
drawer: 0,
- Frule: '',
+ Frule: [],
Fopthion: '',
+ issueDialog: false,
+ issueForm: {
+ cover: [
+ 'http://sy.scsmile.cn/YX-JXgl/v1.0/HT/images/%E6%96%B0%E5%A2%9E%E5%8F%8D%E9%A6%88_%E7%AC%AC3%E6%AD%A5_/u26101.svg',
+ 'http://sy.scsmile.cn/YX-JXgl/v1.0/HT/images/%E6%96%B0%E5%A2%9E%E5%8F%8D%E9%A6%88_%E7%AC%AC3%E6%AD%A5_/u26102.svg'
+ ]
+ },
}
},
mounted() {
@@ -75,11 +109,31 @@ export default {
this.$refs.designer.removeMenuItem("timePicker")
this.$refs.designer.removeMenuItem("switch")
this.$refs.designer.removeMenuItem("tree")
+ this.$refs.designer.removeMenuItem("inputNumber")
+ this.$refs.designer.removeMenuItem("select")
+ this.$refs.designer.removeMenuItem("fc-editor")
+ this.$refs.designer.removeMenuItem("el-button")
+ this.$refs.designer.removeMenuItem("el-divider")
//閰嶇疆缁勪欢鐢熸垚瑙勫垯---鐩存帴閰嶇疆鏄剧ず鍦ㄩ〉闈笂
// const rule = [{ "type": "input", "field": "int", "title": "杈撳叆妗�", "info": "", "_fc_drag_tag": "input", "hidden": false, "display": true }]
// this.$refs.designer.setRule(rule)
},
methods: {
+ //闂嵎鍙戝竷
+ issueBtn() {
+ this.Frule = formCreate.parseJson(this.getFormJson())
+ this.Fopthion = formCreate.parseJson(this.getFormOption())
+ console.log(this.Frule)
+ //鍒ゆ柇鏄惁閰嶇疆浜嗚〃鍗�
+ if (this.Frule.length > 0) {
+ this.issueDialog = true
+ } else {
+ this.$message({
+ message: '璇烽厤缃〃鍗曞悗鍙戝竷',
+ type: 'warning'
+ });
+ }
+ },
//棰勮鐢熸垚鎸夐挳鐨勮緭鍑�
onSubmit(formData) {
console.log(formData)
@@ -101,12 +155,20 @@ export default {
const FcDesignerOptions = this.$refs.designer.getOption();
console.log(FcDesignerOptions)
return JSON.stringify(FcDesignerOptions)
+ },
+ issueFormBtn() {
+ console.log(this.issueForm)
}
}
}
</script>
<style lang="less" scoped>
+/deep/._fc-m-tools {
+ flex-direction: row-reverse;
+ justify-content: flex-start;
+}
+
/deep/._fc-l-title {
text-align: center;
margin-bottom: 10px;
diff --git a/attendance-performance-manager-ui/admin/src/views/feedback/questionnaire/list.vue b/attendance-performance-manager-ui/admin/src/views/feedback/questionnaire/list.vue
index 458665234cfe7c0132dbc791dc751b2f886ba144..e8733040fccf3355afde83f7f964639a01d60dd1 100644
--- a/attendance-performance-manager-ui/admin/src/views/feedback/questionnaire/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/feedback/questionnaire/list.vue
@@ -18,22 +18,65 @@
</div>
<div class="content">
- <div class="cLeft"></div>
+ <div class="cLeft">
+ <div class="title">
+ 鍏ㄩ儴鏁版嵁锛�220锛�
+ <span style="font-weight: 400; font-size: 16px;margin-left: 20px;">宸插弽棣堬紙1锛�</span>
+ <span style="font-weight: 400; font-size: 16px;margin-left: 20px;">鏈弽棣堬紙219锛�</span>
+ </div>
+ <el-button class="m15" type="primary" size="small">瀵煎嚭鏁版嵁</el-button>
+ <div class="lBox m15">
+ <div class="treeS">
+ <el-tree :data="treeData" :props="defaultProps" @node-click="treeSub"></el-tree>
+ </div>
+
+ <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
+ @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55">
+ </el-table-column>
+ <el-table-column label="鏃ユ湡" width="120">
+ <template slot-scope="scope">{{ scope.row.date }}</template>
+ </el-table-column>
+ <el-table-column prop="name" label="濮撳悕" width="120">
+ </el-table-column>
+ <el-table-column prop="address" label="鍦板潃" show-overflow-tooltip>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
<div class="cRight">
<div class="title">
棰樺瀷鏁版嵁鍒嗘瀽
</div>
- <div class="box">
- <div style="display: flex;align-items: center;">
- <el-tag type="primary" effect="plain">鍗曢」閫夋嫨</el-tag>
- <div style="margin-left: 10px;">1.浣犳槸鐢锋€ц繕鏄コ鎬�</div>
+ <div class="scroll">
+ <div class="box" v-for="i in 2">
+ <div style="display: flex;align-items: center;">
+ <el-tag type="primary" effect="plain">鍗曢」閫夋嫨</el-tag>
+ <div style="margin-left: 10px;">1.浣犳槸鐢锋€ц繕鏄コ鎬�</div>
+ </div>
+ <div class="m15"
+ style="display: flex;align-items: center;justify-content: space-around; width: 40%;">
+ <div style="text-align: center;">
+ <el-progress type="circle" :percentage="45" show-text width="75">鐢�</el-progress>
+ <div>鐢�</div>
+ </div>
+ <div style="text-align: center;">
+ <el-progress type="circle" :percentage="45" show-text width="75">鐢�</el-progress>
+ <div>濂�</div>
+ </div>
+ </div>
+
</div>
- <div>
- <el-progress type="circle" :percentage="45">鐢�</el-progress>
- <el-progress type="circle" :percentage="55">濂�</el-progress>
+ <div class="box m15" v-for="i in 4">
+ <div style="display: flex;align-items: center;">
+ <el-tag type="primary" effect="plain">鍗曢」閫夋嫨</el-tag>
+ <div style="margin-left: 10px;">1.浣犳槸鐢锋€ц繕鏄コ鎬�</div>
+ </div>
+ <el-button class="m15" type="primary" size="small"
+ @click="drawerAnswer = 1">鏌ョ湅璇︽儏绛旀</el-button>
</div>
-
</div>
+
</div>
</div>
@@ -51,6 +94,22 @@
</div>
</div>
</el-drawer>
+ <el-drawer :visible.sync="drawerAnswer" title="鍙嶉璇︽儏" size="40%">
+ <div class="answerBox">
+ <div class="aTop">
+ 闂锛氫綘鐨勫叿浣撴兂娉曪紵
+ </div>
+ <el-table class="m15" :data="tableData" border style="width: 100%;">
+ <el-table-column prop="date" label="鏃ユ湡" width="180">
+ </el-table-column>
+ <el-table-column prop="name" label="濮撳悕" width="180">
+ </el-table-column>
+ <el-table-column prop="address" label="鍦板潃">
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-drawer>
+
</div>
</template>
@@ -63,6 +122,63 @@ export default {
drawer: false,
Frule: '',
Fopthion: '',
+ drawerAnswer: false,
+ tableData: [{
+ date: '2016-05-02',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄€鍖洪噾娌欐睙璺� 1518 寮�'
+ }, {
+ date: '2016-05-04',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄€鍖洪噾娌欐睙璺� 1517 寮�'
+ }, {
+ date: '2016-05-01',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄€鍖洪噾娌欐睙璺� 1519 寮�'
+ }, {
+ date: '2016-05-03',
+ name: '鐜嬪皬铏�',
+ address: '涓婃捣甯傛櫘闄€鍖洪噾娌欐睙璺� 1516 寮�'
+ }],
+ treeData: [{
+ label: '涓€绾� 1',
+ children: [{
+ label: '浜岀骇 1-1',
+ children: [{
+ label: '涓夌骇 1-1-1'
+ }]
+ }]
+ }, {
+ label: '涓€绾� 2',
+ children: [{
+ label: '浜岀骇 2-1',
+ children: [{
+ label: '涓夌骇 2-1-1'
+ }]
+ }, {
+ label: '浜岀骇 2-2',
+ children: [{
+ label: '涓夌骇 2-2-1'
+ }]
+ }]
+ }, {
+ label: '涓€绾� 3',
+ children: [{
+ label: '浜岀骇 3-1',
+ children: [{
+ label: '涓夌骇 3-1-1'
+ }]
+ }, {
+ label: '浜岀骇 3-2',
+ children: [{
+ label: '涓夌骇 3-2-1'
+ }]
+ }]
+ }],
+ defaultProps: {
+ children: 'children',
+ label: 'label'
+ }
}
},
mounted() {
@@ -158,11 +274,32 @@ export default {
"resetBtn": false
}
+ },
+ methods: {
+ treeSub(data) {
+ console.log(data)
+ },
+ handleSelectionChange(val) {
+ this.multipleSelection = val;
+ }
}
}
</script>
<style lang="less" scoped>
+.treeS {
+ width: 20%;
+ margin-left: 10px;
+}
+
+/deep/.el-tree {
+ background-color: transparent;
+}
+
+.m15 {
+ margin-top: 15px;
+}
+
.font {
font-size: 16px;
line-height: 1.5;
@@ -240,6 +377,21 @@ export default {
}
}
+.answerBox {
+ padding: 0 20px;
+ box-sizing: border-box;
+
+ .aTop {
+ border-left: 4px solid #3377ff;
+ background-color: #eff4ff;
+ color: #3377ff;
+ line-height: 70px;
+ padding-left: 20px;
+ box-sizing: border-box;
+ font-weight: bold;
+ }
+}
+
.content {
display: flex;
align-items: center;
@@ -252,6 +404,15 @@ export default {
height: 100%;
border-radius: 4px;
width: 49%;
+ box-sizing: border-box;
+ padding: 20px;
+
+ .lBox {
+ display: flex;
+ // align-items: center
+ justify-content: space-between;
+
+ }
}
.cRight {
@@ -261,6 +422,32 @@ export default {
width: 49%;
box-sizing: border-box;
padding: 20px;
+
+ .scroll {
+ height: 93%;
+ overflow-y: auto;
+ overflow-x: hidden;
+ // border: 1px solid;
+ }
+
+ /* 渚ц竟婊氬姩鏉� */
+ .scroll::-webkit-scrollbar {
+ width: 3px;
+ }
+
+ /* 婊氬姩鏉′笂鐨勬粴鍔ㄦ粦鍧� */
+ .scroll::-webkit-scrollbar-thumb {
+ background: #CCCCCC;
+ border-radius: 4px;
+ }
+
+ /* 婊氬姩鏉¤建閬� */
+ .scroll::-webkit-scrollbar-track {
+ background: #EEEEEE;
+ border-radius: 4px;
+ }
+
+
}
.title {