dct 2 månader sedan
förälder
incheckning
1d20a393e8

+ 4 - 0
.env.duobaan

@@ -0,0 +1,4 @@
+VUE_APP_PROJECT=多巴胺科技
+VUE_APP_PROJECT_NAME=多巴胺科技
+OUT_PUT=duobaan
+NODE_ENV=production

BIN
build/icons1/1024x1024.png


BIN
build/icons1/128x128.png


BIN
build/icons1/16x16.png


BIN
build/icons1/24x24.png


BIN
build/icons1/256x256.png


BIN
build/icons1/32x32.png


BIN
build/icons1/48x48.png


BIN
build/icons1/512x512.png


BIN
build/icons1/64x64.png


BIN
build/icons1/icon.icns


BIN
build/icons1/icon.ico


BIN
build/icons1/logo.png


BIN
logo/icon1.ico


BIN
logo/logo1.png


BIN
public/favicon1.ico


BIN
public/icon.ico


BIN
public/icon1.png


+ 15 - 0
src/pages/checkerManage/deviceManage.vue

@@ -57,6 +57,15 @@
               prop="uniqueKey"
               label="唯一标识">
             </el-table-column>
+            <el-table-column
+              prop="type"
+              label="设备类型">
+              <template slot-scope="scope">
+                <span v-if="scope.row.type === 1">手持设备</span>
+                <span v-else-if="scope.row.type === 2">闸机</span>
+                <span v-else>{{ scope.row.type }}</span>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="status"
               label="状态">
@@ -404,11 +413,13 @@ export default {
         scenicIdList: item.scenicList.map(item => item.scenicId)
       }
       this.dialogVisible = true
+      this.updateSceneList()
     },
 
     // 打开配置弹框
     openConfigDialog (item) {
       this.configDialogVisible = true
+      this.updateSceneList()
     },
     deleteChecker (data, index) {
       this.$confirm('确定删除吗?', '提示', {
@@ -422,10 +433,14 @@ export default {
         })
       }).catch(() => {})
     },
+    updateSceneList () {
+      this.$store.dispatch('getScenicList')
+    },
     setBatchScenic () {
       this.batchUpdateDialogVisible = true
       this.batchUpdateInfo.scenicIdList = []
       this.batchUpdateInfo.checkerIdList = []
+      this.updateSceneList()
     },
     updateBatchScenic () {
       batchUpdateDeviceScene(this.batchUpdateInfo).then(res => {

+ 6 - 0
src/pages/sellManage/common/TicketList.vue

@@ -524,6 +524,7 @@ export default {
 }
 
 .noData {
+  width: 100px;
   padding: 10px;
   font-size: 14px;
   color: #666;
@@ -596,13 +597,18 @@ export default {
 
     .ticket-list {
       display: flex;
+      width: calc(100% - 280px);
 
       .list-content {
         margin-left: 20px;
+        width: calc(100% - 20px);
+        overflow-x: auto;
         display: flex;
 
         .list-item {
           position: relative;
+          flex-shrink: 0;
+          width: auto;
           height: 32px;
           line-height: 32px;
           display: flex;