styles: text i18n

src/assets/i18n/langs/mall_CN.js

@@ -18,7 +18,7 @@ const mall_CN = {
         manual: '使用手册',
     },
     navData: {
-        blocks: '商户',
+        blocks: '全部',
         malls: '书店',
         floors: '楼层',
         stores: '店铺',
@@ -293,7 +293,7 @@ const mall_CN = {
     Management: {
         UserManage: '用户管理',
         UserInfoManage: '个人信息',
-        BlocManage: '商户管理',
+        BlocManage: '阅读空间管理',
         GroupManage: '分组管理',
         MallManage: '书店管理',
         FloorManage: '楼层管理',
@@ -336,7 +336,7 @@ const mall_CN = {
         reset: '重置',
         search: '查询',
         addUser: '新增用户',
-        addGroup: '新增商户',
+        addGroup: '新增阅读空间',
         addSquare: '新增书店',
         addFloor: '新增楼层',
         addArea: '新增区域',
@@ -410,13 +410,13 @@ const mall_CN = {
         order: '序号',
         username: '用户名',
         name: '姓名',
-        merchant: '所属商户',
+        merchant: '所属阅读空间',
         CreatTime: '创建时间',
         ExpireTime: '到期时间',
         Userstate: '用户状态',
         operate: '操作',
-        blocName: '商户名称',
-        bloc: '所属商户',
+        blocName: '阅读空间名称',
+        bloc: '所属阅读空间',
         ownShop: '所属区域',
         admin: '管理员',
         founder: '创建人',
@@ -537,7 +537,7 @@ const mall_CN = {
         close: '关闭',
         name: '名称',
         add: '新增',
-        addBloc: '新增商户',
+        addBloc: '新增阅读空间',
         addMall: '新增书店',
         addDevice: '新增设备',
         addClerk: '新增店员',
@@ -546,7 +546,7 @@ const mall_CN = {
         addPersonType: '新增人员类型',
         deviceBind: '设备绑定',
         editUser: '编辑用户',
-        editBloc: '编辑商户',
+        editBloc: '编辑阅读空间',
         editMall: '编辑书店',
         editFloor: '编辑楼层',
         editArea: '编辑区域',
@@ -566,9 +566,9 @@ const mall_CN = {
         resetPW: '密码过于简单,请修改密码',        
         tel: '电话号码',
         email: '电子邮箱',
-        accountId: '所属商户',
+        accountId: '所属阅读空间',
         userState: '用户状态',
-        blocName: '商户名称',
+        blocName: '阅读空间名称',
         admin: '管理员',
         manager: '负责人',
         logo: 'logo上传',
@@ -608,7 +608,7 @@ const mall_CN = {
         showAllPic: '查看所有图片',
         profilePic: '证件照',
         bindWx: '绑定微信',
-        allAccount: '全部商户',
+        allAccount: '全部阅读空间',
         gender: '性别',
         rolePermission: '角色权限',
         customerProperty: '读者属性',
@@ -706,8 +706,8 @@ const mall_CN = {
         eventTypeA: '节假日',
         eventTypeB: '活动',
         eventLevel: '请选择活动级别',
-        eventLevelA: '商户',
-        eventLevelB: '商場',
+        eventLevelA: '阅读空间',
+        eventLevelB: '书店',
         inStore: '店內',
         outStore: '店外',
         gatePosition: '请选择监控点位置',
@@ -731,7 +731,7 @@ const mall_CN = {
         nomenu: '没有菜单权限!请使用管理员给此用户分配角色!',
         captureFailed: '获取抓拍记录失败!',
         loginFailed: '登录失败!',
-        noBloc: '商户不存在!',
+        noBloc: '阅读空间不存在!',
         delete: '此操作将永久删除, 是否继续?',
         deleteEvent: '确定删除该活动?',
         confirDelete: '确定删除?',
@@ -1235,7 +1235,7 @@ const mall_CN = {
         heatmap:'热力图',
         faceCapture:'人脸抓拍',
         face:'人脸',
-        account: '商户',
+        account: '阅读空间',
         mall: '书店',
         floor: '楼层',
         zone: '店铺'

src/views/Management/ActManage/actManage.vue

@@ -201,7 +201,7 @@ export default {
       let _mallId = this.mallValue || null;
       if (!this.blocValue) {
         this.$message({
-          message: "集团ID不能为空!"
+          message: "阅读空间ID不能为空!"
         });
       }
       var tabelParams = {

src/views/Management/ActManage/addAct.vue

@@ -7,8 +7,8 @@
       </el-form-item>
       <el-form-item :label="$t('table.type')" prop="type" v-if="false">
         <el-select class="manage-sel" v-model="addForm.type" :placeholder="$t('pholder.eventType')" :disabled="addAbleType" @change="addchangeType">
-          <el-option label="节假日" :value="0">{{$t('pholder.eventTypeA')}}</el-option>
-          <el-option label="活动" :value="1">{{$t('pholder.eventTypeB')}}</el-option>
+          <el-option :label="$t('pholder.eventTypeA')" :value="0">{{$t('pholder.eventTypeA')}}</el-option>
+          <el-option :label="$t('pholder.eventTypeB')" :value="1">{{$t('pholder.eventTypeB')}}</el-option>
         </el-select>
         <i class="error-tip">*</i>
       </el-form-item>
@@ -96,7 +96,7 @@ export default {
         // 	{ required: true, message: '请选择书店', trigger: 'change' },
         // ],
         // accountId: [
-        // 	{ required: true, message: '请选择集团', trigger: 'blur' },
+        // 	{ required: true, message: '请选择阅读空间', trigger: 'blur' },
         // ],
         floorId: [
           { required: true, message: '请选择区域', trigger: 'change' },

src/views/Management/ActManage/editAct.vue

@@ -6,8 +6,8 @@
       </el-form-item>
       <el-form-item :label="$t('table.type')" prop="type" v-if="false">
         <el-select class="manage-sel" v-model="editForm.type" :placeholder="$t('pholder.eventType')" :disabled="editAbleType" @change="editchangeType">
-          <el-option label="节假日" :value="0">{{$t('pholder.eventTypeA')}}</el-option>
-          <el-option label="活动" :value="1">{{$t('pholder.eventTypeB')}}</el-option>
+          <el-option :label="$t('pholder.eventTypeA')" :value="0">{{$t('pholder.eventTypeA')}}</el-option>
+          <el-option :label="$t('pholder.eventTypeB')" :value="1">{{$t('pholder.eventTypeB')}}</el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('table.eventLevel')" prop="level" v-show="notUser">

src/views/Management/BlocManage/addBloc.vue

@@ -113,7 +113,7 @@ export default {
   data() {
     var validatorName = (rule, value, callback) => {
       if (value === "") {
-        return callback(new Error("请输入集团名称"));
+        return callback(new Error("请输入阅读空间名称"));
       } else if (value.length < 2 || value.length > 10) {
         return callback(new Error("长度在 2到 10 个字符"));
       }
@@ -124,7 +124,7 @@ export default {
         })
         .then(data => {
           if (data.data.data.length != 0) {
-            return callback(new Error("集团名称重复,请重新输入"));
+            return callback(new Error("阅读空间名称重复,请重新输入"));
           } else {
             callback();
           }

src/views/Management/BlocManage/editBloc.vue

@@ -154,7 +154,6 @@ export default {
       });
     },
     dialogInit(data) {
-      console.log(data)
       this.rowId = data.id;
       Object.keys(this.editForm).forEach(k => {
         this.editForm[k] = data[k]
@@ -164,7 +163,6 @@ export default {
       this.editForm.mapLatitude = data.mapLatitude || null
       this.editForm.mapZoom = data.mapZoom || 11
       this.editForm.logoPath = data.logoPath || ""
-      console.log('editForm', this.editForm)
     },
     beforeAvatarUpload(file) {
       const isJPG = file.type === "image/jpeg";

src/views/Management/ClerkManage/clerkmanage.vue

@@ -55,13 +55,13 @@
       </el-col>
       <el-col :span="4">
         <div class="btn-box">
-          <el-button
+          <!-- <el-button
             type="primary"
             size="mini"
             class="manage-add-btn fl-btn"
             @click="addClerk"
             icon="el-icon-circle-plus-outline"
-          >{{$t('dialog.addClerk')}}</el-button>
+          >{{$t('dialog.addClerk')}}</el-button> -->
           <el-button
             type="primary"
             size="mini"

src/views/Management/DeviceScreenshot/addDevice.vue

@@ -112,7 +112,7 @@ export default {
 					{ required: true, message: '请输入设备序列号', trigger: 'blur' }
 				],
 				accountId: [{
-					required: true, message: '请选择商户', trigger: 'change'
+					required: true, message: '请选择阅读空间', trigger: 'change'
 				}],
 				mallId: [{
 					required: true, message: '请选择书店', trigger: 'change'

src/views/Management/DeviceStatus/addDevice.vue

@@ -112,7 +112,7 @@ export default {
 					{ required: true, message: '请输入设备序列号', trigger: 'blur' }
 				],
 				accountId: [{
-					required: true, message: '请选择商户', trigger: 'change'
+					required: true, message: '请选择阅读空间', trigger: 'change'
 				}],
 				mallId: [{
 					required: true, message: '请选择书店', trigger: 'change'

src/views/Management/DeviceStatus/deviceStatus.vue

@@ -252,7 +252,7 @@
 						</el-table-column>
 						<el-table-column prop="hardware" label="硬件版本" align="center">
           </el-table-column>-->
-          <!-- <el-table-column prop="account.name" label="所属集团" align="center">
+          <!-- <el-table-column prop="account.name" label="所属阅读空间" align="center">
           </el-table-column>-->
           <el-table-column prop="mall.name" :label="$t('table.square')" align="center"></el-table-column>
           <el-table-column :label="$t('table.operate')" align="center">

src/views/Management/FloorManage/addFloor.vue

@@ -97,7 +97,7 @@ export default {
 					{ required: true, message: '请选择广场', trigger: 'change' },
 				],
 				// accountId: [
-				// 	{ required: true, message: '请选择集团', trigger: 'change' },
+				// 	{ required: true, message: '请选择阅读空间', trigger: 'change' },
 				// ]
 
             },

src/views/Management/FloorManage/editFloor.vue

@@ -93,7 +93,7 @@ export default {
 					{ required: true, message: '请选择书店', trigger: 'change' },
 				],
 				// accountId: [
-				// 	{ required: true, message: '请选择集团', trigger: 'change' },
+				// 	{ required: true, message: '请选择阅读空间', trigger: 'change' },
 				// ]
             },
             isIe: null,

src/views/Management/FloorManage/floorManage.vue

@@ -2,9 +2,9 @@
   <div class="manage-container floorManage-wrapper">
     <el-row class="manage-head-wrapper">
       <el-col :span="18">
-        <!-- <span class="titles">集团选择</span> -->
+        <!-- <span class="titles">阅读空间选择</span> -->
         <!-- <span style="float: left;margin-right: 10px">
-					<el-select v-model="blocValue" filterable placeholder="集团选择" size="mini" @change="blocChange">
+					<el-select v-model="blocValue" filterable placeholder="阅读空间选择" size="mini" @change="blocChange">
 						<el-option v-for="item in blocList" :key="item.id" :label="item.name" :value="item.id">
 						</el-option>
 					</el-select>
@@ -76,7 +76,7 @@
 						:formatter="statusFormatter"
 						label="状态">
           </el-table-column>-->
-          <!-- <el-table-column prop="account.name" label="所属集团" align="center">
+          <!-- <el-table-column prop="account.name" label="所属阅读空间" align="center">
           </el-table-column>-->
           <el-table-column
             prop="floorPlan"

src/views/Management/GateManage/addGate.vue

@@ -203,7 +203,7 @@ export default {
 					{ required: true, message: '请选择书店', trigger: 'change' },
 				],
 				// accountId: [
-				// 	{ required: true, message: '请选择集团', trigger: 'blur' }
+				// 	{ required: true, message: '请选择阅读空间', trigger: 'blur' }
 				// ],
 				// floorId: [
 				// 	{ required: true, message: '请选择楼层', trigger: 'blur' }

src/views/Management/GateManage/editGate.vue

@@ -200,7 +200,7 @@ export default {
 					{ required: true, message: '请选择书店', trigger: 'change' },
 				],
 				// accountId: [
-				// 	{ required: true, message: '请选择集团', trigger: 'blur' }
+				// 	{ required: true, message: '请选择阅读空间', trigger: 'blur' }
 				// ],
 				// floorId: [
 				// 	{ required: true, message: '请选择楼层', trigger: 'blur' }

src/views/Management/GateManage/gateManage.vue

@@ -153,7 +153,7 @@
           ></el-table-column>
           <!-- <el-table-column prop="axis" label="安装坐标(X, Y)" align="center" :formatter="axisFormatter">
           </el-table-column>-->
-          <!-- <el-table-column prop="account.name" label="所属集团" align="center">
+          <!-- <el-table-column prop="account.name" label="所属阅读空间" align="center">
           </el-table-column>-->
           <!-- <el-table-column prop="mall.name" label="所属广场" align="center">
           </el-table-column>-->
@@ -323,7 +323,7 @@ export default {
         ],
         mallId: [{ required: true, message: "请选择书店", trigger: "change" }],
         // accountId: [
-        // 	{ required: true, message: '请选择集团', trigger: 'blur' }
+        // 	{ required: true, message: '请选择阅读空间', trigger: 'blur' }
         // ],
         // floorId: [
         // 	{ required: true, message: '请选择楼层', trigger: 'blur' }

src/views/Management/HolidayManage/holidayManage.vue

@@ -274,7 +274,7 @@ export default {
         // 	{ required: true, message: '请选择书店', trigger: 'change' },
         // ],
         // accountId: [
-        // 	{ required: true, message: '请选择集团', trigger: 'blur' },
+        // 	{ required: true, message: '请选择阅读空间', trigger: 'blur' },
         // ],
         floorId: [{ required: true, message: "请选择区域", trigger: "change" }]
       },

src/views/Management/MallManage/addMall.vue

@@ -316,7 +316,7 @@ export default {
         ],
         cityId: [{ required: true, message: "请选择城市", trigger: "change" }]
         // accountId: [
-        // 	{ required: true, message: '请选择集团', trigger: 'blur' },
+        // 	{ required: true, message: '请选择阅读空间', trigger: 'blur' },
         // ]
       }
     };
@@ -534,8 +534,8 @@ export default {
     creatRoot(result) {
       let rootNode = [
         {
-          label: this.$cookie.get("accountName") + "集团",
-          name: this.$cookie.get("accountName") + "集团",
+          label: this.$cookie.get("accountName") + "阅读空间",
+          name: this.$cookie.get("accountName") + "阅读空间",
           nameEn: "",
           id: -1,
           accountId: this.$cookie.get("accountId")

src/views/Management/MallManage/editMall.vue

@@ -306,7 +306,7 @@ export default {
         ],
         cityId: [{ required: true, message: "请选择城市", trigger: "change" }]
         // accountId: [
-        // 	{ required: true, message: '请选择集团', trigger: 'blur' },
+        // 	{ required: true, message: '请选择阅读空间', trigger: 'blur' },
         // ]
       },
       rowId: "",
@@ -388,8 +388,8 @@ export default {
     creatRoot(result) {
       let rootNode = [
         {
-          label: this.$cookie.get("accountName") + "集团",
-          name: this.$cookie.get("accountName") + "集团",
+          label: this.$cookie.get("accountName") + "阅读空间",
+          name: this.$cookie.get("accountName") + "阅读空间",
           nameEn: "",
           id: -1,
           accountId: this.$cookie.get("accountId")

src/views/Management/MallManage/mallManage.vue

@@ -2,9 +2,9 @@
   <div class="manage-container mallManage-wrapper">
     <el-row class="manage-head-wrapper">
       <el-col :span="18" :sm="18">
-        <!-- <span class="titles">集团选择</span> -->
+        <!-- <span class="titles">阅读空间选择</span> -->
         <!-- <div style="float: left;margin-right: 10px">
-					<el-select v-model="blocValue" filterable placeholder="集团名称" size="mini">
+					<el-select v-model="blocValue" filterable placeholder="阅读空间名称" size="mini">
 						<el-option v-for="item in blocList" :key="item.id" :label="item.name" :value="item.id">
 						</el-option>
 					</el-select>
@@ -134,7 +134,7 @@
           </el-table-column>-->
           <!-- <el-table-column prop="area" :label="$t('table.squareArea')" align="center">
           </el-table-column>-->
-          <!-- <el-table-column prop="account.name" align="center" label="所属集团">
+          <!-- <el-table-column prop="account.name" align="center" label="所属阅读空间">
           </el-table-column>-->
           <!-- <el-table-column prop="manager" align="center" label="负责人">
           </el-table-column>-->

src/views/Management/PersonInfo/personalInfo.vue

@@ -248,7 +248,7 @@ export default {
         })
         .catch(err => {});
     },
-    // 获取商户列表
+    // 获取阅读空间列表
     getAccList() {
       let _params = {};
       if (!this.isSup) {

src/views/Management/UserManage/addUser.vue

@@ -197,7 +197,7 @@ export default {
           // { validator: validatorPwd, trigger: 'change' }
         ],
         accountId: [
-          { required: true, message: "请选择所属集团", trigger: "change" }
+          { required: true, message: "请选择所属阅读空间", trigger: "change" }
         ]
         // tel: [
         // 	{ validator: validatorTel, trigger: 'blur' }

src/views/Management/WeChat/generate-option.js

@@ -21,13 +21,14 @@ const sendTypeList = [
 
 // 暂时提供可邮件的报表数据
 const sendDataList = [
-  { label: '客群分时统计', value: 'face_count_analyze'}
+  // { label: '客群分时统计', value: 'face_count_analyze'}
 ]
 
 // 消息报警数据类型
 const warnKey = ["mall", "gate", "device_status"];
 // 消息推送数据类型
-const pushKey = ['mall', 'gate', 'face_data']
+// face_data
+const pushKey = ['mall', 'gate']
 // 消息报警类型name 国际化 key
 const warnLabelLocale = ["notifyKpiMall", "notifyKpiGate", "notifyDeviceStatus"];
 const pushLabelLocale = ["notifyKpiMall", "notifyKpiGate", "faceData"];
@@ -73,7 +74,7 @@ export function initPushMessageOption() {
     }
     if (item === 'face_data') {
       pushParameter[item].sendMethods = sendTypeList[1].value
-      pushParameter[item].sendDataOpt = [sendDataList[0].value]
+      pushParameter[item].sendDataOpt = sendDataList[0].value ? [sendDataList[0].value] : null
     }
   });
 }

src/views/Management/ZoneManage/addShop.vue

@@ -210,7 +210,7 @@ export default {
                     { required: true, message: '请选择广场', trigger: 'change' },
                 ],
 				// accountId: [
-				// 	{ required: true, message: '请选择集团', trigger: 'blur' },
+				// 	{ required: true, message: '请选择阅读空间', trigger: 'blur' },
 				// ],
 				floorId: [
 					{ required: true, message: '请选择楼层', trigger: 'change' },

src/views/Management/ZoneManage/editShop.vue

@@ -208,7 +208,7 @@ export default {
 				// 	{ required: true, message: '请选择广场', trigger: 'change' },
 				// ],
 				// accountId: [
-				// 	{ required: true, message: '请选择集团', trigger: 'blur' },
+				// 	{ required: true, message: '请选择阅读空间', trigger: 'blur' },
                 // ],
 				floorId: [
 					{ required: true, message: '请选择楼层', trigger: 'change' },

src/views/Management/ZoneManage/zoneManage.vue

@@ -127,7 +127,7 @@
           </el-table-column>-->
           <!-- <el-table-column prop="format.name" label="所属业态" align="center">
           </el-table-column>-->
-          <!-- <el-table-column prop="account.name" label="所属集团" align="center">
+          <!-- <el-table-column prop="account.name" label="所属阅读空间" align="center">
           </el-table-column>-->
           <el-table-column prop="mall.name" :label="$t('table.square')" align="center" width="140"></el-table-column>
           <el-table-column prop="floor.name" :label="$t('table.floor')" align="center" width="140"></el-table-column>

src/views/Management/imgManage/floorImgManage.vue

@@ -2,9 +2,9 @@
     <div class="manage-container">
         <el-row class="manage-head-wrapper">
 			<el-col :span="24">
-				<!-- <span class="titles">集团选择</span> -->
+				<!-- <span class="titles">阅读空间选择</span> -->
 				<!-- <span style="float: left;margin-right: 10px">
-					<el-select v-model="blocValue" filterable placeholder="集团选择" size="mini" @change="blocChange">
+					<el-select v-model="blocValue" filterable placeholder="阅读空间选择" size="mini" @change="blocChange">
 						<el-option v-for="item in blocList" :key="item.id" :label="item.name" :value="item.id">
 						</el-option>
 					</el-select>

src/views/Management/menuManage/menuManage.vue

@@ -95,8 +95,8 @@ export default {
       treeVisible: false,
       rootNode: [
         {
-          label: this.$cookie.get("accountName") + "集团",
-          name: this.$cookie.get("accountName") + "集团",
+          label: this.$cookie.get("accountName") + "阅读空间",
+          name: this.$cookie.get("accountName") + "阅读空间",
           // nameEn: '',
           id: -1,
           unid: -1,

src/views/others-page/repeatCustomerStore.vue

@@ -160,7 +160,7 @@ export default {
     downloadHandle() {
       import('@/utils/Export2Excel').then(excel => {
         excel.export_json_to_excel({
-            header: ['门店ID', '门店名称', '日期', '多次到店人数'],
+            header: ['书店ID', '书店名称', '日期', '多次到店人数'],
             data: this.downloadData,
             filename: '多次到店人数报表',
             autoWidth: true,