Merge branch 'dev' of https://git.yfzx.zjtys.com.cn/privateNetwork/inspection-pad-web into dev

api/inspect.js

@@ -129,8 +129,8 @@ LIMIT 1;`
   },
   async batchRemove(id) {
     let sql = `update ${table.inspectionRecordName} set delFlag=1 where id = '${id}'`;
-    try {
 	let sqllitedb = await SqlliteDbUtil.initSqlliteDB();
+    try {
       let rs = await sqllitedb.executeReturnDataSQL(sql);
       return rs;
     } catch (e) {

components/inspectionItem/index.vue

@@ -46,7 +46,7 @@
 				synFlags: {
 					0: '未同步',
 					1: '已同步',
-					2: '巡检中'
+					2: '编辑中'
 				}
 			}
 		},

pages/index/operLog.vue

@@ -46,7 +46,6 @@
           <text class="num">{{ tableData.length || 0 }}条</text>
           <text>查询结果</text>
         </view>
-
         <!-- 展示区域 -->
         <view class="table-main box-shaow-box">
           <view

pages/inspectionManagement/index.vue

@@ -30,8 +30,7 @@
 						{{index}}
 					</view>
 					<view class="inspect-list">
-						<InspectionItem v-for="(its,idx) in item"  :details="its"  @longpress="onLongPress"
-							 />
+						<InspectionItem v-for="(its,idx) in item" :details="its" @longpress="onLongPress" />
 					</view>
 				</view>
 
@@ -47,6 +46,11 @@
 </template>
 
 <script>
+	import {
+		addLog,
+		getLogContent,
+		LOG_TYPE_ENUM,
+	} from "@/utils/IoReadingAndWriting.js";
 	import SearchCom from "@/components/searchCom/index.vue";
 	import InspectionItem from "@/components/inspectionItem/index.vue";
 	import {
@@ -107,8 +111,11 @@
 				}
 			},
 			async init() {
-				console.log(this.userInfo,'==================')
-				let res = await inspectApi.selectDataForTime({...this.searchForm,userId:this.userInfo.userId})
+				console.log(this.userInfo, '==================')
+				let res = await inspectApi.selectDataForTime({
+					...this.searchForm,
+					userId: this.userInfo.userId
+				})
 				this.propList = res.filter(e => e.synFlag == 0)
 				this.countNum = res.length
 				const resultMap = {};
@@ -147,9 +154,20 @@
 			},
 			async onLongPress(item) {
 				let rs = await inspectApi.batchRemove(item.id)
-				if(rs){
+				if (rs) {
+					// 生成日志
+					const logContent = getLogContent(
+						LOG_TYPE_ENUM.delete,
+						`${item.userName}(${item.inspectionCode})`,
+						"巡检模块"
+					);
+					const log_list = this.$store.state.log_list;
+					log_list.push(logContent);
+					this.$store.commit("SET_LOG_LIST", log_list);
+					addLog(log_list).then((res) => {});
 					await this.init()
 				}
+
 			},
 			deleteItem() {
 				if (this.currentIndexToDelete !== null) {

pages/listingManagement/dialog.vue

@@ -163,7 +163,7 @@ export default {
       this.$store.commit("SET_DEVICEDATA", arr);
       setTimeout(
         () => {
-          let length = tmepList.length;
+          let length = arr.length;
           // 生成日志
           const logContent = getLogContent(
             LOG_TYPE_ENUM.sys,

pages/login/login.vue

@@ -62,7 +62,7 @@ export default {
   data() {
     return {
       person: {
-        account: "姜安平", // 超管账号
+        account: "姜安平", 
         pwd: "Jap@123",
       },
       backButtonPress: 0,