Merge branch 'master' of http://face3d.4dage.com:7005/chenzhiguang/guangdongVR_museum

backstage/src/components/editcomponent/usereditdialog.vue

@@ -103,6 +103,7 @@ let rule = {
 };
 
 export default {
+
   props: {
     id: {
       type: String || Number,

backstage/src/components/table/index.vue

@@ -35,6 +35,7 @@
           <template v-else-if="item.prop === 'isEnabled'">
               <span v-if="scope.row.roleKey && scope.row.roleKey != 'sys_visitor' && ($route.name == 'role' || $route.name == 'user')">-</span>
               <el-switch
+                :disabled='scope.row.isAdmin===1'
                 @change="
                   (e) => {
                     handleDisableSwitch(e, scope.row);

backstage/src/pages/content/collection/componets/audio.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="width:50%;">
     <el-form-item label="藏品名称：" prop="name">
-      <el-input class="goodNameInput" v-model="form.name" :maxlength="30" show-word-limit></el-input>
+      <el-input class="goodNameInput" v-model="form.name" :maxlength="80" show-word-limit></el-input>
     </el-form-item>
 
     <el-form-item label="藏品类型：">

backstage/src/pages/content/collection/componets/img.vue

@@ -4,7 +4,7 @@
       <el-input
        class="goodNameInput"
         v-model="form.name"
-        :maxlength="30"
+        :maxlength="80"
         show-word-limit
       ></el-input>
     </el-form-item>

backstage/src/pages/content/collection/componets/model.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="width:50%;">
     <el-form-item label="藏品名称：" prop="name">
-      <el-input class="goodNameInput" v-model="form.name" :maxlength="30" show-word-limit></el-input>
+      <el-input class="goodNameInput" v-model="form.name" :maxlength="80" show-word-limit></el-input>
     </el-form-item>
 
     <el-form-item label="藏品类型：">

backstage/src/pages/content/collection/componets/video.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="width:50%;">
     <el-form-item label="藏品名称：" prop="name">
-      <el-input class="goodNameInput" v-model="form.name" :maxlength="30" show-word-limit></el-input>
+      <el-input class="goodNameInput" v-model="form.name" :maxlength="80" show-word-limit></el-input>
     </el-form-item>
 
     <el-form-item label="藏品类型：">

backstage/src/pages/content/collection/edit.vue

@@ -95,6 +95,7 @@ export default {
     this.getMuseumAllList();
 
     getDictListAll("age", (data) => {
+      console.log('------------',data.data);
       this.ageListAll = data.data;
     });
     getDictListAll("texture", (data) => {

backstage/src/pages/system/role/index.vue

@@ -123,7 +123,9 @@ export default {
           searchKey: inputKey,
         },
         (data) => {
-          this.list = data.data;
+          let temp = data.data
+          temp.records =temp.records.filter(v=>v.roleKey!=='sys_visitor')
+          this.list = temp;
         }
       );
     },

backstage/src/pages/system/user/componets/manage.vue

@@ -3,44 +3,80 @@
     <div class="formtop">
       <div class="left">
         <el-form-item label="账号：" prop="userName">
-          <el-input :disabled="id!='none'" :maxlength="INPUTLENGTH" show-word-limit v-model="form.userName"></el-input>
+          <el-input
+            :disabled="id != 'none'"
+            :maxlength="INPUTLENGTH"
+            show-word-limit
+            v-model="form.userName"
+          ></el-input>
         </el-form-item>
 
         <el-form-item label="用户昵称：" prop="nickName">
-          <el-input v-model="form.nickName" :maxlength="INPUTLENGTH" show-word-limit></el-input>
+          <el-input
+            v-model="form.nickName"
+            :maxlength="INPUTLENGTH"
+            show-word-limit
+          ></el-input>
         </el-form-item>
 
         <el-form-item label="单位名称：" prop="unit">
-          <el-input v-model="form.unit" :maxlength="INPUTLENGTH*5" show-word-limit></el-input>
+          <el-input
+            v-model="form.unit"
+            :maxlength="INPUTLENGTH * 5"
+            show-word-limit
+          ></el-input>
         </el-form-item>
 
         <el-form-item label="联系电话：" prop="phone">
-          <el-input :maxlength="INPUTLENGTH" show-word-limit v-model="form.phone"></el-input>
+          <el-input
+            :maxlength="INPUTLENGTH"
+            show-word-limit
+            v-model="form.phone"
+          ></el-input>
         </el-form-item>
 
-        <el-form-item label="是否启用：" v-if="form.roleKey!='sys_admin'">
-          <el-switch v-model="form.isEnabled" > </el-switch>
+        <el-form-item label="是否启用：" v-if="form.roleKey != 'sys_admin'">
+          <el-switch v-model="form.isEnabled"> </el-switch>
         </el-form-item>
       </div>
       <div class="right">
         <el-form-item label="用户角色：" prop="roleId">
-          <el-input v-model="form.roleId" class="fadeDom"></el-input>
-          <el-select v-model="form.roleId" placeholder="请选择" style="width:100%">
+          <el-input
+            v-model="form.roleName"
+            disabled
+            v-if="form.isAdmin === 1"
+          ></el-input>
+
+          <el-select
+            v-model="form.roleId"
+            placeholder="请选择"
+            style="width: 100%"
+            v-else
+          >
             <el-option
               v-for="item in roleList"
               :key="item.id"
               :label="item.roleName"
-              :value="item.id">
+              :value="item.id"
+            >
             </el-option>
           </el-select>
         </el-form-item>
 
         <el-form-item label="真实姓名：" prop="realName">
-          <el-input v-model="form.realName" :maxlength="INPUTLENGTH" show-word-limit></el-input>
+          <el-input
+            v-model="form.realName"
+            :maxlength="INPUTLENGTH"
+            show-word-limit
+          ></el-input>
         </el-form-item>
 
         <el-form-item label="通讯地址：" prop="address">
-          <el-input v-model="form.address" :maxlength="INPUTLENGTH*5" show-word-limit></el-input>
+          <el-input
+            v-model="form.address"
+            :maxlength="INPUTLENGTH * 5"
+            show-word-limit
+          ></el-input>
         </el-form-item>
 
         <el-form-item label="性别：" prop="sex">
@@ -49,69 +85,68 @@
             <el-radio :label="1">女</el-radio>
           </el-radio-group>
         </el-form-item>
-        
       </div>
     </div>
 
-    <div class="formbom" v-if="id!='none'">
-        <el-form-item>
-          <el-button @click="resetPass" type="primary" class="reset" size="mini">重置密码</el-button>
-        </el-form-item>
+    <div class="formbom" v-if="id != 'none'">
+      <el-form-item>
+        <el-button @click="resetPass" type="primary" class="reset" size="mini"
+          >重置密码</el-button
+        >
+      </el-form-item>
     </div>
-  
   </div>
 </template>
 
 <script>
-
-import {resetPass} from "@/configue/api";
-
+import { resetPass } from "@/configue/api";
 
 export default {
-  props: ["data", "rule","roleList"],
+  name: "userEdit",
+  props: ["data", "rule", "roleList"],
   data() {
     return {
-      id:this.$route.params.id,
+      id: this.$route.params.id,
       form: this.data,
       radio: "选中且禁用",
       thumbUrl: this.$serverName + "cms/goods/upload/thumb",
       fileUrl: this.$serverName + "cms/goods/upload/model",
     };
   },
-  methods:{
-    resetPass(){
+  methods: {
+    resetPass() {
       this.confirm("该操作将重置此用户密码，是否继续？", () => {
-        resetPass({id:this.id},()=>{
+        resetPass({ id: this.id }, () => {
           this.$alert("重置成功（默认密码123456）", "提示", {
-              confirmButtonText: "确定",
-              callback: () => {
-                window.reload()
-              },
-            });
-        })
+            confirmButtonText: "确定",
+            callback: () => {
+              window.reload();
+            },
+          });
+        });
       });
-      
-    }
-  }
+    },
+  },
 };
 </script>
 
 <style lang="less" scoped>
 .formcon {
   width: 100%;
-  .formtop,.formbom{
+  .formtop,
+  .formbom {
     width: 100%;
     display: flex;
     justify-content: flex-start;
     position: relative;
-    >div{
+    > div {
       width: 40%;
-      &:first-of-type{
+      &:first-of-type {
         margin-right: 5%;
       }
     }
   }
-  .formbom{
+  .formbom {
     align-items: center;
   }
 }