问题处理

src/layout/components/Navbar.vue

@@ -25,7 +25,7 @@
         </div>
 
         <el-tooltip content="打开数据大屏" effect="dark" placement="bottom">
-          <div class="right-menu-item hover-effect" @click="gotoDatav">数据大屏</div>
+          <div class="right-menu-item hover-effect" @click="gotoDatav">返回首页</div>
         </el-tooltip>
 
         <!-- <el-tooltip v-if="showNotice" :content="playNotice?'通知公告':'打开声音权限，新消息可以播放提示音'" effect="dark" placement="bottom">
@@ -208,7 +208,10 @@ export default {
     },
     // 跳转到大屏
     gotoDatav() {
-        window.open(location.protocol + '//' + window.location.host + '/datav/index.html', '_self')
+        // window.open(location.protocol + '//' + window.location.host + '/datav/index.html', '_self')
+        // window.open('http://192.168.3.226:8057/datav/index.html', '_self')
+        this.$router.push('/login4Index')
+
       // if (this.user.enterpriseId === 0) { // 应急局用户
       //   window.open(location.protocol + '//' + window.location.host + '/datav/index.html', '_self')
       // } else { // 企业用户

src/views/home4Index.vue

 <template>
   <div class="login" :style="'background-image:url(' + Background + ');'">
-    <div class="topTitle">中和地信有限公司欢迎您！</div>
+    <div class="topTitle" >
+      <div class="floating-text">
+        中和地信有限公司欢迎您！
+      </div> 
+    </div>
     <div class="bottomTitle">@中和地信有限公司</div>
     <div class="wrapper">
       <div class="header">
@@ -82,8 +86,8 @@ export default {
 
       }else if(type === "应急管理"){
         // this.$router.push({ path: "home4Center" });
-        this.$router.push({ path: "/user/center" });
-
+        // this.$router.push({ path: "/user/center" });
+        location.href = 'http://192.168.3.226:8057/datav/index.html'
       }else if(type === "自然资源"){
         // location.href = process.env.NODE_ENV + ''
         location.href = 'http://192.168.3.226:8057/datav/natural.html'
@@ -100,6 +104,31 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
+
+
+
+@keyframes floatShadow {
+  0% {
+  transform:translateX(1300px);
+  display:block;
+  }
+  100% {
+  transform:translateX(-1300px);
+  display:none;
+  }
+}
+  
+.floating-text {
+  font-size:18px;line-height:1;
+  color: #FDD756;text-shadow: 0 0 5px #fff;
+  animation: floatShadow;
+  animation-name:floatShadow;
+  animation-duration: 20s;
+  animation-iteration-count: infinite;
+  animation-timing-function:linear;
+  position:absolute;top:8px;
+}
+
 .topTitle {
   position: absolute;
   top: 0;

src/views/system/role/index.vue

@@ -25,7 +25,20 @@
         <el-form-item label="角色名称" prop="name">
           <el-input v-model="form.name" style="width: 380px;" />
         </el-form-item>
-        <el-form-item v-if="form.dataScope === '自定义'" label="数据权限" prop="depts">
+        <el-form-item label="角色级别" prop="level">
+          <el-input-number v-model.number="form.level" :min="1" controls-position="right" style="width: 145px;" />
+        </el-form-item>
+        <el-form-item label="数据范围" prop="dataScope">
+          <el-select v-model="form.dataScope" style="width: 140px" placeholder="请选择数据范围" @change="changeScope">
+            <el-option
+              v-for="item in dateScopes"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item v-if="form.dataScope === '自定义'" label="数据权限" prop="depts">
           <treeselect
             v-model="deptDatas"
             :load-options="loadDepts"
@@ -34,7 +47,7 @@
             style="width: 380px"
             placeholder="请选择"
           />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="描述信息" prop="description">
           <el-input v-model="form.description" style="width: 380px;" rows="5" type="textarea" />
         </el-form-item>
@@ -54,6 +67,7 @@
           <el-table ref="table" v-loading="crud.loading" highlight-current-row style="width: 100%;" :data="crud.data" @selection-change="crud.selectionChangeHandler" @current-change="handleCurrentChange">
             <el-table-column :selectable="checkboxT" type="selection" width="55" />
             <el-table-column prop="name" label="名称" />
+            <el-table-column label="权限等级" prop="level" />
             <el-table-column :show-overflow-tooltip="true" prop="description" label="描述" />
             <el-table-column :show-overflow-tooltip="true" width="135px" prop="createTime" label="创建日期" />
             <el-table-column v-if="checkPer(['admin','roles:edit','roles:del'])" label="操作" width="130px" align="center" fixed="right">
@@ -132,6 +146,7 @@ export default {
   mixins: [presenter(), header(), form(defaultForm), crud()],
   data() {
     return {
+      dateScopes: ["本级", "全部"],
       defaultProps: { children: 'children', label: 'label', isLeaf: 'leaf' },
       level: 3,
       currentId: 0, currentName: '', menuLoading: false, showButton: false,
@@ -194,8 +209,8 @@ export default {
     },
     // 提交前做的操作
     [CRUD.HOOK.afterValidateCU](crud) {
-      crud.form.dataScope = '全部'
-      crud.form.depts = []
+      // crud.form.dataScope = '全部'
+      // crud.form.depts = []
       return true
     },
     // 触发单选