第三次

src/api/data.js

@@ -10,7 +10,30 @@ export const getTableData = () => {
 export const getDragList = () => {
   return axios.request({
     url: 'get_drag_list',
-    method: 'get'
+    method: 'get' 
+  })
+}
+
+
+export const newsAdd = ({params}) => {
+  console.log(params)
+  return  axios.request({
+    url: 'news/add',
+    params,
+    method: 'post'
+  })
+}
+
+export const getInfoList = () => {
+  return axios.request({
+    url: 'newstype/list',
+    method: 'post'
+  })
+}
+export const getLabelList = () => {
+  return axios.request({
+    url: 'newstag/list',
+    method: 'post'
   })
 }
 

src/components/editor/editor.vue

@@ -54,7 +54,7 @@ export default {
     this.editor = new Editor(`#${this.editorId}`)
     this.editor.customConfig.onchange = (html) => {
       let text = this.editor.txt.text()
-      if (this.cache) localStorage.editorCache = html
+      // if (this.cache) localStorage.editorCache = html
       this.$emit('input', this.valueType === 'html' ? html : text)
       this.$emit('on-change', html, text)
     }
@@ -62,8 +62,8 @@ export default {
     // create这个方法一定要在所有配置项之后调用
     this.editor.create()
     // 如果本地有存储加载本地存储内容
-    let html = this.value || localStorage.editorCache
-    if (html) this.editor.txt.html(html)
+    // let html = this.value || localStorage.editorCache
+    // if (html) this.editor.txt.html(html)
   }
 }
 </script>

src/locale/lang/en-US.js

@@ -45,5 +45,6 @@ export default {
   tree_select_page: 'Tree Selector',
   organ:'分机构统计',
   organ_admin:'分机构管理',
-  organ_mon:'月报'
+  organ_mon:'月报',
+  test:"试题"
 }

src/locale/lang/zh-CN.js

@@ -45,5 +45,6 @@ export default {
   tree_select_page: '树状下拉选择器',
   organ:'分机构统计',
   organ_admin:'分机构管理',
-  organ_mon:'月报'
+  organ_mon:'月报',
+  test:"试题"
 }

src/locale/lang/zh-TW.js

@@ -45,5 +45,6 @@ export default {
   tree_select_page: '樹狀下拉選擇器',
   organ:'分机构统计',
   organ_admin:'分机构管理',
-  organ_mon:'月报'
+  organ_mon:'月报',
+  test:"试题"
 }

src/router/routers.js

@@ -72,6 +72,15 @@ export default [
           title: '月报'
         },
         component: () => import('@/view/organ_admin/info/info.vue')
+      },
+      {
+        path: 'test',
+        name: 'test',
+        meta: {
+          icon: 'ios-paper',
+          title: '试题'
+        },
+        component: () => import('@/view/organ_admin/test/test.vue')
       }
     ]
   }, 

src/store/module/user.js

@@ -18,6 +18,7 @@ export default {
     avatarImgPath: '',
     token: getToken(),
     access: '',
+    $userList:{},
     hasGetInfo: false,
     unreadCount: 0,
     messageUnreadList: [],
@@ -54,6 +55,9 @@ export default {
     setMessageReadedList (state, list) {
       state.messageReadedList = list
     },
+    set$userList (state, obj) {
+      state.$userList = obj
+    },
     setMessageTrashList (state, list) {
       state.messageTrashList = list
     },
@@ -81,11 +85,16 @@ export default {
           loginname,
           loginpwd
         }).then(res => {
-          const data = res.data.obj
+          // console.log(res.data)
+          const data = res.data.obj[0];
+          var { token,userid,edid,schoolid,createid }=res.data.obj[0];
+          var obj={token,userid,edid,schoolid,createid};
+          // console.log(obj)
           // console.log(data)
           commit('setToken', data.token)
           commit('setUserName', data.username)
           commit('setUserId', data.userid)
+          commit('set$userList', obj)
           resolve()
         }).catch(err => {
           reject(err)
@@ -98,6 +107,7 @@ export default {
         logout(state.token).then(() => {
           commit('setToken', '')
           commit('setAccess', [])
+          commit('set$userList', {})
           resolve()
         }).catch(err => {
           reject(err)

src/view/components/editor/editor.vue

@@ -18,7 +18,8 @@ export default {
   },
   methods: {
     handleChange (html, text) {
-      console.log(html)
+      var obj={html,text}
+      this.$emit('func',obj)
     }
   }
 }

src/view/organ_admin/info/info.less

@@ -1,7 +1,17 @@
 .istop{
     display: inline-block;
     width: 200px;
-   margin-left: 20px;
+    margin-left: 20px;
+    
+}
+.sort{
+    display: inline-block;
+    width: 167px;
+    .sort-div{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
 }
 div /deep/ .ivu-form-item{
     margin-bottom: 10px;
@@ -25,9 +35,29 @@ div /deep/ .ivu-form-item{
             display: flex;
             justify-content: center;
             align-items: center;
-            padding: 120px;
+            width: 300px;
+            height: 300px;
             border: 1px dashed #E9E9E9;
             border-radius: 6px;
+            overflow: hidden;
+            .video-div{
+                display: flex;
+                flex-direction: column;
+                justify-content: center;
+                align-items: center;
+                & img {
+                    width: 200px;
+                    height: 200px;
+                    border-radius: 10px;
+                }
+                & span {
+                    font-size: 16px;
+                }
+            }
+            .imgActive{
+                width: 100%;
+                max-height: 296px;
+            }
         }
     }
 }

src/view/organ_admin/info/info.vue

@@ -2,62 +2,92 @@
   <div>
     <Form label-position="left" :label-width="40">
         <FormItem label="标题">
-            <Input></Input>
+            <Input v-model="ntitle"></Input>
         </FormItem>
         <FormItem label="分类">
-          <Select v-model="select" style="width:180px">
-              <Option v-for="(item,index) in selectList" :value="item.id" :key="index">{{ item.title }}</Option>
+          <Select v-model="selectInfo" style="width:180px">
+              <Option v-for="(info,index) in infoList" :value="info.ntypeid" :key="index">{{ info.ntypename }}</Option>
           </Select>
           <div class="istop">
             <FormItem label="是否置顶"  :label-width="60">
               <RadioGroup v-model="radio">
-                  <Radio label="notop">不置顶</Radio>
-                  <Radio label="istop">置顶</Radio>
+                  <Radio label="0">不置顶</Radio>
+                  <Radio label="1">置顶</Radio>
               </RadioGroup>
             </FormItem>
           </div>
+          <!-- <span v-if="radio==1" class="sort">
+            <FormItem label="排序"  :label-width="40">
+              <Input v-model="sort">
+                <Button @click="sortcut"  slot="prepend">-</Button>
+                <Button @click="sortadd" slot="append">+</Button>
+              </Input>
+            </FormItem>
+          </span> -->
+          <div v-show="radio==1" class="sort">
+            <div class="sort-div">
+              <span>排序</span>
+              <Input v-model="sort" type="text" style="width:130px">
+                <Button @click="sortcut"  slot="prepend">-</Button>
+                <Button @click="sortadd" slot="append">+</Button>
+              </Input>
+            </div>
+          </div>
           <div class="istop">
             <FormItem label="是否广告位"  :label-width="80" inline>
               <RadioGroup v-model="poster">
-                  <Radio label="noPoster">否</Radio>
-                  <Radio label="isPoster">是</Radio>
+                  <Radio label="0">否</Radio>
+                  <Radio label="1">是</Radio>
               </RadioGroup>
             </FormItem>
           </div>
         </FormItem>
         <FormItem label="标签">
-            <Input  style="width:420px"></Input>
+            <!-- <Input  style="width:420px"></Input> -->
+          <Select v-model="selectLabel" multiple :max-tag-count="3" :max-tag-placeholder="maxTagPlaceholder" style="width:420px">
+              <Option v-for="(label,i) in labelList" :value="label.ntagname" :key="i">{{ label.ntagname }}</Option>
+          </Select>
         </FormItem>
     </Form>
     <div>
       <div>
         <div>咨讯内容</div>
-          <paste-editor></paste-editor>
+          <paste-editor @func="getObjFormSon"></paste-editor>
       </div>
     </div>
     <div class="upLoad">
       <div class="upLoad-div">
         <span>封面图<span class="upLoad-size">(建议图片尺寸:840 x 400)</span></span>
-        <Upload class="upLoad-border" :before-upload="handleUpload" action="//jsonplaceholder.typicode.com/posts/" >
+        <Upload  
+          :before-upload="handleImgUpload" 
+          action="//jsonplaceholder.typicode.com/posts/"
+          class="upLoad-border" >
             <div>
-              <Icon type="md-add" size="52" style="color: #3399ff"></Icon>
+              <img v-if="imgAcitve" :src="imgAcitve.result" class="imgActive">
+              <Icon v-else type="md-add" size="52" style="color: #3399ff"></Icon>
             </div>
         </Upload>
       </div>
       <div class="upLoad-div">
         <span>视频</span>
-        <Upload class="upLoad-border" action="//jsonplaceholder.typicode.com/posts/">
-            <div>
-              <Icon type="md-add" size="52" style="color: #3399ff"></Icon>
-            </div>
+        <Upload 
+          :before-upload="handleVideoUpload" 
+          :format="['mp4']"
+          action="//jsonplaceholder.typicode.com/posts/"
+          class="upLoad-border" >
+          <div v-if="videoName" class="video-div">
+            <img src="../../../assets/viedo.jpg">
+            <span>{{videoName}}</span>
+          </div>
+          <Icon v-else type="md-add" size="52" style="color: #3399ff"></Icon>
         </Upload>
       </div>
     </div>
-    <Button size="large" type="primary">完成</Button>
-    <img :src="logoPreview" alt="">
+    <Button size="large" @click="submit" type="primary">完成</Button>
   </div>
 </template>
 <script>
+import { getInfoList,getLabelList,newsAdd } from '@/api/data'
 import pasteEditor from "../../components/editor/editor.vue"
 export default {
   name: 'info',
@@ -66,28 +96,115 @@ export default {
   },
   data(){
     return {
-      selectList:[
-        {id:1,title:"时事"},
-        {id:2,title:"最新"},
-        {id:3,title:"国家"},
-        {id:4,title:"教育"}
-      ],
-      select:"",
-      radio:"notop",
-      poster:"noPoster",
-      logoPreview:''
+      infoList:[], // 分类列表
+      selectInfo:"", // 选中分类
+      labelList:[],  //标签列表
+      selectLabel: [],  // 选中标签
+      radio:"0",  // 是否置顶
+      poster:"0",  // 是否广告
+      sort:9999,  // 置顶排序
+      imgAcitve:'',  // 预览图片路径
+      videoAcitve:'',  // 选中视频信息
+      videoName:'',  // 选中视频名
+      ntitle:'',  // 标题
+      oldActiveImg:'',
+      objFormSon:{}
+    }
+  },
+  watch:{
+    selectLabel(){
+      this.selectLabel.toString()
     }
   },
+  created(){
+    // 获取分类列表
+    getInfoList().then(res=>{
+      if(res.status==200){
+        this.infoList=res.data.obj;
+      }
+    }),
+    // 获取标签列表
+    getLabelList().then(res=>{
+      if(res.status==200){
+        this.labelList=res.data.obj;
+      }
+    })
+  },
   methods:{
-    handleUpload(file){
-      this.file = file
+    getObjFormSon(data){
+      this.objFormSon = data
+      console.log(this.objFormSon)
+    },
+    // 提交咨讯添加
+    submit(){
+      var ntitle=this.ntitle;
+      var ntypeid=this.selectInfo;
+      var nistop=this.radio;
+      var norder=nistop==1?this.sort:'';
+      var ntagname="{"+this.selectLabel.toString()+"}";
+      var ncover=this.oldActiveImg.name;
+      var nvideo=this.videoAcitve.name;
+      var nvsize=this.videoAcitve.size;
+      var nvsuffix=this.videoAcitve.type;
+      var ncontent=this.objFormSon.html;
+      var ncontxt=this.objFormSon.text;
+      var {token,userid,edid,schoolid,createid}=this.$store.state.user.$userList;
+      var device="web"
+      // var {edid,schoolid,createid}=userList;
+      // console.log(edid,schoolid,createid)+
+
+      var params={device,userid,token,ntitle,ntypeid,nistop,norder,ntagname,ncover,nvideo,nvsize,nvsuffix,ncontent,ncontxt,edid,schoolid,createid};
+      console.log(params)
+      if(params){
+        newsAdd(params).then(res=>{
+          console.log(res.data)
+          if(res.status==200){
+            this.labelList=res.data.obj;
+          }
+        })
+      }
+      // console.log(ntitle,ntypeid,nistop,norder,ntagname,ncover,nvideo,nvsize,nvsuffix,ncontent,ncontxt,edid,schoolid,createid)
+    },
+    // 标签隐藏
+    maxTagPlaceholder (num) {
+      return 'more '+ num;
+    },
+    // 选中图片文件
+    handleImgUpload(file){
+      this.oldActiveImg = file
+      // console.log(this.oldActiveImg)
       const reader = new FileReader()
       reader.readAsDataURL(file)
         reader.onload = () => {
-          const _base64 = reader.result
-          this.logoPreview = _base64
+          const _base64 = reader;
+          this.imgAcitve = _base64;
         }
       return false;
+    },
+    // 选中视频文件
+    handleVideoUpload(file){
+      this.videoAcitve=file;
+      console.log(file)
+      this.videoName=file.name;
+      return false;
+    },
+    // 置顶排序 +
+    sortadd(){
+      var sort=this.sort+1;
+      if(sort<9999){
+        this.sort=sort;
+      }else{
+        this.sort=9999
+      }
+    },
+    // 置顶排序 -
+    sortcut(){
+      var sort=this.sort-1;
+      if(sort>1){
+        this.sort=sort;
+      }else{
+        this.sort=1;
+      }
     }
   }
 }

src/view/organ_admin/test/components/exercise/exercise.vue

@@ -0,0 +1,40 @@
+<template>
+  <div>
+    <div>
+      <span>题干：</span><input type="text" v-model="title">
+    </div>
+    <div>
+      <span>答案：</span><input type="text" v-model="key">
+    </div>
+    <Button @click="add">提交</Button>
+  </div>
+</template>
+<script>
+export default {
+  data(){
+    return {
+      title:"",
+      key:""
+    }
+  },
+  methods:{
+    add(){
+      var title=this.title;
+      if(!title){
+        this.$Message.warning('请输入题干内容');
+        return;
+      }
+      var key=this.key;
+      if(!key){
+        this.$Message.warning('请输入答案内容');
+        return;
+      }
+      var exercise={
+        title,
+        key
+      }
+      this.$emit('exercise',exercise);
+    }
+  }
+}
+</script>

src/view/organ_admin/test/components/gestalts/gestalts.less

@@ -0,0 +1,38 @@
+.radio-div{
+  display: flex;
+  justify-content: space-around;
+}
+.select-input{
+  width: 130px;
+}
+.radio-div-text{
+  display: flex;
+  margin-right: 10px;
+  .radio-text{
+    width: 168px;
+  }
+}
+.div-border{
+  padding: 4px 0;
+  border: 1px solid #ffffff;
+}
+.div-border:hover{
+  .select-fun{
+    display:inline-block;
+  }
+}
+.show-border{
+  border: 1px solid rgb(47, 128, 221);
+}
+.select-fun-hove{
+  display: inline-block;
+}
+.select-fun{
+  display: none;
+  & span{
+    background-color: rgb(47, 128, 221);
+    padding: 5px;
+    color: #ffffff;
+    border-radius: 2px;
+  }
+}

src/view/organ_admin/test/components/gestalts/gestalts.vue

@@ -0,0 +1,215 @@
+<template>
+  <div>
+    <!-- 题干内容 star -->
+    <div>
+      <span>题干：</span><input type="text" v-model="title">
+    </div>
+    <!-- 题干内容 end -->
+
+    <!-- 小题选项区域 star -->
+    <div v-for="(questions,index) in s_questions" :key="index" class="div-border" :class="{'show-border':!questions.show}">
+      <!-- 小题编号star -->
+      <span>({{index+1}})</span>
+      <!-- 小题编号end -->
+
+      <!-- 小题选项star -->
+      <RadioGroup v-model="questions.labelActive">
+        <div class="radio-div">
+          <div class="radio-div-text" v-for="(chart,i) in char" :key="i">
+            <div v-if="questions.show" class="radio-text">
+              <span>{{chart}}.</span>
+              <span>{{questions.obj[chart]}}</span>
+            </div>
+            <div v-else>
+              <!-- 单选标记star -->
+              <Radio :label="chart">{{chart}}.</Radio>
+              <!-- 单选标记end -->
+              <!-- <span>{{chart}}.</span> -->
+              <!-- 单选输入框star -->
+              <input type="text" class="select-input" v-model="questions.obj[chart]">
+              <!-- 单选输入框end -->
+            </div>
+          </div>
+        </div>
+      </RadioGroup>
+      <!-- 小题选项end -->
+      <div class="select-fun" :class="{'select-fun-hove':questions.show}">
+        <span  v-show="questions.show" @click="zIndexUp(index)">向上</span>
+        <span  v-show="questions.show" @click="zIndexDown(index)">向下</span>
+        <span  v-show="questions.show" @click="edit(index)">编辑</span>
+        <span v-show="!questions.show" @click="preserve(index)">保存</span>
+        <span @click="del(index)">删除</span>
+      </div>
+    </div>
+    <!-- 小题选项区域 end -->
+
+
+    <div>
+      <Button @click="addQuestions">添加小题</Button>
+    </div>
+      <Button @click="add">提交</Button>
+  </div>
+</template>
+<script>
+export default {
+  data(){
+    return {
+      title:"",  // 题干
+      char:["A","B","C","D"],  // 小题选项
+      s_questions:[],  // 小题选项列表
+      index:"",
+      clear:false
+    }
+  },
+  watch:{
+    clear(){
+      var modal=this.modal
+      console.log(modal)
+      if(this.modal==false){
+        localStorage.clear();
+      }
+    }
+  },
+  // 挂载结束后触发
+  mounted(){
+    var local=localStorage.getItem('gestList')
+    if(!local){
+      // 触发一行小题选项
+      var arr=[];
+      // 创建一个空对象
+      var obj={};
+      // 创建一个小题选项答案为空
+      var data={};
+      var show=false;
+      var labelActive="";
+      // 循环小题选项 this.char
+      for(var char in this.char){
+        obj[this.char[char]]=""
+      }
+      data={
+        obj,
+        labelActive,
+        show
+      }
+      this.s_questions.push(data);
+    }else{
+      console.log(999)
+      var questions=JSON.parse(local);
+      this.s_questions=questions.list.questions;
+      this.title=questions.list.title
+      console.log(this.s_questions)
+      this.index=questions.index
+    }
+  },
+  methods:{
+    // 首次加载
+    swapArray(arr, index1, index2) {
+      this.s_questions[index1] = this.s_questions.splice(index2, 1, arr[index1])[0];
+        return this.s_questions;
+    },
+    zIndexDown(index){
+      var arr=this.s_questions;
+      var length=this.s_questions.length;
+      if(index+1 != length){
+          arr=this.swapArray(arr, index, index+1);
+          this.s_questions=arr
+      }else{
+        this.$Message.warning('已经处于置底，无法下移');
+      }
+    },
+    zIndexUp(index){
+      var arr=this.s_questions;
+      var length=this.s_questions.length;
+      if(index!= 0){
+          arr=this.swapArray(arr, index, index-1);
+          this.s_questions=arr
+      }else{
+        this.$Message.warning('已经处于置顶，无法上移');
+      }
+    },
+    edit(i){
+      var questions=this.s_questions;
+      for(var list in questions){
+        if(questions[list].labelActive==""||questions[list].show==false){
+          this.$Message.warning('尚有小题未保存');
+          return; 
+        }
+      }
+      this.s_questions[i].show=false
+    },
+    preserve(i){
+      if(this.s_questions[i].labelActive==""){
+        this.$Message.warning('未选择正确项');
+        return;
+      }
+      this.s_questions[i].show=true
+    },
+    del(i){
+      this.s_questions.splice(i,1)
+    },
+    // 提交试题
+    add(){
+      var uid=this.index;
+      var title=this.title;
+      if(title==""){
+        this.$Message.warning('题干未填写');
+        return;
+      }
+      var questions=this.s_questions;
+      if(questions.length==0){
+        this.$Message.warning('小题未填写');
+        return;
+      }
+      for(var list in questions){
+        if(questions[list].labelActive==""||questions[list].show==false){
+          this.$Message.warning('尚有小题未保存');
+          return; 
+        }
+      }
+      var gestalts={
+        title,
+        questions,
+        uid
+      }
+      // console.log(gestalts)
+      this.$emit('gestalts',gestalts)
+    },
+    // 添加一行小题选项
+    addQuestions(){
+      // 创建一个空数组
+      var arr=[];
+      // 创建一个空对象
+      var obj={};
+      var show=false;
+      // 创建一个小题选项答案为空
+      var data={};
+      var labelActive="";
+      for(var label in this.s_questions){
+        // console.log(this.s_questions)
+        if(this.s_questions[label].labelActive==""||this.s_questions[label].show==false){
+          // console.log(1)
+          
+          this.$Message.warning('尚有小题未保存');
+          return;
+        }
+      }
+      // 循环小题选项 this.char
+      for(var char in this.char){
+        obj[this.char[char]]=""
+      }
+      data={
+        obj,
+        labelActive,
+        show
+      }
+      // arr.push(data)
+      this.s_questions.push(data);
+      // console.log(arr)
+      // console.log(this.s_questions)
+    }
+  }
+}
+</script>
+<style lang="less">
+  @import './gestalts';
+</style>

src/view/organ_admin/test/components/question/question.vue

@@ -0,0 +1,75 @@
+<template>
+  <div>
+    <!-- 题干 -->
+    <div>
+      <span>题干：</span><input v-model="title" type="text">
+    </div>
+    <!-- 题干结束 -->
+    <div>
+      <div v-for="(cont,index) in content" :key="index">
+        <span>{{char[index]}}</span>.<input v-model="charList[index]" type="text">
+      </div>
+      <Button @click="addContent">添加选项</Button>
+      <Button @click="delContent">删除选项</Button>
+    </div>
+    <div>
+      <RadioGroup v-model="labelActive">
+        <Radio v-for="(cont,index) in content" :key="index" :label="char[index]"></Radio>
+      </RadioGroup>
+    </div>
+    <div>
+      <Button @click="add">提交</Button>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data(){
+    return {
+      title:"",
+      char:["A","B","C","D","E","F","G","H","I","J","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"],
+      content:[0,1,2,3],
+      charList:[],
+      labelActive:""
+    }
+  },
+  methods:{
+    add(){
+      var title=this.title;
+      if(!title){
+        this.$Message.warning('请输入题干内容');
+        return;
+      }
+      var selectObj={}
+      for(var obj in this.content){
+        selectObj[this.char[obj]]=this.charList[obj]
+      }
+      var labelActive=this.labelActive;
+      if(!labelActive){
+        this.$Message.warning('请选择答案选项');
+        return;
+      }
+      var question={
+        title,
+        selectObj,
+        labelActive
+      };
+      this.$emit('question',question);
+      this.title="";
+      this.labelActive="";
+      this.charList=[];
+      this.content=[0,1,2,3]
+    },
+    addContent(){
+      this.content.push(this.content.length);
+    },
+    delContent(){
+      if(this.content.length>2){
+        this.content.pop()
+      }else{
+        this.$Message.warning('至少保留两个选项');
+      }
+    }
+  }
+}
+</script>

src/view/organ_admin/test/test.vue

@@ -0,0 +1,131 @@
+<template>
+  <div>
+    <Button @click="modal = true">添加试卷</Button>
+    <Modal
+        width="980"
+        v-model="modal"
+        title="试题上传"
+        @on-ok="ok"
+        @on-cancel="cancel">
+        <div>
+          <Select v-model="select" style="width:200px">
+            <Option v-for="item in cityList" :value="item.value" :key="item.value">{{ item.label }}</Option>
+          </Select>
+          <div>
+            <question @question="getquestion" v-if="select==1"></question>
+            <exercise @exercise="getexercise" v-if="select==2"></exercise>
+            <gestalts @gestalts="getGestalts" v-if="select==3"></gestalts>
+          </div>
+        </div>
+        <div slot="footer"></div>
+    </Modal>
+    <div v-show="getGestaltList.length>0">
+      一.单选题
+      <div v-for="(gest,i) in getGestaltList" :key="i">
+        <div @click="revise(i,gest)">
+          {{i+1}}.{{gest.title}}
+          <div v-for="(item,id) in gest.questions" :key="id">
+            ({{id+1}})
+            <div v-for="(obj,ip) in item.obj" :key="ip" class="erji">
+              <span>{{ip}}.</span><span>{{obj}}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import question from "./components/question/question.vue";
+import exercise from "./components/exercise/exercise.vue"
+import gestalts from "./components/gestalts/gestalts.vue"
+export default {
+  data () {
+    return {
+      modal: false,
+      select:'1',
+      cityList: [
+        {
+          value: '1',
+          label: '选择题'
+        },
+        {
+          value: '2',
+          label: '填空题'
+        },
+        {
+          value: '3',
+          label: '完形填空'
+        }
+      ],
+      // selectList:[],
+      getquestionList:[],
+      getexerciseList:[],
+      getGestaltList:[],
+      char:["A","B","C","D","E","F","G","H","I","J","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"]
+    }
+  },
+  components:{
+    question,
+    exercise,
+    gestalts
+  },
+  watch:{
+    modal(){
+      var modal=this.modal
+      if(this.modal==false){
+        localStorage.clear();
+      }
+    }
+  },
+  methods: {
+    revise(index,list){
+      // console.log(index,list)
+      var data={index,list};
+      var obj=JSON.stringify(data)
+      localStorage.setItem('gestList',obj)
+      var list = localStorage.getItem('gestList')
+      console.log(list)
+      var arr=JSON.parse(list)
+      console.log(arr)
+      this.modal=true;
+      this.select="3"
+    },
+    getquestion(data){
+      this.getquestionList.push(data);
+      console.log(data)
+      this.modal=false;
+      this.select="1"
+      localStorage.clear();
+    },
+    getexercise(data){
+      this.getexerciseList.push(data);
+      this.modal=false;
+      this.select="1"
+      localStorage.clear();
+    },
+    getGestalts(data){
+      this.getGestaltList.push(data);
+      console.log(this.getGestaltList)
+      this.modal=false;
+      this.select="1"
+      localStorage.clear();
+    },
+    ok () {
+      this.$Message.info('Clicked ok');
+    },
+    cancel () {
+      this.$Message.info('Clicked cancel');
+    }
+  }
+}
+</script>
+<style scoped>
+.yiji{
+  display: flex;
+  justify-content: flex-start;
+}
+.erji{
+  display: inline-block;
+}
+</style>