浏览代码

功能分类,以及界面UI优化

soobin 2 年之前
父节点
当前提交
8d00f5f238

二进制
src/assets/accountOperation/accountAuthority.png


二进制
src/assets/accountOperation/labelMan.png


二进制
src/assets/accountOperation/merchantManage.png


二进制
src/assets/device/operIcon/deletedevice.png


二进制
src/assets/home/M15.png


二进制
src/assets/home/M3.png


+ 13 - 2
src/assets/language/en.json

@@ -293,7 +293,7 @@
     "saturday": "Saturday",
     "sunday": "Sunday",
     "deletionSucceeded": "Deletion succeeded",
-    "commonOperations": "Common Operations",
+    "commonOperations": "Remote operating equipment",
     "equipmentNo": "Equipment No",
     "restartFurnaceHead": "Restart furnace head",
     "sleep": "sleep",
@@ -391,7 +391,7 @@
     "volume": "volume",
     "alarmContent": "Alarm content",
     "eliminateAlarm": "Eliminate alarm",
-    "editDevice": "Edit Device",
+    "editDevice": "Device details",
     "seeMore": "See more",
     "stow": "stow",
     "successfullyEliminatedTheAlarm": "Successfully eliminated the alarm",
@@ -849,6 +849,7 @@
     "labelMan": "Label management",
     "apkMan": "Apk management",
     "merchantMan": "Merchant management",
+	"accountOperation": "Account operation",
     "modifyRole": "Modify Role",
     "whole": "whole",
     "roleAddedSuccessfully": "Role added successfully",
@@ -1208,5 +1209,15 @@
     "D440": "Z Zero Compensation",
     "M502": "Start out of material monitoring",
     "M506": "Outer Loop Button"
+  },
+  "accountOperation": {
+  	"title": "Acount operation",
+  	"accountAuthority": "Account authority",
+  	"distributionSettings": "Distribution Settings",
+  	"withdrawalAccountNo": "Standby withdrawal account No",
+  	"standbyWithdrawalAccountNo": "Standby withdrawal account No",
+  	"merchantManagement": "Merchant management",
+  	"labelMan": "Label management"
+  	
   }
 }

+ 14 - 3
src/assets/language/zh.json

@@ -290,7 +290,7 @@
     "saturday": "周六",
     "sunday":"周日",
     "deletionSucceeded": "删除成功",
-    "commonOperations": "常见操作",
+    "commonOperations": "远程操作设备",
     "equipmentNo": "设备编号",
     "restartFurnaceHead": "重启炉头",
     "sleep": "睡眠",
@@ -361,7 +361,7 @@
     "paymentMethod": "支付方式",
     "onlinePayment": "线上支付",
     "offlinePayment": "线下支付",
-    "onlineAndOfflinePayment": "线上线下支付",
+    "onlineAndOfflinePayment": "线上/线下支付",
     "submitAndPushDeviceUpdates":"提交并推送到设备更新",
     "clickToSelectPattern": "点击选择花型",
     "pleaseSelectAPattern": "请选择花型",
@@ -391,7 +391,7 @@
     "volume": "音量",
     "alarmContent": "报警内容",
     "eliminateAlarm": "消除报警",
-    "editDevice": "编辑设备",
+    "editDevice": "设备详细信息",
     "seeMore": "查看更多",
     "stow": "收起",
     "successfullyEliminatedTheAlarm": "消除报警成功",
@@ -851,6 +851,7 @@
     "labelMan": "标签管理",
     "apkMan": "apk管理",
     "merchantMan":"商户管理",
+	"accountOperation": "账户操作",
     "modifyRole": "修改角色",
     "whole": "全部",
     "roleAddedSuccessfully": "添加角色成功",
@@ -1212,5 +1213,15 @@
     "D440": "Z零点补偿",
     "M502": "启动缺物料监控",
     "M506": "外循环按钮"
+  },
+  "accountOperation": {
+  	"title": "账户操作",
+  	"accountAuthority": "账户权限",
+	"distributionSettings": "分销设置",
+	"withdrawalAccountNo": "提现账号",
+	"standbyWithdrawalAccountNo": "备用提现账号",
+	"merchantManagement": "商户管理",
+	"labelMan": "标签管理"
+	
   }
 }

+ 8 - 7
src/common/js/utils.js

@@ -13,24 +13,25 @@ const t = i18n.global.t;
 export const $M_Menus = {
   "M1":t("role.deviceManagement"),//设备管理
   "M2":t("role.deviceView"),//设备查看
-  "M3":t("role.distributionSettings"),//分销设置
+  // "M3":t("role.accountOperation"),//分销设置
+  "M3":t("role.accountOperation"),//账户操作
   "M4":t("role.alarmHistory"),//报警历史
   "M5":t("role.advertisingManagement"),//广告管理
   "M6":t("role.taskMessage"),//任务消息
   "M7":t("role.discountCode"),//优惠码
-  "M8":t("role.accountPermission"),//账号权限
+  // "M8":t("role.accountPermission"),//账号权限
   "M9":t("role.orderExport"),//订单导出
   "M10":t("role.shandeSubLedger"),//杉德分账
-  "M11":t("role.salesRanking"),//销售排行
-  "M12":t("role.withdrawalAccountNo"),//提现账号
-  "M13":t("role.standbyWithdrawalAccountNo"),//备用提现账号
+  // "M11":t("role.salesRanking"),//销售排行
+  // "M12":t("role.withdrawalAccountNo"),//提现账号
+  // "M13":t("role.standbyWithdrawalAccountNo"),//备用提现账号
   "M14":t("role.dataOverview"),//数据概览
   "M15":t("role.orderData"),//订单数据
   "M16":t("role.orderRefund"),//订单退款
   "M17":t("role.systemOffline"),//系统脱机
-  "M18":t("role.labelMan"),//标签管理
+  // "M18":t("role.labelMan"),//标签管理
   "M19":t("role.apkMan"),//apk管理
-  "M20":t("role.merchantMan"),//商户管理
+  // "M20":t("role.merchantMan"),//商户管理
 }
 // 判断值是否是数字 true:数值型的,false:非数值型
 export const $M_IsNaN = (num) => {

+ 11 - 2
src/components/typeSelectList/index.less

@@ -2,15 +2,24 @@
   .main6 {
     width: auto;
     height: 16px;
-    margin: 29px 15px 0 15px;
+    margin: 18px 15px 0 15px;
     justify-content: space-around;
 
+
+
     .selectIconBox {
-      width: 25%;
+      width: 20%;
       display: flex;
       flex-wrap: nowrap;
       align-items: center;
       justify-content: center;
+	
+	  .txt4 {
+		  width: 80%;
+		  overflow: hidden;
+		  text-overflow: ellipsis;
+		  white-space: nowrap;
+	  }
     }
 
     .main7 {

+ 2 - 0
src/router/index.js

@@ -121,6 +121,8 @@ const router = createRouter({
     { path: '/customLogo', name: 'customLogo', component: () => import('@/views/device/customLogo.vue'), meta: { index: 1} },
     // TODO:日志管理
     // { path: '/logMan', name: 'logMan', component: () => import('@/views/logMan/index'), meta: { index: 1 } },
+	// 账户操作
+	{ path: '/accountOperation', name: 'accountOperation', component: () => import('@/views/accountOperation/index'), meta: { index: 1 } },
     // apk管理,广告管理,订单导出 不是所有的帐号能看到
   ]
 });

+ 170 - 0
src/views/accountOperation/index.less

@@ -0,0 +1,170 @@
+.taskMessagePage {
+  width: 100%;
+  .taskMessageBox {
+    width: 100%;
+    height: calc(100% - 60px);
+    overflow: auto;
+    // background: #fff url('../../assets/taskMessage/pageBg.png') top center no-repeat;
+    // background-size: 100%;
+    .taskListRow {
+      width: 100%;
+      height: 53px;
+      flex-wrap: wrap;
+      .taskIcon {
+        width: 13%;
+        height: 100%;
+        position: relative;
+        &.deviceIcon::after{
+          content: '';
+          position: absolute;
+          background: #fff url('../../assets/accountOperation/accountAuthority.png') top center no-repeat;
+          background-size: 100%;
+          width: 0.53rem;
+          height: 0.7rem;
+          right: 0.18rem;
+          top: 0.4rem;
+        }
+        &.retailIcon::after{
+          content: '';
+          position: absolute;
+          background: #fff url('../../assets/taskMessage/retailIcon.png') top center no-repeat;
+          background-size: 100%;
+          width: 0.6rem;
+          height: 0.6rem;
+          right: 0.15rem;
+          top: 0.4rem;
+        }
+        &.withIcon::after{
+          content: '';
+          position: absolute;
+          background: #fff url('../../assets/taskMessage/withIcon.png') top center no-repeat;
+          background-size: 100%;
+          width: 0.6rem;
+          height: 0.6rem;
+          right: 0.15rem;
+          top: 0.4rem;
+        }
+		&.merIcon::after{
+		  content: '';
+		  position: absolute;
+		  background: #fff url('../../assets/accountOperation/merchantManage.png') top center no-repeat;
+		  background-size: 100%;
+		  width: 0.66rem;
+		  height: 0.6rem;
+		  right: 0.15rem;
+		  top: 0.4rem;
+		}
+		&.labelIcon::after{
+		  content: '';
+		  position: absolute;
+		  background: #fff url('../../assets/accountOperation/labelMan.png') top center no-repeat;
+		  background-size: 100%;
+		  width: 0.53rem;
+		  height: 0.6rem;
+		  right: 0.2rem;
+		  top: 0.4rem;
+		}
+      }
+      .taskRight {
+        width: 87%;
+        height: 100%;
+        position: relative;
+        border-bottom: 1px solid #e7eaf7;
+        &::after{
+          content: '';
+          position: absolute;
+          width: 6px;
+          height: 12px;
+          background: url(https://lanhu.oss-cn-beijing.aliyuncs.com/SketchPng51122feddbc4a9b3e0b055ed6181d290e60825befaa5c777794f1412ff817e57) top center no-repeat;
+          background-size: 100%;
+          right: 0.55rem;
+          top: 0.5rem;
+        }
+        .taskTitle {
+          line-height: 53px;
+        }
+      }
+    }
+
+    .searchRow {
+      width: 90%;
+      height: 48px;
+      margin: 0 auto;
+      background: rgba(255, 255, 255, 1) url("../../assets/home/line.png") bottom center no-repeat;
+      background-size: 100%;
+      align-items: center;
+      .bd3 {
+        width: 87px;
+        height: 16px;
+        .outer4 {
+          width: 20px;
+          height: 26px;
+          background: url("../../assets/alarmHistory/icon.png") top center no-repeat;
+          background-size: 100%;
+          &.equipmentIcon {
+            background: url("../../assets/taskMessage/deviceIcon.png") top center no-repeat;
+            background-size: 100%;
+          }
+          &.joinPayMchCheckIcon {
+            background: url("../../assets/taskMessage/withIcon.png") top center no-repeat;
+            background-size: 100%;
+          }
+          &.proportionIcon {
+            background: url("../../assets/taskMessage/retailIcon.png") top center no-repeat;
+            background-size: 100%;
+          }
+        }
+        .txt2 {
+          width: 65px;
+          height: 14px;
+          overflow-wrap: break-word;
+          color: rgba(64, 77, 116, 1);
+          font-size: 15px;
+          font-family: PingFangSC-Semibold;
+          text-align: left;
+          white-space: nowrap;
+          line-height: 15px;
+          display: block;
+          font-weight: bold;
+          .discountNumber {
+            font-size: 18px;
+            color: red;
+          }
+        }
+      }
+      .main5 {
+        width: 39px;
+        height: 16px;
+        .label2 {
+          width: 14px;
+          height: 14px;
+        }
+        .txt3 {
+          overflow-wrap: break-word;
+          color: rgba(64, 77, 116, 1);
+          font-size: 11px;
+          text-align: center;
+          white-space: nowrap;
+          display: block;
+        }
+      }
+    }
+    .listBox {
+      .listItem {
+        width: 100%;
+        background: url("../../assets/home/line.png") bottom center no-repeat;
+        background-size: 100%;
+        position: relative;
+        display: inline-block;
+        .itemBox {
+          width: 92%; margin: 20px auto;
+          font-size: 12px;
+          line-height: 1.64;
+          .itemRow { width: 100%; }
+          .itemTitle { color: #8787a6; }
+          .discount { padding-left: 2em; }
+        }
+      }
+    }
+  }
+}

+ 68 - 0
src/views/accountOperation/index.vue

@@ -0,0 +1,68 @@
+<template>
+  <!-- 任务消息列表 -->
+  <div class="taskMessagePage flex-col">
+    <s-header :name="$t('accountOperation.title')" :noback="false"></s-header>
+    <div class="taskMessageBox flex-col">
+      <div class="taskListRow flex-col" @click="pushPageList('/accountPer')">
+        <div class="taskIcon deviceIcon"></div>
+        <div class="taskRight">
+          <div class="taskTitle">{{$t('accountOperation.accountAuthority')}}</div>
+        </div>
+      </div>
+      <div class="taskListRow flex-col" @click="pushPageList('/distributionSet')">
+        <div class="taskIcon retailIcon"></div>
+        <div class="taskRight">
+          <div class="taskTitle">{{$t('accountOperation.distributionSettings')}}</div>
+        </div>
+      </div>
+      <div class="taskListRow flex-col" @click="pushPageList('/joinpayMch')">
+        <div class="taskIcon withIcon"></div>
+        <div class="taskRight">
+          <div class="taskTitle">{{$t('accountOperation.withdrawalAccountNo')}}</div>
+        </div>
+      </div>
+	  <div class="taskListRow flex-col" @click="pushPageList('/shandeMch')">
+	    <div class="taskIcon withIcon"></div>
+	    <div class="taskRight">
+	      <div class="taskTitle">{{$t('accountOperation.standbyWithdrawalAccountNo')}}</div>
+	    </div>
+	  </div>
+	  <div class="taskListRow flex-col" @click="pushPageList('/merchantManage')">
+	    <div class="taskIcon merIcon"></div>
+	    <div class="taskRight">
+	      <div class="taskTitle">{{$t('accountOperation.merchantManagement')}}</div>
+	    </div>
+	  </div>
+	  <div class="taskListRow flex-col" @click="pushPageList('/labelMan')">
+	    <div class="taskIcon labelIcon"></div>
+	    <div class="taskRight">
+	      <div class="taskTitle">{{$t('accountOperation.labelMan')}}</div>
+	    </div>
+	  </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { onMounted } from 'vue';
+import sHeader from "@/components/SimpleHeader";
+import { useRouter } from "vue-router";
+
+export default {
+  components: { sHeader },
+  setup() {
+    const router = useRouter();
+    // 初始化页面获取列表
+    onMounted(async () => {});
+    const pushPageList = (url) => {
+      router.push(url);
+    }
+    return { pushPageList };
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import "../../common/style/common.less";
+@import "./index.less";
+</style>

+ 166 - 116
src/views/alarmHistory/historySearch.vue

@@ -1,125 +1,175 @@
 <template>
-  <!-- 报警历史 - 搜索弹窗 -->
-  <div class="codeSearch flex-col">
-    <van-popup v-model:show="sheetShow" round class="codeSearchPopup">
-      <div class="content">
-        <van-form @submit="onSubmit">
-          <van-field
-            v-model="clientId"
-            name="clientId"
-            :label="$t('alarmHistory.equipmentNoLabel')"
-            :placeholder="$t('alarmHistory.equipmentNoPlaceholder')"
-          />
-          <van-field
-            v-model="name"
-            name="name"
-            :label="$t('alarmHistory.equipmentNameLabel')"
-            :placeholder="$t('alarmHistory.equipmentNamePlaceholder')"
-          />
-          <div class="van-cell van-field">
-            <div class="van-cell__title van-field__label">
-              <label id="van-field-4-label" for="van-field-4-input">{{$t('alarmHistory.alarmTime')}}</label>
-            </div>
-            <div class="van-cell__value van-field__value">
-              <div class="van-field__body">
-                <input type="text" class="van-field__control" :placeholder="$t('alarmHistory.startTime')" style="text-align: center; width: 50%;" v-model="createStratDate" @click="createStratDateClick()"/>
-                <span>{{$t('alarmHistory.to')}}</span>
-                <input type="text" class="van-field__control" :placeholder="$t('alarmHistory.endTime')" style="text-align: center; width: 50%;" v-model="createEndDate" @click="createEndDateClick()"/>
-              </div>
-            </div>
-          </div>
-          <!-- 操作 -->
-          <van-row justify="space-around" style="padding: 1em;">
-            <van-button span="5" round type="primary" style="height: 2em; padding: 0 2em;" native-type="submit">{{$t('alarmHistory.clickQuery')}}</van-button>
-          </van-row>
-        </van-form>
-      </div>
-    </van-popup>
-    <van-popup v-model:show="createStratDateShow" round position="bottom">
-      <van-datetime-picker
-        v-model="createStratDate"
-        type="datetime"
-        :title="$t('alarmHistory.selectFullTime')"
-        @confirm="createStratDateConFirm($event)"
-        @cancel="createStratDateCancel()"
-        :min-date="minDate"
-      />
-    </van-popup>
-    <van-popup v-model:show="createEndDateShow" round position="bottom">
-      <van-datetime-picker
-        v-model="createEndDate"
-        type="datetime"
-        title="{{$t('alarmHistory.selectFullTime')}}"
-        @confirm="createEndDateConFirm($event)"
-        @cancel="createEndDateCancel()"
-        :min-date="minDate"
-      />
-    </van-popup>
-  </div>
+	<!-- 报警历史 - 搜索弹窗 -->
+	<div class="codeSearch flex-col">
+		<van-popup v-model:show="sheetShow" round class="codeSearchPopup">
+			<div class="content">
+				<van-form @submit="onSubmit">
+					<van-field v-model="clientId" name="clientId" :label="$t('alarmHistory.equipmentNoLabel')"
+						:placeholder="$t('alarmHistory.equipmentNoPlaceholder')" />
+					<van-field v-model="name" name="name" :label="$t('alarmHistory.equipmentNameLabel')"
+						:placeholder="$t('alarmHistory.equipmentNamePlaceholder')" />
+					<div class="van-cell van-field">
+						<div class="van-cell__title van-field__label">
+							<label id="van-field-4-label"
+								for="van-field-4-input">{{$t('alarmHistory.alarmTime')}}</label>
+						</div>
+						<div class="van-cell__value van-field__value">
+							<div class="van-field__body">
+								<input type="text" class="van-field__control"
+									:placeholder="$t('alarmHistory.startTime')" style="text-align: center; width: 50%;"
+									v-model="createStartDate" @click="createStartDateClick()" />
+								<span>{{$t('alarmHistory.to')}}</span>
+								<input type="text" class="van-field__control" :placeholder="$t('alarmHistory.endTime')"
+									style="text-align: center; width: 50%;" v-model="createEndDate"
+									@click="createEndDateClick()" />
+							</div>
+						</div>
+					</div>
+					<!-- 操作 -->
+					<van-row justify="space-around" style="padding: 1em;">
+						<van-button span="5" round type="primary" style="height: 2em; padding: 0 2em;"
+							native-type="submit">{{$t('alarmHistory.clickQuery')}}</van-button>
+					</van-row>
+				</van-form>
+			</div>
+		</van-popup>
+		<van-popup v-model:show="createStartDateShow" round position="bottom">
+			<van-datetime-picker
+			  v-model="createStartDate"
+			  type="datehour"
+			  :title="$t('alarmHistory.selectFullTime')"
+			  :min-date="minDate"
+			  :max-date="maxDate"
+			  @confirm="createStartDateConFirm($event)"
+			  @cancel="createStartDateCancel()"
+			/>
+<!-- 			<van-datetime-picker v-model="createStartDate" type="datetime" :title="$t('alarmHistory.selectFullTime')"
+				@confirm="createStartDateConFirm($event)" @cancel="createStartDateCancel()" :min-date="minDate" /> -->
+		</van-popup>
+		<van-popup v-model:show="createEndDateShow" round position="bottom">
+			<van-datetime-picker
+			  v-model="createEndDate"
+			  type="datehour"
+			  :title="$t('alarmHistory.selectFullTime')"
+			  :min-date="minDate"
+			  :max-date="maxDate"
+			  @confirm="createEndDateConFirm($event)"
+			  @cancel="createEndDateCancel()"			  
+			/>
+<!-- 			<van-datetime-picker v-model="createEndDate" type="datetime" :title="$t('alarmHistory.selectFullTime')"
+				@confirm="createEndDateConFirm($event)" @cancel="createEndDateCancel()" :min-date="minDate" /> -->
+		</van-popup>
+	</div>
 </template>
 
 <script>
-import { ref } from 'vue';
-import dateUtil from "@/utils/dateUtil";
+	import {
+		ref
+	} from 'vue';
+	import dateUtil from "@/utils/dateUtil";
 
-export default {
-  name: 'historySearch',
-  components: {},
-  setup(prop, context) {
-    const sheetShow = ref(false);
-    const minDate = new Date(2018, 1, 1);
-    const showSearch = () => { sheetShow.value = true; };
-    const clientId = ref('');
-    const name = ref('');
-    // 创建开始时间
-    const createStratDate = ref(''); 
-    const createStratDateShow = ref(false);
-    const createStratDateClick = () => { if (createStratDate.value === '') { createStratDate.value = new Date(); } createStratDateShow.value = true;}
-    const createStratDateConFirm = (data) => { createStratDate.value = dateUtil.formateDate( data, "yyyy-MM-dd hh:mm:ss" ); createStratDateShow.value = false; }
-    const createStratDateCancel = () => { createStratDate.value = dateUtil.formateDate( new Date(createStratDate.value), "yyyy-MM-dd hh:mm:ss" ); createStratDateShow.value = false; }
-    // 创建结束时间
-    const createEndDate = ref(''); 
-    const createEndDateShow = ref(false);
-    const createEndDateClick = () => { if (createEndDate.value === '') { createEndDate.value = new Date(); } createEndDateShow.value = true;}
-    const createEndDateConFirm = (data) => { createEndDate.value = dateUtil.formateDate( data, "yyyy-MM-dd hh:mm:ss" ); createEndDateShow.value = false; }
-    const createEndDateCancel = () => { createEndDate.value = dateUtil.formateDate( new Date(createEndDate.value), "yyyy-MM-dd hh:mm:ss" ); createEndDateShow.value = false; }
-    // 提交搜索表单触发搜索
-    const onSubmit = () => {
-      const searchParam = {};
-      if (clientId.value !== '') { searchParam.clientId = clientId.value; }
-      if (name.value !== '') { searchParam.name = name.value; }
-      if (createStratDate.value !== '') { searchParam.startDate = dateUtil.formateDate( new Date(createStratDate.value), "yyyy/MM/dd hh:mm:ss" ); }
-      if (createEndDate.value !== '') { searchParam.endDate = dateUtil.formateDate( new Date(createEndDate.value), "yyyy/MM/dd hh:mm:ss" ); }
-      context.emit('search', searchParam);
-      sheetShow.value = false;
-    }
-    return {
-      sheetShow,
-      minDate,
-      showSearch,
-      clientId,
-      name,
-      createStratDate,
-      createStratDateShow,
-      createStratDateClick,
-      createStratDateConFirm,
-      createStratDateCancel,
-      createEndDate,
-      createEndDateShow,
-      createEndDateClick,
-      createEndDateConFirm,
-      createEndDateCancel,
-      onSubmit
-    };
-  },
-};
+	export default {
+		name: 'historySearch',
+		components: {},
+		setup(prop, context) {
+			const sheetShow = ref(false);
+			const minDate = new Date(2018, 0, 1);
+			const maxDate = new Date();
+			const showSearch = () => {
+				sheetShow.value = true;
+			};
+			const clientId = ref('');
+			const name = ref('');
+			// 创建开始时间
+			const createStartDate = ref('');
+			const createStartDateShow = ref(false);
+			const createStartDateClick = () => {
+				if (createStartDate.value === '') {
+					createStartDate.value = new Date();
+				}
+				createStartDateShow.value = true;
+			}
+			const createStartDateConFirm = (data) => {
+				createStartDate.value = dateUtil.formateDate(data, "yyyy-MM-dd hh:mm:ss");
+				createStartDateShow.value = false;
+			}
+			const createStartDateCancel = () => {
+				createStartDate.value = dateUtil.formateDate(new Date(createStartDate.value), "yyyy-MM-dd hh:mm:ss");
+				createStartDateShow.value = false;
+			}
+			// 创建结束时间
+			const createEndDate = ref('');
+			const createEndDateShow = ref(false);
+			const createEndDateClick = () => {
+				if (createEndDate.value === '') {
+					createEndDate.value = new Date();
+				}
+				createEndDateShow.value = true;
+			}
+			const createEndDateConFirm = (data) => {
+				createEndDate.value = dateUtil.formateDate(data, "yyyy-MM-dd hh:mm:ss");
+				createEndDateShow.value = false;
+			}
+			const createEndDateCancel = () => {
+				createEndDate.value = dateUtil.formateDate(new Date(createEndDate.value), "yyyy-MM-dd hh:mm:ss");
+				createEndDateShow.value = false;
+			}
+			// 提交搜索表单触发搜索
+			const onSubmit = () => {
+				const searchParam = {};
+				if (clientId.value !== '') {
+					searchParam.clientId = clientId.value;
+				}
+				if (name.value !== '') {
+					searchParam.name = name.value;
+				}
+				if (createStartDate.value !== '') {
+					searchParam.startDate = dateUtil.formateDate(new Date(createStartDate.value),
+						"yyyy/MM/dd hh:mm:ss");
+				}
+				if (createEndDate.value !== '') {
+					searchParam.endDate = dateUtil.formateDate(new Date(createEndDate.value), "yyyy/MM/dd hh:mm:ss");
+				}
+				context.emit('search', searchParam);
+				sheetShow.value = false;
+			}
+			return {
+				sheetShow,
+				minDate,
+				maxDate,
+				showSearch,
+				clientId,
+				name,
+				createStartDate,
+				createStartDateShow,
+				createStartDateClick,
+				createStartDateConFirm,
+				createStartDateCancel,
+				createEndDate,
+				createEndDateShow,
+				createEndDateClick,
+				createEndDateConFirm,
+				createEndDateCancel,
+				onSubmit
+			};
+		},
+	};
 </script>
 
 <style lang="less" scoped>
-.codeSearch {
-  width: 100%;
-  /deep/ .codeSearchPopup { width: 90%; }
-  .content { padding-top: 1em; }
-  .field .van-field__label { width: auto; }
-}
+	.codeSearch {
+		width: 100%;
+
+		/deep/ .codeSearchPopup {
+			width: 90%;
+		}
+
+		.content {
+			padding-top: 1em;
+		}
+
+		.field .van-field__label {
+			width: auto;
+		}
+	}
 </style>

+ 1 - 1
src/views/alarmHistory/index.vue

@@ -30,7 +30,7 @@
                 <span class="itemTitle">{{ $t('alarmHistory.affiliatedMerchants') }}:&nbsp;</span>{{ item.adminUserName }}
               </div>
               <div class="itemRow">
-                <span class="itemTitle">{{ $t('alarmHistory.equipmentNo') }}:&nbsp;</span>{{ item.equipmentId }}
+                <span class="itemTitle">{{ $t('alarmHistory.equipmentNo') }}:&nbsp;</span>{{ item.clientId }}
               </div>
               <div class="itemRow">
                 <span class="itemTitle">{{ $t('alarmHistory.equipmentName') }}:&nbsp;</span>{{

+ 8 - 1
src/views/device/deviceOper.vue

@@ -2,6 +2,7 @@
   <!-- 设备常见操作弹窗 -->
   <van-dialog
     class-name="operDialog"
+	width="auto"
     v-model:show="show"
     :showConfirmButton="false"
     :showCancelButton="false"
@@ -11,7 +12,7 @@
       <div style="padding: 0.2em 1em">
         {{ $t("device.equipmentName") }}: {{ device.name }}
       </div>
-      <div style="padding: 0.2em 1em">
+      <div class="txt1" style="padding: 0.2em 1em">
         {{ $t("device.equipmentNo") }}: {{ device.clientId }}
       </div>
     </slot>
@@ -474,6 +475,12 @@ export default {
 
 .operDialog {
   width: 90%;
+  
+  .txt1 {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+  }
 
   .close {
     position: absolute;

+ 4 - 0
src/views/device/deviceSet.vue

@@ -253,6 +253,7 @@
 		<div class="cust_vantBorder">
 			<van-field
 			  clearable
+			  label-width="32%"
 			  v-model="deviceDetal.messageReceiver1"
 			  :label="`${$t('device.messageReceiver1')}:`"
 			  :placeholder="$t('device.equipmentmessageReceiverPlaceholder')"
@@ -261,6 +262,7 @@
 		<div class="cust_vantBorder">
 			<van-field
 			  clearable
+			  label-width="32%"
 			  v-model="deviceDetal.messageReceiver2"
 			  :label="`${$t('device.messageReceiver2')}:`"
 			  :placeholder="$t('device.equipmentmessageReceiverPlaceholder')"
@@ -269,6 +271,7 @@
 		<div class="cust_vantBorder">
 			<van-field
 			  clearable
+			  label-width="32%"
 			  v-model="deviceDetal.messageReceiver3"
 			  :label="`${$t('device.messageReceiver3')}:`"
 			  :placeholder="$t('device.equipmentmessageReceiverPlaceholder')"
@@ -277,6 +280,7 @@
         <van-field
           colon
           readonly
+		  label-width="18%"
           :label="`${$t('device.paymentMethod')}`"
           placeholder=""
         >

+ 4 - 4
src/views/device/index.vue

@@ -156,7 +156,7 @@
                   <!-- <span class="txt5 o-ptb-10 kBordBott l-flex-RC"><span>远程开门:</span>
                     <van-button type="primary">开门</van-button>
                   </span> -->
-                  <span class="txt5 o-ptb-10">{{ item.fullName }}</span>
+                  <span class="txt5 o-ptb-8">{{ item.fullName }}</span>
                   <span
                     v-if="item.latitude"
                     class="txt5 o-ptb-5 kBordBott l-flex-RC"
@@ -221,12 +221,12 @@
                       </van-button>
                     </span>
                   </template>
-                  <span class="info3 o-ptb-10 kBordBott"
+                  <span class="info3 o-ptb-8 kBordBott"
                     >{{ $t("device.lastRefreshTime") }}:{{
                       showDateTime(item.lastUpdateTime)
                     }}</span
                   >
-                  <span class="info4 o-ptb-10 kBordBott"
+                  <span class="info4 o-ptb-5 kBordBott"
                     >{{ $t("device.volume") }}:{{ item.volume }}</span
                   >
                   <span class="info5 o-ptb-10 kBordBott"
@@ -242,7 +242,7 @@
                       >{{ $t("device.eliminateAlarm") }}</span
                     ></span
                   >
-                  <div class="editDeviceBtnCon l-flex-center o-mt-30">
+                  <div class="editDeviceBtnCon l-flex-center o-mt-10">
                     <div class="l-flex-RC" @click="deviceSet(item)">
                       <span class="c-text-14">{{
                         $t("device.editDevice")

+ 2 - 2
src/views/device/paramsSet/paramsSetInfo.vue

@@ -90,8 +90,8 @@ export default {
         paramsList.value.forEach((paramItem) => {
           // console.log(paramItem.name);
           comParams.value.push(paramItem.name);
-          // paramName.value.push(t("paramNames." + paramItem.name));
-          paramName.value.push(paramItem.name);
+          paramName.value.push(t("paramNames." + paramItem.name));
+          // paramName.value.push(paramItem.name);
           // console.log(zh.paramNames[paramItem.name]);        
         })
         // console.log(comParams.value);

+ 8 - 8
src/views/home/index.less

@@ -13,7 +13,7 @@
 
     .nameDeviceRow {
       width: 100%;
-      height: 54px;
+      height: 40px;
       flex-direction: row;
       align-items: center;
       background: url("../../assets/home/line.png") bottom center no-repeat;
@@ -321,19 +321,19 @@
       margin: 5%;
 
       .main25 {
-        width: 20%;
-        height: 90px;
+        width: 33%;
+        height: 100px;
         justify-content: space-around;
 
         // margin: 0 26px 27px 0;
         // margin-bottom: 27px;
-        &:nth-last-child(-n + 5) {
+/*        &:nth-last-child(-n + 5) {
           margin-bottom: 0;
-        }
+        } */
 
         .mod7 {
-          height: 42px;
-          width: 42px;
+          height: 55px;
+          width: 55px;
           margin: 0 auto;
           align-items: center;
           justify-content: center;
@@ -347,7 +347,7 @@
             height: 14px;
             overflow-wrap: break-word;
             color: rgba(135, 135, 166, 1);
-            font-size: 10px;
+            font-size: 12px;
             text-align: center;
             // white-space: nowrap;
             line-height: 14px;

+ 4 - 3
src/views/home/index.vue

@@ -428,13 +428,14 @@ export default {
     const pushToolPage = (index) => {
       switch (index) {
         case "M1":
-          router.push({ path: "/device" });
+          router.push({ path: "/device" }); // 设备管理
           break;
         case "M3":
-          router.push({ path: "/distributionSet" });
+          // router.push({ path: "/distributionSet" });
+		  router.push({ path: "/accountOperation" }); // 账户操作
           break;
         case "M4":
-          router.push({ path: "/alarmHistory" });
+          router.push({ path: "/alarmHistory" }); // 报警历史
           break;
         case "M5":
           router.push({ path: "/advertManage" });

+ 1 - 1
src/views/taskMessage/proportion/index.vue

@@ -28,7 +28,7 @@
           <div v-for="(item, index) in alarmHistoryList" :key="index" class="listItem">
             <div class="itemBox">
               <div class="itemRow">
-                <span class="itemTitle">{{ $t('taskMessage.equipmentName') }}:&nbsp;</span>{{ item.clientId }}
+                <span class="itemTitle">{{ $t('taskMessage.equipmentNo') }}:&nbsp;</span>{{ item.clientId }}
               </div>
               <div class="itemRow" v-if="item.type >= 1">
                 <span class="itemTitle">{{ $t('taskMessage.partners') }}:&nbsp;</span>{{ item.agencyName