fanghuisheng 3 éve
szülő
commit
9f77c39c4e

+ 2 - 0
README.md

@@ -4,4 +4,6 @@ imagemin-gifsicle 图片压缩包
 
 @vue/compiler-sfc 源码阅读 安装命令 npm install @vue/compiler-sfc@^3.0.5 --save-dev
 
+default-passive-events 安装命令 npm install default-passive-events@^2.0.0
+
 安装依赖 

+ 0 - 1
package.json

@@ -20,7 +20,6 @@
     "clipboard": "^2.0.6",
     "core-js": "^3.8.3",
     "dayjs": "^1.10.4",
-    "default-passive-events": "^2.0.0",
     "echarts": "^5.2.1",
     "element-plus": "^1.1.0-beta.20",
     "js-cookie": "^3.0.0-rc.1",

+ 4 - 0
src/App.vue

@@ -13,10 +13,14 @@ export default defineComponent({
     watchEffect((fn, options) => {
       fn, options
       if (!hasToken) {
+        store.commit('getMiddleConfig') //中间页主体页面配置
         // router.push({
         //   path: '/login',
         // })
       }
+      if (hasToken) {
+        store.commit('publicSiteList') //获取站点下拉信息
+      }
     })
     return {
       store,

+ 1 - 1
src/config/default/setting.config.js

@@ -10,7 +10,7 @@ const setting = {
     //放置生成的静态资源 (js、css、img、fonts) 的 (相对于 outputDir 的) 目录。
     assetsDir: 'static',
     //开发环境每次保存时是否输出为eslint编译警告
-    lintOnSave: true,
+    lintOnSave: false,
     //进行编译的依赖
     transpileDependencies: ['vue-echarts', 'resize-detector'],
     //默认的接口地址 如果是开发环境和生产环境走vab-mock-server,当然你也可以选择自己配置成需要的接口地址

+ 1 - 1
src/layout/vab-tabs/index.vue

@@ -70,7 +70,7 @@
         <el-select
           v-model="this.$store.state.siteId"
           class="m-2"
-          placeholder="Select"
+          placeholder="请选择"
           size="large"
           style="width: 280px; margin-top: 7.5px"
           clearable

+ 3 - 11
src/main.js

@@ -68,19 +68,11 @@ app
  * @需添加路由拦截 --登录后执行
  */
 
-
 router.beforeEach((to) => {
     if (to.path != '/login') {
-        store.commit("publicSiteList");
-        store.commit('publicDeviceList')
-
-        console.log(to.meta.title)
-        store.commit('getAuthorities', to.meta.title)
-        store.commit('getMiddleConfig')
-
-        // console.log('store.state.authorities')
-        // console.log(store.state.authorities)
-
+        store.commit('publicDeviceList')//公共左侧树状设备
+        store.commit('getAuthorities', to.meta.title)//公共按钮权限
+        
         // next()
     }
     // if (to.path == '/home') {

+ 0 - 1
src/store/index.js

@@ -195,7 +195,6 @@ export default createStore({
          * @param {*} val 
          */
         getLabelIcon(state) {
-            console.log(state.labelIcon)
             getLabelIcon(state.labelIcon)
         },
 

+ 5 - 1
src/views/index/components/VersionInformation.vue

@@ -83,7 +83,11 @@
                       'font-weight': 800,
                     }"
                   >
-                    {{ item.textValue }}
+                    {{
+                      item.textValue === null || item.textValue === ''
+                        ? '暂无数据'
+                        : item.textValue
+                    }}
                   </div>
                 </div>
               </div>

+ 2 - 2
src/views/index/components/componentModel/iconText.vue

@@ -66,7 +66,7 @@
                 </div>
                 <div class="ant-col ant-legacy-form-item-control-wrapper">
                   <el-select
-                    v-model="dataTypeValue"
+                    v-model="editModelList.dataType"
                     filterable
                     placeholder="Select"
                   >
@@ -88,7 +88,7 @@
                 <div class="ant-col ant-legacy-form-item-control-wrapper">
                   <div class="ant-legacy-form-item-control">
                     <el-select
-                      v-model="dataValue"
+                      v-model="editModelList.dataValue"
                       filterable
                       placeholder="Select"
                     >

+ 3 - 3
src/views/perCenter/index.vue

@@ -372,13 +372,13 @@ export default defineComponent({
   // width: 480px;
 }
 
-:deep .el-card__body {
+:deep(.el-card__body) {
   padding: 15px;
 }
-:deep .el-card__header {
+:deep(.el-card__header) {
   padding: 14px 15px 7px !important;
 }
-:deep .item {
+:deep(.item) {
   padding: 11px 0;
   border-bottom: 1px solid #e7eaec;
   margin: 0;

+ 3 - 3
src/views/tenantManage/systemConfig/dialogComponent.vue

@@ -747,11 +747,11 @@ export default defineComponent({
 .el-card.is-always-shadow {
   box-shadow: none;
 }
-:deep .el-card__body {
+:deep(.el-card__body) {
   padding: 0 !important;
 }
 
-:deep .el-tabs__header {
+:deep(.el-tabs__header) {
   margin-bottom: 30px;
 }
 .el-input,
@@ -779,7 +779,7 @@ export default defineComponent({
   margin-left: 10px;
   display: inline-block;
 }
-:deep .el-upload-list__item {
+:deep(.el-upload-list__item) {
   width: 100px !important;
 }