DESKTOP-SVI9JE1\muzen 1 år sedan
förälder
incheckning
5c727d44c4

+ 1 - 1
src/components/GanttChart/index.vue

@@ -235,7 +235,7 @@ const getDelete = (row) => {
 }
 
 watch(() => businessData.options, (val) => {
-  if (val) {
+  if (val.length > 0) {
     organizationIds.value = val[0].id
   }
 })

+ 5 - 5
src/router/index.js

@@ -48,11 +48,6 @@ export const constantRoutes = [
     hidden: true,
   },
   {
-    path: "/wifi",
-    component: () => import("@/views/wifi"),
-    hidden: true
-  },
-  {
     path: "/:pathMatch(.*)*", 
     component: () => import("@/views/error/404"),
     hidden: true,
@@ -63,6 +58,11 @@ export const constantRoutes = [
     hidden: true,
   },
   {
+    path: "/wifi",
+    component: () => import("@/views/wifi"),
+    hidden: true
+  },
+  {
     path: "",
     component: Layout,
     redirect: "/index",

+ 2 - 3
src/views/content/setting/index.vue

@@ -17,7 +17,8 @@
         <el-tabs v-model="activeName" @tab-click="handleChangeTabs">
           <el-tab-pane v-for="item in data.tabOptions" :key="item.value" :name="item.value" :label="item.label"
             v-loading="audioData.loading">
-            <el-scrollbar :height="220">
+            <el-empty v-if="audioData.tableData.length === 0" description="暂无数据" />
+            <el-scrollbar v-else :height="220">
               <draggable class="contentList" :style="[activeName !== 2 ? 'flex-direction: column' : 'flex-wrap: wrap;']" v-model="audioData.tableData"
                 item-key="id" chosen-class="chosenClass" data-id="content"
                 :group="{ name: 'componentGroup', pull: 'clone', put: false }" :sort="false" :move="onMove"
@@ -85,8 +86,6 @@ const data = reactive({
   },
 })
 
-
-
 // 日历
 const calendar = ref()
 function selectDate(val) {

+ 14 - 15
src/views/store/devices/index.vue

@@ -4,11 +4,11 @@
       <el-form-item label="设备名称:">
         <el-input v-model="data.form.name" placeholder="请输入设备名称" />
       </el-form-item>
-      <el-form-item label="设备分类:">
+      <!-- <el-form-item label="设备分类:">
         <el-select v-model="data.form.deviceCategoryId" placeholder="请选择设备分类">
-          <!-- <el-option /> -->
+          <el-option />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="所属企业:">
         <el-select v-model="data.form.tenantId" placeholder="请选择所属企业">
           <el-option v-for="item in businessData.options" :key="item.id" :value="item.id" :label="item.name" />
@@ -23,9 +23,8 @@
         <el-button type="primary" icon="Search" @click="getSearch">搜索</el-button>
         <el-button icon="Refresh" @click="getRefresh">重置</el-button>
         <el-button type="primary" plain icon="Plus" @click="getDialog()">关联设备</el-button>
-        <el-button icon="Link" @click="getRouter">WIFI配网</el-button>
       </el-form-item>
-      <el-form-item style="float: right">
+      <el-form-item>
         <el-button icon="Expand" @click="grid = false" />
         <el-button icon="Grid" @click="grid = true" />
       </el-form-item>
@@ -144,7 +143,9 @@ const data = reactive({
     pageSize: 10
   },
   // 列表
-  tableData: [],
+  tableData: [{
+    id: 1
+  }],
   // 弹窗表单
   dialogForm: {},
   // 校验
@@ -179,7 +180,7 @@ const getList = () => {
     }
   })
 }
-getList()
+// getList()
 
 // 搜索
 const getSearch = () => {
@@ -274,13 +275,6 @@ const getDelete = (row) => {
   })
 }
 
-// wifi配网
-const getRouter = () => {
-  proxy.$router.push({
-    path: `/store/devices/detail`
-  })
-}
-
 // 监听
 watch(() => data.dialogForm.tenantId, (val) => {
   if (val) {
@@ -293,13 +287,14 @@ watch(() => data.dialogForm.tenantId, (val) => {
 <style lang="scss" scoped>
 .card_box {
   display: flex;
+  flex-wrap: wrap;
 }
 
 .card {
   display: flex;
   flex-direction: column;
   padding: 10px 10px 20px;
-  width: 185px;
+  width: 200px;
   border-radius: 10px;
   box-shadow: 0px 0px 12px rgba(0, 0, 0, .12);
   margin-right: 40px;
@@ -328,6 +323,10 @@ watch(() => data.dialogForm.tenantId, (val) => {
   .name {
     font-size: 14px;
     text-align: center;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    padding: 0 20px;
   }
 }
 </style>