修复bug

src/assets/css/reset.less

@@ -133,4 +133,14 @@ textarea{
 }
 .w-e-toolbar .w-e-menu:nth-of-type(21) {
 	display: none !important;
-}
+}
+.vl-notify.vl-notify-main{
+	background-color: rgba(0,0,0,.8) !important;
+	padding: 50px 150px;
+}
+.vl-notify.vl-notify-iframe .vl-notify-content{
+	background-color: #fff;
+}
+.vl-notify.vl-notify-alert h2.vl-notice-title .icon-remove{
+	font-size: 18px !important;
+}

src/components/main-top/index.vue

@@ -4,7 +4,7 @@
   <crumbs :data="crumb" />
   <div v-if="status" class="edit-status">{{`（${statusStr[status]}）`}}</div>
   <el-button v-if="questionBack"  type="primary" @click="backToQuestionList">返回</el-button>
-  <slot name='con'></slot>
+  <slot name='con' v-if="!questionBack"></slot>
 </div>
 </template>
 

src/pages/activity/activityList.vue

@@ -57,7 +57,7 @@
           </el-table-column>
           <el-table-column prop="userName" label="发布用户"></el-table-column>
           <el-table-column prop="createTime" label="发布时间"></el-table-column>
-          <el-table-column label="置顶">
+          <el-table-column label="置顶" v-if="0">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.isIndex" :active-value="1" :inactive-value="0"
@@ -71,13 +71,11 @@
             <template slot-scope="scope">
               <span
                 class="o-span"
-                v-if="$role == 'sys_admin' || $role == 'sys_high'"
                 @click="edit(scope.row, 'edit')"
                 >编辑</span
               >
               <span
                 class="o-span"
-                v-if="$role == 'sys_admin' || $role == 'sys_high'"
                 @click="del(scope.row)"
                 >删除</span
               >
@@ -151,7 +149,7 @@ export default {
           parent: this,
           data: { iframeData: item },
         },
-        area: ["80vw", "80vh"],
+        area: ["100vw", "100vh"],
         title: `${type === "add" ? "新增" : "编辑"}活动资讯`,
         maxmin: false,
         shade: false,

src/pages/collection/collectionList.vue

@@ -62,16 +62,13 @@
             <template slot-scope="scope">
               <span
                 class="o-span"
-                v-if="$role == 'sys_admin' || $role == 'sys_high'"
                 @click="edit(scope.row, 'edit')"
                 >编辑</span
               >
               <span
                 class="o-span"
                 v-if="
-                  scope.row.isIndex != '1' &&
-                  ($role == 'sys_admin' || $role == 'sys_high')
-                "
+                  scope.row.isIndex != '1'"
                 @click="del(scope.row)"
                 >删除</span
               >
@@ -147,7 +144,7 @@ export default {
           parent: this,
           data: { iframeData: item },
         },
-        area: ["80vw", "80vh"],
+        area: ["100vw", "100vh"],
         title: `${type === "add" ? "新增" : "编辑"}藏品信息`,
         maxmin: false,
         shade: false,

src/pages/collection/collectionSortList.vue

@@ -29,15 +29,11 @@
             <template slot-scope="scope">
               <span
                 class="o-span"
-                v-if="$role == 'sys_admin'"
                 @click="edit(scope.row, 'edit')"
                 >编辑</span
               >
               <span
                 class="o-span"
-                v-if="
-                  ($role == 'sys_admin')
-                "
                 @click="del(scope.row)"
                 >删除</span
               >
@@ -105,7 +101,7 @@ export default {
           parent: this,
           data: { iframeData: item },
         },
-        area: ["80vw", "80vh"],
+        area: ["100vw", "100vh"],
         title: `${type === "add" ? "新增" : "编辑"}藏品分类`,
         maxmin: false,
         shade: false,

src/pages/collection/collectionYearList.vue

@@ -29,15 +29,11 @@
             <template slot-scope="scope">
               <span
                 class="o-span"
-                v-if="$role == 'sys_admin'"
                 @click="edit(scope.row, 'edit')"
                 >编辑</span
               >
               <span
                 class="o-span"
-                v-if="
-                  ($role == 'sys_admin')
-                "
                 @click="del(scope.row)"
                 >删除</span
               >
@@ -105,7 +101,7 @@ export default {
           parent: this,
           data: { iframeData: item },
         },
-        area: ["80vw", "80vh"],
+        area: ["100vw", "100vh"],
         title: `${type === "add" ? "新增" : "编辑"}藏品年代`,
         maxmin: false,
         shade: false,

src/pages/content/Carousel.vue

@@ -54,8 +54,8 @@
           </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope" >
-                <span class="o-span" v-if="($role=='sys_admin'||$role=='sys_high')" @click="show(scope.row,'edit')">编辑</span>
-                <span class="o-span" v-if="($role=='sys_admin'||$role=='sys_high')" @click="del(scope.row)">删除</span>
+                <span class="o-span"  @click="show(scope.row,'edit')">编辑</span>
+                <span class="o-span"  @click="del(scope.row)">删除</span>
             </template>
           </el-table-column>
         </el-table>

src/pages/content/Collection.vue

@@ -64,7 +64,6 @@
                 v-model="scope.row[item.prop]"
                 v-if="item.prop === 'display'"
                 v-show="status === 4"
-                :disabled="!($role=='sys_admin'||$role=='sys_high')"
                 @change="changeState(scope.row)"
                 inactive-color="#ccc">
               </el-switch>
@@ -77,7 +76,7 @@
                   <i class="el-icon-picture-outline"></i>
                 </div>
               </el-image>
-              <el-input type="number" class="icenter" v-else-if="(item.prop === 'sort')&&($role=='sys_admin'||$role=='sys_high')" @blur="handleSort(scope.row)" v-model="scope.row[item.prop]"></el-input>
+              <el-input type="number" class="icenter" v-else-if="(item.prop === 'sort')" @blur="handleSort(scope.row)" v-model="scope.row[item.prop]"></el-input>
               <span v-else v-html="scope.row[item.prop]||'-'"></span>
             </template>
           </el-table-column>
@@ -86,7 +85,7 @@
               <template v-if="status !== 4">
                 <template v-if="scope.row.statusStr === '待审核'">
                   <span class="o-span" @click="goto(scope.row)" v-if="scope.row.statusStr === '待审核'">
-                    {{($role=='sys_admin'||$role=='sys_high') ? '审核':'查看'}}
+                    '审核'
                   </span>
                 </template>
                 <template v-else>
@@ -96,7 +95,7 @@
               </template>
               <template v-else>
                 <span class="o-span" @click="goto(scope.row)">查看</span>
-                <span class="o-span" v-if="(!scope.row.display)&&($role=='sys_admin'||$role=='sys_high')" @click="del(scope.row)">删除</span>
+                <span class="o-span" v-if="(!scope.row.display)" @click="del(scope.row)">删除</span>
               </template>
             </template>
           </el-table-column>

src/pages/content/Comment.vue

@@ -40,7 +40,6 @@
                 v-model="scope.row[item.prop]"
                 v-if="item.prop === 'display'"
                 @change="changeState(scope.row)"
-                :disabled="!($role=='sys_admin'||$role=='sys_high')"
                 inactive-color="#ccc">
               </el-switch>
               <span v-else v-html="scope.row[item.prop]||'-'"></span>
@@ -51,7 +50,7 @@
               <template></template>
               <span v-if="scope.row.qiyong === '注销'">已注销</span>
               <template v-else>
-                <span class="o-span" v-if="($role=='sys_admin'||$role=='sys_high')" @click="del(scope.row)">删除</span>
+                <span class="o-span"  @click="del(scope.row)">删除</span>
               </template>
             </template>
           </el-table-column>

src/pages/content/Spirit.vue

@@ -45,7 +45,6 @@
                 v-model="scope.row[item.prop]"
                 v-if="item.prop === 'display'"
                 @change="changeState(scope.row)"
-                :disabled="!($role=='sys_admin'||$role=='sys_high')"
                 inactive-color="#ccc">
               </el-switch>
               <el-image 
@@ -61,8 +60,8 @@
           </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope" >
-                <span class="o-span" v-if="($role=='sys_admin'||$role=='sys_high')" @click="show(scope.row,'edit')">编辑</span>
-                <span class="o-span" v-if="($role=='sys_admin'||$role=='sys_high')" @click="del(scope.row)">删除</span>
+                <span class="o-span"  @click="show(scope.row,'edit')">编辑</span>
+                <span class="o-span"  @click="del(scope.row)">删除</span>
             </template>
           </el-table-column>
         </el-table>

src/pages/content/sceneAudio.vue

@@ -75,13 +75,12 @@
             <template slot-scope="scope">
               <span
                 class="o-span"
-                v-if="$role == 'sys_admin' || $role == 'sys_high'"
                 @click="show(scope.row, 'edit')"
                 >编辑</span
               >
               <span
                 class="o-span"
-                v-if="scope.row.isIndex != '1' && ($role == 'sys_admin' || $role == 'sys_high')"
+                v-if="scope.row.isIndex != '1'"
                 @click="del(scope.row)"
                 >删除</span
               >

src/pages/edit/carousel.vue

@@ -36,7 +36,7 @@
           <el-form-item label="封面图片" prop="img">
             <el-upload
               class="avatar-uploader"
-              :class="{'noCursor':(($role=='sys_admin'||$role=='sys_high')&&(form.status===2||form.status===4))}"
+              :class="{'noCursor':((form.status===2||form.status===4))}"
               :action="uploadUrl"
               :headers="{
               token,
@@ -51,13 +51,13 @@
             </el-upload>
             <span
               style="color:#999"
-              v-if="!(($role=='sys_admin'||$role=='sys_high')&&(form.status===2||form.status===4))"
+              v-if="!((form.status===2||form.status===4))"
             >支持png、jpg、gif和jpeg的图片格式；最大支持20M。</span>
           </el-form-item>
         </el-form>
-        <el-form label-width="120px" v-if="$role=='sys_admin'||$role=='sys_high'">
+        <el-form label-width="120px">
           <el-form-item
-            v-if="($role=='sys_admin'||$role=='sys_high')&&(form.status===2||form.status===4)"
+            v-if="(form.status===2||form.status===4)"
             label="显示设置"
           >
             <el-switch
@@ -74,7 +74,7 @@
           <el-button type="primary" @click="save(2)">提交</el-button>
         </template>
         <template v-else>
-          <template v-if="$role=='sys_admin'||$role=='sys_high'">
+          <template>
             <el-button @click="dialogFormVisible = true">审核不通过</el-button>
             <el-button type="primary" @click="()=>{reason='',examine(4)}">审核通过</el-button>
           </template>

src/pages/exhibition/exhibitionList.vue

@@ -46,16 +46,13 @@
             <template slot-scope="scope">
               <span
                 class="o-span"
-                v-if="$role == 'sys_admin' || $role == 'sys_high'"
                 @click="edit(scope.row, 'edit')"
                 >编辑</span
               >
               <span
                 class="o-span"
                 v-if="
-                  scope.row.isIndex != '1' &&
-                  ($role == 'sys_admin' || $role == 'sys_high')
-                "
+                  scope.row.isIndex != '1'"
                 @click="del(scope.row)"
                 >删除</span
               >
@@ -127,7 +124,7 @@ export default {
           parent: this,
           data: { iframeData: item,type},
         },
-        area: ["80vw", "80vh"],
+        area: ["100vw", "100vh"],
         title: `${type === "add" ? "新增" : "编辑"}展览资讯`,
         maxmin: false,
         shade: false,

src/pages/home/rotation.vue

@@ -27,9 +27,9 @@
         </ul>
         <div class="desc">
           <p>
-            格式要求：支持png、jpg和jpeg的图片格式,<br>
-            单张最大支持10M，建议尺寸1920*1080<br>
-            数量：最多可上传5张图片。
+            上传须知：<br>
+            1、建议尺寸1920*1080<br>
+            2、最多可上传5张图片
           </p>
           
         </div>
@@ -92,7 +92,7 @@ export default {
           parent: this,
           data: { iframeData: item,type:type },
         },
-        area: ["80vw", "80vh"],
+        area: ["100vw", "100vh"],
         title: `${type === "add" ? "新增" : "编辑"}轮播图片`,
         maxmin: false,
         shade: false,

src/pages/layout/head.vue

@@ -63,7 +63,7 @@ export default {
   // 生命周期 - 挂载完成（可以访问DOM元素）
   mounted () {
     let userInfo = window.localStorage.getItem('userInfo') &&  JSON.parse(window.localStorage.getItem('userInfo')) || ''
-    this.userName = userInfo.nickName
+    this.userName = userInfo.userName
     this.head = userInfo.thumb
 
     

src/pages/news/bookList.vue

@@ -45,16 +45,13 @@
             <template slot-scope="scope">
               <span
                 class="o-span"
-                v-if="$role == 'sys_admin' || $role == 'sys_high'"
                 @click="edit(scope.row, 'edit')"
                 >编辑</span
               >
               <span
                 class="o-span"
                 v-if="
-                  scope.row.isIndex != '1' &&
-                  ($role == 'sys_admin' || $role == 'sys_high')
-                "
+                  scope.row.isIndex != '1'"
                 @click="del(scope.row)"
                 >删除</span
               >
@@ -127,7 +124,7 @@ export default {
           parent: this,
           data: { iframeData: item },
         },
-        area: ["80vw", "80vh"],
+        area: ["100vw", "100vh"],
         title: `${type === "add" ? "新增" : "编辑"}书籍内容`,
         maxmin: false,
         shade: false,

src/pages/news/newsList.vue

@@ -56,16 +56,13 @@
             <template slot-scope="scope">
               <span
                 class="o-span"
-                v-if="$role == 'sys_admin' || $role == 'sys_high'"
                 @click="edit(scope.row, 'edit')"
                 >编辑</span
               >
               <span
                 class="o-span"
                 v-if="
-                  scope.row.isIndex != '1' &&
-                  ($role == 'sys_admin' || $role == 'sys_high')
-                "
+                  scope.row.isIndex != '1'"
                 @click="del(scope.row)"
                 >删除</span
               >
@@ -154,7 +151,7 @@ export default {
           parent: this,
           data: { iframeData: item },
         },
-        area: ["80vw", "80vh"],
+        area: ["100vw", "100vh"],
         title: `${type === "add" ? "新增" : "编辑"}资讯内容`,
         maxmin: false,
         shade: false,

src/pages/questionnaire/questionnaireEdit.vue

@@ -17,7 +17,7 @@
           v-for="(item, index) in form.question"
           :key="index"
         >
-          <div class="close" @click="delSubject(item)">X</div>
+          <div class="close" @click="delSubject(item,index)">X</div>
           <div class="q-index">第{{ index + 1 }}题</div>
           <el-form-item label="题目:">
             <el-input v-model="item.question"></el-input>
@@ -130,16 +130,20 @@ export default {
         answer: [],
       });
     },
-    delSubject(item) {
+    delSubject(item,index) {
       this.$confirm("是否确认删除题目", "提示", {
         confirmButtonText: "是",
         cancelButtonText: "否",
         type: "warning",
       })
         .then(() => {
-          this.form.question = this.form.question.filter(
-            (e) => e.id != item.id
-          );
+          if(item.id){
+            this.form.question = this.form.question.filter(
+              (e) => e.id != item.id
+            );
+          } else  {
+            this.form.question.splice(index,1)
+          }
         })
         .catch(() => {
           this.$message({
@@ -180,6 +184,7 @@ export default {
       });
     },
     async save() {
+
       let questionData = this.form.question.map((item) => {
         let myAnswer = [];
         item.answer.map((answer) => {
@@ -187,6 +192,11 @@ export default {
         });
         return { ...item, answer: myAnswer };
       });
+      let temp =false
+      questionData.forEach((v,i)=>{
+        if(v.question.length>128) temp=true  
+      })
+      if(temp) return common.tip("error", '题目过长，不能超过128个字');
       questionData = { question: questionData };
       let questionResult = await this.$http({
         method: "post",

src/pages/questionnaire/questionnaireList.vue

@@ -62,7 +62,7 @@
               <span class="o-span" @click="show(scope.row)">查看</span>
               <span class="o-span" @click="edit(scope.row, 'edit')">编辑</span>
               <span class="o-span" @click="del(scope.row)">删除</span>
-              <span class="o-span" @click="setAsShow(scope.row)"
+              <span class="o-span" @click="setAsShow(scope.row)" v-if="scope.row.display===0"
                 >设置为展示</span
               >
             </template>
@@ -134,7 +134,7 @@ export default {
           parent: this,
           data: { iframeData: item,type },
         },
-        area: ["80vw", "80vh"],
+        area: ["100vw", "100vh"],
         title: `${type === "add" ? "新增" : "编辑"}问卷调查`,
         maxmin: false,
         shade: false,

src/pages/survey/surveyList.vue

@@ -18,7 +18,7 @@
               <el-form-item label="类别" prop="type">
                 <el-select v-model="form.type" placeholder="请选择类别">
                   <el-option label="本馆介绍" value="introduce"></el-option>
-                  <el-option label="历史革命" value="history"></el-option>
+                  <el-option label="历史沿革" value="history"></el-option>
                   <el-option label="机构职能" value="organ"></el-option>
                 </el-select>
               </el-form-item>

src/pages/system/User.vue

@@ -232,6 +232,7 @@ export default {
         ],
         unit: [{ required: true, message: "请输入单位名称", trigger: "blur" }],
         role: [{ required: true, message: "请选择角色", trigger: "blur" }],
+        phone:{ pattern: /^1[3-9]\d{9}$/, message: '请输入合法手机号', trigger: 'blur' }
       },
       status:1
     };