no message

src/directive/index.js

@@ -2,12 +2,10 @@ import hasRole from './permission/hasRole'
 import hasPermi from './permission/hasPermi'
 import copyText from './common/copyText'
 import loadMore from './common/loadMore'
-import hasUser from './permission/hasUser'
 
 export default function directive(app){
   app.directive('hasRole', hasRole)
   app.directive('hasPermi', hasPermi)
   app.directive('copyText', copyText)
   app.directive('loadMore', loadMore)
-  app.directive('hasUser', hasUser)
 }

src/directive/permission/hasUser.js

@@ -1,15 +0,0 @@
-import useUserStore from '@/store/modules/user'
-
-export default {
-  mounted(el, binding) {
-    const { value } = binding
-    const userId = useUserStore().userId
-    if(value){
-      if(value !== userId) {
-        el.parentNode && el.parentNode.removeChild(el)
-      }
-    }else{
-      throw new Error(`请设置角色权限Id`)
-    }
-  }
-}

src/views/content/class/index.vue

@@ -2,7 +2,8 @@
   <div class='app-container'>
     <el-form>
       <el-form-item>
-        <el-button type="primary" plain icon="Plus" @click="getDialog()" v-hasPermi="['content:class:add']">新增分类</el-button>
+        <el-button type="primary" plain icon="Plus" @click="getDialog()"
+          v-hasPermi="['content:class:add']">新增分类</el-button>
       </el-form-item>
     </el-form>
     <!-- 列表 -->
@@ -12,8 +13,10 @@
       <el-table-column label="创建时间" prop="createTime" align="center"></el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="scope">
-          <el-button type="primary" link @click="getDialog(scope.row.id)" v-hasUser="scope.row.userId">编辑</el-button>
-          <el-button type="danger" link @click="getDelete(scope.row)" v-hasUser="scope.row.userId">删除</el-button>
+          <el-button type="primary" link @click="getDialog(scope.row.id)"
+            v-hasPermi="['content:class:edit']">编辑</el-button>
+          <el-button type="danger" link @click="getDelete(scope.row)"
+            v-hasPermi="['content:class:delete']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/content/scene/detail.vue

@@ -4,7 +4,7 @@
       <el-form-item class="list" label="预设音频：" prop="takeId">
         <div v-if="data.form.takeId" class="file" @click="getDialog">
           <img src="@/assets/icons/svg/file.svg" width="70" height="70" />
-          <span>{{ data.form.takeName }}</span>
+          <span :title="data.form.takeName">{{ data.form.takeName }}</span>
         </div>
         <el-button v-else icon="Plus" @click="getDialog">新增</el-button>
       </el-form-item>
@@ -103,6 +103,8 @@ getBusiness()
 
 const { proxy } = getCurrentInstance();
 
+const { sys_change_status } = proxy.useDict("sys_change_status")
+
 // 遮罩层
 const loading = ref(false)
 
@@ -323,11 +325,18 @@ const getClose = () => {
   justify-content: center;
   align-items: center;
   box-shadow: 0 0 6px 0 #e9e9eb;
-  line-height: 10px;
   cursor: pointer;
 
   span {
-    margin-top: 20px;
+    width: 160px;
+    height: 40px;
+    line-height: 40px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    text-align: center;
+    margin-top: 25px;
+    padding: 0 10px;
   }
 }
 

src/views/content/scene/index.vue

@@ -222,6 +222,14 @@ function getRouter(query) {
         top: 15px;
         opacity: 0;
       }
+
+      span {
+        width: 80%;
+        text-align: center;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
     }
 
     .item:hover .close {

src/views/content/setting/detail.vue

@@ -233,6 +233,7 @@ const getPushTime = (e) => {
 const getAudioList = () => {
   if (proxy.$route.query.audioList) {
     var e = JSON.parse(proxy.$route.query.audioList)
+    console.log(e);
     data.form.audioList.push({
       audioId: e.id,
       audioName: e.name,
@@ -547,6 +548,8 @@ watch(() => audioData.form.type, (val) => {
     white-space: nowrap;
     text-overflow: ellipsis;
     text-align: center;
+    margin-top: 25px;
+    padding: 0 10px;
   }
 }
 

src/views/content/setting/index.vue

@@ -22,16 +22,16 @@
                 v-model="audioData.tableData" item-key="id" chosen-class="chosenClass" data-id="content"
                 :group="{ name: 'componentGroup', pull: 'clone', put: false }" :sort="false" @end="onEnd">
                 <template #item="{ element, index }">
-                  <div class="item">
+                  <div class="item" :style="{'width': activeName == 2 ? 'calc(100% / 3)' : '100%'}">
                     <span v-show="activeName !== 2" class="item_line" :title="element.name">
                       <el-icon style="margin-right: 10px; line-height:40px">
                         <VideoPlay />
                       </el-icon>
-                      {{ element.name }}
+                      <span>{{ element.name }}</span>
                     </span>
                     <span v-show="activeName === 2" class="item_box">
                       <img src="@/assets/icons/svg/file.svg" width="50" height="50" />
-                      <span class="takeName">{{ element.name }}</span>
+                      <span class="takeName" :title="element.name">{{ element.name }}</span>
                     </span>
                   </div>
                 </template>
@@ -125,9 +125,9 @@ function onEnd(params) {
     if (params.from.className !== params.to.className) {
       proxy.$modal.confirm(`是否要添加?`).then(() => {
         getRouter({ audioList: JSON.stringify(params.item.__draggable_context.element) })
-      }).catch(() => {})
+      }).catch(() => { })
     }
-  }else{
+  } else {
     proxy.$modal.msgError('暂无权限')
   }
 }
@@ -189,13 +189,22 @@ const chosenClass = () => {
         }
 
         .item_box {
+          width: 100%;
           display: flex;
           flex-direction: column;
-          justify-content: center;
           align-items: center;
           padding: 0px 10px;
           font-size: 14px;
           margin-bottom: 20px;
+
+          .takeName {
+            width: 100%;
+            text-align: center;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            margin-top: 15px;
+          }
         }
       }
     }

src/views/store/group/index.vue

@@ -11,8 +11,8 @@
       <el-table-column label="相关设备数量" prop="deviceNum" align="center"></el-table-column>
       <el-table-column label="操作" align="center">
         <template #default="scope">
-          <el-button type="primary" link @click="getDialog(scope.row.id)" v-hasUser="scope.row.userId">编辑</el-button>
-          <el-button type="danger" link @click="getDelete(scope.row)" v-hasUser="scope.row.userId">删除</el-button>
+          <el-button type="primary" link @click="getDialog(scope.row.id)" v-hasPermi="['store:group:edit']">编辑</el-button>
+          <el-button type="danger" link @click="getDelete(scope.row)" v-hasPermi="['store:group:delete']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/store/list/index.vue

@@ -66,7 +66,7 @@
         <el-form-item label="门店编码：" prop="code">
           <el-input v-model="data.dialogForm.code" placeholder="请输入门店编码" />
         </el-form-item>
-        <el-form-item label="所属账号：" prop="userId">
+        <el-form-item label="所属账号：">
           <el-select v-model="data.dialogForm.userId" placeholder="请选择所属账号" filterable remote
             :remote-method="userRemote" remote-show-suffix>
             <el-option v-for="item in userData.options" :key="item.userId" :value="item.userId"
@@ -156,9 +156,6 @@ const data = reactive({
     code: [{
       required: true, message: '请输入门店编码', trigger: 'blur'
     }],
-    userId: [{
-      required: true, message: '请选择所属账号', trigger: 'change'
-    }],
     tenantId: [{
       required: true, message: '请选择所属企业', trigger: 'change'
     }],