update1105

new_backstage/src/components/table/index.vue

@@ -39,7 +39,7 @@
         </template>
 
         <template v-else-if="item.prop === 'isEnabled'">
-          <span v-if="scope.row.roleKey">-</span>
+          <span v-if="scope.row.roleKey&&$route.name=='role'">-</span>
             <el-switch
             @change="(e)=>{handleDisableSwitch(e,scope.row)}"
             v-else
@@ -84,7 +84,7 @@
             <span v-if="(scope.row.status==2||scope.row.status==0) && activeSub['编辑']" class="o-span" @click="goto(scope.row)">编辑</span> 
 
              <!-- 草稿中且有删除权限 -->  
-            <span v-if="activeSub['删除']&&scope.row.status===0" :class="{disabletxt:scope.row.display}" class="o-span" @click="$emit('del',{item:scope.row,type})">删除</span>
+            <span v-if="activeSub['删除']" :class="{disabletxt:scope.row.display}" class="o-span" @click="$emit('del',{item:scope.row,type})">删除</span>
           </template>
 
           <span v-if="!activeSub['查看']&&!activeSub['提交']&&!activeSub['审核']&&!activeSub['编辑']&&!activeSub['删除']">-</span>

new_backstage/src/pages/content/sweep/componets/martyr.vue

@@ -10,10 +10,17 @@
           <el-input v-model="form.nativePlace" :maxlength="INPUTLENGTH" show-word-limit></el-input>
         </el-form-item>
 
-        <el-form-item label="出生日期：" prop="birthday">
-          <el-input v-model="form.birthday" :maxlength="INPUTLENGTH" show-word-limit></el-input>
+         <el-form-item label="出生日期：" prop="birthday">
+          <el-input v-model="form.birthday" class="fadeDom"></el-input>
+          <el-date-picker
+            v-model="form.birthday"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
         </el-form-item>
 
+
         <el-form-item label="牺牲地点：" prop="diePlace">
           <el-input v-model="form.diePlace" :maxlength="INPUTLENGTH" show-word-limit></el-input>
         </el-form-item>
@@ -46,7 +53,13 @@
         </el-form-item>
 
         <el-form-item label="牺牲日期：" prop="dieDay">
-          <el-input v-model="form.dieDay" :maxlength="INPUTLENGTH" show-word-limit></el-input>
+          <el-input v-model="form.dieDay" class="fadeDom"></el-input>
+          <el-date-picker
+            v-model="form.dieDay"
+            value-format="yyyy-MM-dd"
+            type="date"
+            placeholder="选择日期">
+          </el-date-picker>
         </el-form-item>
 
         <el-form-item label="照片：">

new_backstage/src/pages/layout/head.vue

@@ -6,7 +6,7 @@
     <span>中国人民武装警察部队新疆生产建设兵团总部</span>
   </div>
   <div class="header-user">
-    <div class="avatars" @click="isShowEdit=true,ran=Math.random()">
+    <div class="avatars" @click="handleAvatar">
       <img v-if="userInfo.img" :src="userInfo.img" alt="">
       <span>{{userInfo.nickName}}</span>
     </div>
@@ -29,7 +29,8 @@ export default {
       isShowEdit:false,
       ran:'',
       userId:'',
-      userInfo:{}
+      userInfo:{},
+      role: window.localStorage.getItem("role") == 'sys_admin'
     }
   },
   watch: {
@@ -38,6 +39,14 @@ export default {
     }
   },
   methods: {
+    handleAvatar(){
+
+      if (!this.role) {
+        return
+      }
+      this.isShowEdit=true
+      this.ran=Math.random()
+    },
     logoutcomfirm(){
       this.confirm('确定退出登录？',()=>{
         this.logout()

new_backstage/src/pages/system/user/edit.vue

@@ -98,7 +98,7 @@ export default {
           isEnabled:Number(this.form.isEnabled)
         }
         saveSys(this.val,params,()=>{
-          this.$alert('编辑成功', '提示', {
+          this.$alert(this.id=='none'?'新增成功（默认密码123456）':'编辑成功', '提示', {
               confirmButtonText: '确定',
               callback: () => {
                 this.backList()

new_backstage/src/pages/system/user/index.vue

@@ -141,10 +141,11 @@ export default {
       );
     },
     getList() {
-      let { inputKey,roleId } = this.search;
+      let { inputKey,roleId, date } = this.search;
       getSysList(
         this.type,
         {
+          date: date,
           pageNum: this.page.pageNum,
           pageSize: this.page.size,
           searchKey: inputKey,

new_backstage/src/pages/system/worklog/index.vue

@@ -24,7 +24,7 @@
               show-word-limit
               @keydown.enter.native="getList"
               v-model="search.inputKey"
-              placeholder="请输入角色名称"
+              placeholder="请输入真实姓名"
             ></el-input>
             <el-button @click="getList" type="primary">查询</el-button>
             <el-button

web/public/static/css/main.css

@@ -7051,3 +7051,7 @@ a.hasHover.tag-link:hover {
     transform:translate(20px, -50%);
 }    
 
+
+#model-title{
+    display: none!important;
+}

web/public/static/js/main_2020_show.js

@@ -8078,8 +8078,8 @@ window.loadMainJs = ()=>{
                 }, e)
                 //csz 用户引导界面
                 var helpData = {
-                    "pc":["./static/images/pc_step1.png","./static/images/pc_step2.png"],
-                    "mobile":["./static/images/phone_step1.png","./static/images/phone_step2.png"]
+                    "pc":["./static/images/pc_step1.png","./static/images/pc_step2.png","./static/images/pc_step3.png"],
+                    "mobile":["./static/images/phone_step1.png","./static/images/phone_step2.png","./static/images/phone_step3.png"]
                 }
                 var navIcon = $(".nav-icon .icon");
                 if(/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)) navIcon.attr("src",helpData.mobile[0]);

web/src/assets/theme/theme.less

@@ -141,7 +141,8 @@
 
       &.active {
         background: @backcolor;
-        color: @color;
+        color: #fff;
+        border: 1px solid @backcolor!important;
       }
     }
     .number {
@@ -162,7 +163,9 @@
         }
         &:hover {
           background: @backcolor;
-          color: @color;
+          color: #fff;
+          border: 1px solid @backcolor;
+
         }
       }
     }
@@ -360,7 +363,6 @@
     }
     &:hover,
     &.active {
-      color: @backcolor!important;
       &::before,
       &::after {
         content: "";
@@ -371,15 +373,15 @@
         transform: translateY(-50%);
         width: @wh;
         height: @wh;
-        border: 1px solid @backcolor!important;
+        border: 1px solid @color!important;
         border-radius: 50%;
-        background: @backcolor;
+        background: @color;
       }
       &::after {
         width: @wh*0.5;
         height: @wh*0.5;
         left: @wh * 0.25;
-        background: @color;
+        background: @backcolor;
       }
     }
   }

web/src/components/Danmaku.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="danmaku-area">
+  <div class="danmaku-area" @keydown.stop>
     <div
       class="danmaku-container"
       v-chat-scroll
@@ -17,9 +17,7 @@
       </transition-group>
     </div>
     <div class="input-container" v-if="!isMobile">
-      <span class="send-choices" @click.stop="toggleSelectMenu"
-        >请选择弹幕内发送吧~</span
-      >
+        <input @click.stop="toggleSelectMenu" v-model="danmu" type="text" placeholder="请选择弹幕内发送吧~" class="send-choices">
       <div class="send-btn-container">
         <img
           @click="hideList"
@@ -33,7 +31,7 @@
           :src="closeIcon || ''"
           v-if="!isShowList"
         />
-        <button class="send-btn primary">发送</button>
+        <button class="send-btn primary" @click="sendDanmakuSelf(danmu)">发送</button>
       </div>
       <ul class="show-list" v-show="isShowSelectList">
         <li
@@ -112,6 +110,7 @@ export default {
 
   data() {
     return {
+      danmu:'',
       showDanmakuData: [],
       isShowList: true,
       isShowSelectList: false,
@@ -139,6 +138,14 @@ export default {
       this.isShowSelectList = false;
       this.isNotInputAction = true;
     },
+    sendDanmakuSelf(text){
+      if (this.showDanmakuData.length <= this.limit) {
+        this.showDanmakuData.push(text);
+      }
+      this.isShowSelectList = false;
+      this.isNotInputAction = true;
+      this.danmu=''
+    },
     autoPopAnimation() {
       if (!this.isNotInputAction) {
         this.timer = setInterval(() => {
@@ -160,8 +167,9 @@ export default {
 };
 </script>
 
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
+
+<style lang="less" scoped>
+
 
 .danmaku-area {
   margin: 0;
@@ -228,13 +236,23 @@ export default {
   position: relative;
   padding: 10px;
 }
-.input-container span {
-  color: rgb(140, 140, 140);
-  cursor: pointer;
-  font-size: 14px;
-  height: 48px;
-  text-align: left;
-  line-height: 48px;
+.input-container  {
+  >span,>input{
+    cursor: pointer;
+    font-size: 14px;
+    height: 48px;
+    text-align: left;
+    line-height: 48px;
+    padding-left: 10px;
+    background:none;  
+    outline:none;  
+    border:none;
+    color: #fff;
+    &::placeholder{
+      color: rgb(140, 140, 140);
+    }
+  }
+
 }
 .input-container > * {
   cursor: pointer;

web/src/components/exhibition/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="parimaryExhibtion" :class="{daolanactive:isShow}">
     <div class="p-title">
-      <span>{{current.name}}</span>
+      <span>当前位置：{{current.name}}</span>
     </div>
     <div class="cad-con"></div>
     <ul class="exhi-list">

web/src/components/showCollection.vue

@@ -23,7 +23,7 @@
             ></iframe>
             <video
               ref="itemvideo"
-              controlslist="nodownload"
+              controlslist="nodownload noplaybackrate"
               :disablePictureInPicture="true"
               v-else
               controls
@@ -94,18 +94,21 @@
           </li>
         </ul>
       </div>
-      <img
-        class="vpagination left"
-        :src="require('@/assets/images/xinjiang/icon/left.png')"
-        @click="slide('slidePrev')"
-        alt=""
-      />
-      <img
-        class="vpagination right"
-        :src="require('@/assets/images/xinjiang/icon/right.png')"
-        @click="slide('slideNext')"
-        alt=""
-      />
+      <template v-if="item.file.length>1">
+        <img
+          class="vpagination left"
+          :src="require('@/assets/images/xinjiang/icon/left.png')"
+          @click="slide('slidePrev')"
+          alt=""
+        />
+        <img
+          class="vpagination right"
+          :src="require('@/assets/images/xinjiang/icon/right.png')"
+          @click="slide('slideNext')"
+          alt=""
+        />
+      </template>
+
     </div>
   </div>
 </template>

web/src/config/http.js

@@ -2,7 +2,7 @@ import axios from 'axios'
 
 var isProduction = process.env.NODE_ENV === 'production'
 
-const serverName = isProduction ? '/' : 'http://192.168.0.135:8003/'
+const serverName = isProduction ? '/' : 'http://192.168.0.245:8003/'
 
 const orginLink = window.location.origin
 

web/src/views/layout/header.vue

@@ -37,6 +37,7 @@
             </li>
           </ul>
         </div>
+        <a href="/backstage/index.html" target="_blank" class="backlink">后台管理</a>
       </div>
       <div class="line subBgColor"></div>
       <div class="r-bottom">
@@ -268,12 +269,12 @@ export default {
       padding: 8px 50px;
       font-size: 14px;
       .date {
-        margin-right: 96px;
+        margin-right: 56px;
       }
       .colors {
         position: relative;
         min-width: 80px;
-        margin-right: 10px;
+        margin-right: 36px;
         > span {
           padding-right: 20px;
           cursor: pointer;
@@ -337,6 +338,10 @@ export default {
           }
         }
       }
+      .backlink{
+        cursor: pointer;
+        color: #fff;
+      }
     }
 
     .r-bottom {

web/src/views/layout/index.vue

@@ -107,7 +107,7 @@ export default {
   color: #000;
   position: absolute;
   right: 30px;
-  top: 30px;
+  top: 0;
   width: 310px;
   background-color: rgba(255, 255, 255, 0.8);
   padding: 30px 20px;

web/src/views/martyr/index.vue

@@ -131,7 +131,6 @@ export default {
         margin: 0 auto;
         font-size: 0;
         position: relative;
-        border: 2px solid #d32424;
         &::before {
           content: "";
           width: 100%;
@@ -146,7 +145,6 @@ export default {
         }
         > img {
           width: 100%;
-          border: 6px solid #e4ad64;
         }
       }
       

web/src/views/message/Message.vue

@@ -44,10 +44,10 @@
               </div>
               <div class="body">
                 <span>{{item.content}}</span>
-                <div class="txtSameHover">
-                  <img class="xhidden" :src="require(`@/assets/images/xinjiang/content.png`)" alt="">
+                <div class="txtSameHover" @click="showComment(item,i)">
+                  <img  class="xhidden" :src="require(`@/assets/images/xinjiang/content.png`)" alt="">
                   <img class="xshow" :src="require(`@/assets/images/xinjiang/content_${theme}.png`)" alt="">
-                  <span @click="showComment(item,i)">评论</span>
+                  <span>评论</span>
                 </div>
               </div>
               <ul class="response-text" v-if="item.children">
@@ -191,6 +191,7 @@ export default {
             >textarea{
               width: 100%;
               line-height: 2;
+              color: #2d2d2d;
               font-size: 16px;
             }
             >span{

web/src/views/sacrifice/index.vue

@@ -7,7 +7,7 @@
       />
       <div class="info">
         <img :src="data.thumb" alt="" />
-        <p>{{ data.realName }}</p>
+        <p>{{ data.realName }}之墓</p>
         <div>
           <span>生于{{ data.birthday }}年</span>
           <span>卒于{{ data.dieDay }}年</span>

web/src/views/sacrifice/liuyan.vue

@@ -30,10 +30,10 @@
     </div>
 
     <div class="msglist">
-      <p class="primaryTxt">缅怀致敬</p>
+      <p>缅怀致敬</p>
       <ul>
         <li v-for="(item, i) in data" :key="i">
-          <div class="primaryTxt">
+          <div class="primaryColor">
             <span>{{ (item.isRealName?item.realName:item.nickName) }}</span>
             <span>{{ item.createTime }}</span>
           </div>
@@ -43,7 +43,7 @@
     </div>
 
     <div class="bottom">
-      已有<span class="primaryTxt">{{ data.length }}</span
+      已有<span class="primaryColor">{{ data.length }}</span
       >人完成祭拜
     </div>
   </div>

web/src/views/scene/components/comment/Message.vue

@@ -326,6 +326,7 @@ export default {
             font-size: 0;
             >textarea{
               line-height: 2;
+              color: #2d2d2d;
             }
             >span{
               display: inline-block;

web/src/views/scene/gui/menu.vue

@@ -87,7 +87,7 @@
                     !isGuide ? `_active_${theme}` : ''
                   }.png`)
                 "
-                title="navigation icon"
+                title="导览"
               />
             </div>
             <div
@@ -100,7 +100,7 @@
               <img
                 class="icon icon-inside"
                 :src="require('@/assets/images/btnlist/hotlist.png')"
-                title="navigation icon"
+                title="热点列表"
               />
             </div>
             <div
@@ -111,12 +111,12 @@
               <img
                 class="icon icon-inside"
                 :src="require('@/assets/images/btnlist/inside.png')"
-                title="navigation icon"
+                title="全景漫游"
               />
               <img
                 class="icon icon-inside active"
                 :src="require(`@/assets/images/btnlist/inside_active_${theme}.png`)"
-                title="navigation icon"
+                title="全景漫游"
               />
             </div>
             <div
@@ -127,12 +127,12 @@
               <img
                 class="icon icon-inside"
                 :src="require('@/assets/images/btnlist/dollhouse.png')"
-                title="navigation icon"
+                title="迷你模型"
               />
               <img
                 class="icon icon-inside active"
                 :src="require(`@/assets/images/btnlist/dollhouse_active_${theme}.png`)"
-                title="navigation icon "
+                title="迷你模型 "
               />
             </div>
             <div
@@ -144,12 +144,12 @@
               <img
                 class="icon icon-inside"
                 :src="require('@/assets/images/btnlist/floor.png')"
-                title="navigation icon"
+                title="俯视图"
               />
               <img
                 class="active icon icon-inside active"
                 :src="require(`@/assets/images/btnlist/floor_active_${theme}.png`)"
-                title="navigation icon"
+                title="俯视图"
               />
             </div>
             <div
@@ -162,7 +162,7 @@
               <img
                 class="icon icon-inside"
                 :src="require('@/assets/images/btnlist/VR.png')"
-                title="navigation icon"
+                title="VR"
               />
             </div>
             <div
@@ -175,7 +175,7 @@
               <img
                 class="icon icon-inside"
                 :src="require('@/assets/images/btnlist/face.jpg')"
-                title="navigation icon"
+                title="消除外壳"
               />
             </div>
           </div>

web/src/views/user/register.vue

@@ -38,7 +38,7 @@
           </li>
         </ul>
       </div>
-      <div class="button primarybtn" @click="comfirm">立即注册</div>
+      <div class="button primarybtn" @click="comfirm_fn">立即注册</div>
     </div>
   </div>
 </template>
@@ -150,7 +150,7 @@ export default {
     handleBlur(item) {
       item.showValidate = !item.val;
     },
-    async comfirm() {
+    async comfirm_fn() {
       let params = {};
       for (let i = 0; i < this.registerInfo.length; i++) {
         let item = this.registerInfo[i].arr;
@@ -190,8 +190,6 @@ export default {
           window.scrollTo(0, 0);
           this.$bus.$emit("showLogin", true);
         }, 1000);
-      } else {
-        alert(result.msg);
       }
     },
   },