版本3.8.0 ljd 2024-2-23

1、修改了操作日志下发超时状态重新下发和作废按钮挤在一起的问题
2、修改了租约管理凭证录入时间不是按照租约时间来进行入住

config/index.js

@@ -11,10 +11,11 @@ module.exports = {
         assetsPublicPath: '/',
         proxyTable: {
             '/api': {
-                target: 'http://apartmentcloud.xiaozhisz.cn/',
+                target: 'https://apartmentcloud.xiaozhisz.cn/',
                 // target: 'http://test.zhiweisz.cn/',
                 // target: 'http://192.168.1.26:8600/',
                 changeOrigin: true, //是否跨域
+                secure: false,
                 pathRewrite: {
                     //重写路径
                     '^/api': '' //代理路径
@@ -39,8 +40,9 @@ module.exports = {
             }
           }
         },
-        host: '192.168.1.11',
-        port: 8082,
+        host: '192.168.1.2',
+        // host: 'localhost',
+        port: 8081,
         autoOpenBrowser: false,
         errorOverlay: true,
         notifyOnErrors: true,

src/api/index.js

@@ -112,4 +112,4 @@ const silentRequest = (query,url) => {
         params: query
     });
 };
-export {httpGet,RefreshToken,httpPost,setCode,httpGet1,httpPost1,download,httgetaxio,httgetaxio1,downloadPost,httpPostno,httpGetno,silentRequest, httpPostE}
+export {httpGet,httpPost,setCode,httpGet1,httpPost1,download,httgetaxio,httgetaxio1,downloadPost,httpPostno,httpGetno,silentRequest, httpPostE}

src/components/warningLog.vue

@@ -127,7 +127,8 @@
       //   获取操作日志
       getOperates() {
         var q = {
-          deviceNum: this.deviceNum.deviceNum
+          deviceNum: this.deviceNum.deviceNum,
+          deviceType: 1
         };
         var data = {
           q: JSON.stringify(q),

src/views/DeviceFeedbackLog.vue

@@ -46,9 +46,10 @@
         <el-table-column prop="createTime" label="创建时间"></el-table-column>
         <el-table-column prop="createTime" label="操作" v-if="userInfo.type==0">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" @click="cancelDistribution(scope.$index,scope.row)"
-							v-if="scope.row.result==704 && scope.row.serial">作废</el-button>
-            <el-button type="primary" size="mini" @click="reissueMethods(scope.$index,scope.row)" v-if="scope.row.result==704 && (scope.row.command==6216 || scope.row.command==6210 || scope.row.command==6207 || scope.row.command==6213)">重新下发</el-button>
+            <el-button type="primary" class="btnDistributeItem" size="mini" @click="cancelDistribution(scope.$index,scope.row)"
+                       v-if="scope.row.result==704 && scope.row.serial">作废</el-button>
+            <el-button type="primary" size="mini" @click="reissueMethods(scope.$index,scope.row)" v-if="scope.row.result==704 &&
+            (scope.row.command==6216 || scope.row.command==6210 || scope.row.command==6207 || scope.row.command==6213)">重新下发</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -852,6 +853,12 @@
 
 <!--样式描述-->
 <style scoped>
+.btnDistributeItem{
+  margin-bottom: 8px;
+}
+.el-button{
+  margin-left: 0 !important;
+}
   .mb-1{
     margin-bottom: 10px;
   }

src/views/agreement.vue

@@ -476,16 +476,16 @@
                   </el-input>
                 </el-form-item>
                 <!-- 凭证有效期 -->
-                <el-form-item label="开始时间" v-if="documentType != '' ? true : false">
-                  <el-date-picker v-model="value2[0]" size="small" :picker-options="pickerOptionsBegin" type="datetime"
-                    placeholder="选择开始日期时间" default-time="00:00:00">
-                  </el-date-picker>
-                </el-form-item>
-                <el-form-item label="结束时间" v-if="documentType != '' ? true : false">
-                  <el-date-picker v-model="value2[1]" size="small" :picker-options="pickerOptionsEnd" type="datetime"
-                    placeholder="选择结束日期时间" default-time="00:00:00">
-                  </el-date-picker>
-                </el-form-item>
+<!--                <el-form-item label="开始时间" v-if="documentType != '' ? true : false">-->
+<!--                  <el-date-picker v-model="value2[0]" size="small" :picker-options="pickerOptionsBegin" type="datetime"-->
+<!--                    placeholder="选择开始日期时间" default-time="00:00:00">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="结束时间" v-if="documentType != '' ? true : false">-->
+<!--                  <el-date-picker v-model="value2[1]" size="small" :picker-options="pickerOptionsEnd" type="datetime"-->
+<!--                    placeholder="选择结束日期时间" default-time="00:00:00">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
               </el-form>
               <el-button type="primary" size="small" @click="savevoucher"
                 v-if="documentType != '' ? true : false">保存</el-button>
@@ -2119,17 +2119,23 @@ export default {
     },
     // 保存凭证
     savevoucher() {
-      if (this.value2[0] == '' || this.value2[1] == '') {
-        return this.$message.error('开始时间和结束时间不能为空')
-      }
-      if (this.value2[0] > this.value2[1]) {
-        return this.$message.error('开始时间不能大于结束时间')
-      }
-      if (this.value2[0] < this.form.signingTime || this.value2[0] > this.form.contractTime) {
-        return this.$message.error('开始时间不能超出祖约时间')
+      // if (this.value2[0] == '' || this.value2[1] == '') {
+      //   return this.$message.error('开始时间和结束时间不能为空')
+      // }
+      // if (this.value2[0] > this.value2[1]) {
+      //   return this.$message.error('开始时间不能大于结束时间')
+      // }
+      // if (this.value2[0] < this.form.signingTime || this.value2[0] > this.form.contractTime) {
+      //   return this.$message.error('开始时间不能超出租约时间')
+      // }
+      // if (this.value2[1] < this.form.signingTime || this.value2[1] > this.form.contractTime) {
+      //   return this.$message.error('结束时间不能超出租约时间')
+      // }
+      if (this.form.signingTime > this.form.contractTime) {
+        return this.$message.error('签约时间不能大于有效时间')
       }
-      if (this.value2[1] < this.form.signingTime || this.value2[1] > this.form.contractTime) {
-        return this.$message.error('结束时间不能超出租约时间')
+      if (this.form.signingTime == '' || this.form.contractTime == '') {
+        return this.$message.error('签约时间和有效时间都不能为空')
       }
       if (this.documentType == 11) {
         var fingerprintAlias = ''
@@ -2146,8 +2152,8 @@ export default {
                 name: name,
                 fingerprintAlias: fingerprintAlias,
                 type: 11,
-                passWordStartTime: moment(this.value2[0]).format('YYYY-MM-DD HH:mm:ss'),
-                passWordEndTime: moment(this.value2[1]).format('YYYY-MM-DD HH:mm:ss')
+                passWordStartTime: moment(this.form.signingTime).format('YYYY-MM-DD HH:mm:ss'),
+                passWordEndTime: moment(this.form.contractTime).format('YYYY-MM-DD HH:mm:ss')
               }
               this.savevoucherlist.push(data)
             } else {
@@ -2162,8 +2168,8 @@ export default {
             name: name,
             fingerprintAlias: fingerprintAlias,
             type: 11,
-            passWordStartTime: moment(this.value2[0]).format('YYYY-MM-DD HH:mm:ss'),
-            passWordEndTime: moment(this.value2[1]).format('YYYY-MM-DD HH:mm:ss')
+            passWordStartTime: moment(this.form.signingTime).format('YYYY-MM-DD HH:mm:ss'),
+            passWordEndTime: moment(this.form.contractTime).format('YYYY-MM-DD HH:mm:ss')
           }
           this.savevoucherlist.push(data)
         }
@@ -2186,8 +2192,8 @@ export default {
                 name: name,
                 type: 12,
                 password: password.toUpperCase(),
-                passWordStartTime: moment(this.value2[0]).format('YYYY-MM-DD HH:mm:ss'),
-                passWordEndTime: moment(this.value2[1]).format('YYYY-MM-DD HH:mm:ss')
+                passWordStartTime: moment(this.form.signingTime).format('YYYY-MM-DD HH:mm:ss'),
+                passWordEndTime: moment(this.form.contractTime).format('YYYY-MM-DD HH:mm:ss')
               }
               this.savevoucherlist.push(data)
             } else {
@@ -2209,8 +2215,8 @@ export default {
             name: name,
             type: 12,
             password: password.toUpperCase(),
-            passWordStartTime: moment(this.value2[0]).format('YYYY-MM-DD HH:mm:ss'),
-            passWordEndTime: moment(this.value2[1]).format('YYYY-MM-DD HH:mm:ss')
+            passWordStartTime: moment(this.form.signingTime).format('YYYY-MM-DD HH:mm:ss'),
+            passWordEndTime: moment(this.form.contractTime).format('YYYY-MM-DD HH:mm:ss')
           }
           this.savevoucherlist.push(data)
         }
@@ -2237,8 +2243,8 @@ export default {
                 name: name,
                 type: 13,
                 password: nfc.toUpperCase(),
-                passWordStartTime: moment(this.value2[0]).format('YYYY-MM-DD HH:mm:ss'),
-                passWordEndTime: moment(this.value2[1]).format('YYYY-MM-DD HH:mm:ss')
+                passWordStartTime: moment(this.form.signingTime).format('YYYY-MM-DD HH:mm:ss'),
+                passWordEndTime: moment(this.form.contractTime).format('YYYY-MM-DD HH:mm:ss')
               }
               this.savevoucherlist.push(data)
             } else {
@@ -2264,8 +2270,8 @@ export default {
             name: name,
             type: 13,
             password: nfc.toUpperCase(),
-            passWordStartTime: moment(this.value2[0]).format('YYYY-MM-DD HH:mm:ss'),
-            passWordEndTime: moment(this.value2[1]).format('YYYY-MM-DD HH:mm:ss')
+            passWordStartTime: moment(this.form.signingTime).format('YYYY-MM-DD HH:mm:ss'),
+            passWordEndTime: moment(this.form.contractTime).format('YYYY-MM-DD HH:mm:ss')
           }
           this.savevoucherlist.push(data)
         }
@@ -2285,8 +2291,8 @@ export default {
                 password: this.voucher.password,
                 type: 14,
                 name: name,
-                passWordStartTime: moment(this.value2[0]).format('YYYY-MM-DD HH:mm:ss'),
-                passWordEndTime: moment(this.value2[1]).format('YYYY-MM-DD HH:mm:ss')
+                passWordStartTime: moment(this.form.signingTime).format('YYYY-MM-DD HH:mm:ss'),
+                passWordEndTime: moment(this.form.contractTime).format('YYYY-MM-DD HH:mm:ss')
               }
               this.savevoucherlist.push(data)
             } else {
@@ -2306,8 +2312,8 @@ export default {
             password: this.voucher.password,
             type: 14,
             name: name,
-            passWordStartTime: moment(this.value2[0]).format('YYYY-MM-DD HH:mm:ss'),
-            passWordEndTime: moment(this.value2[1]).format('YYYY-MM-DD HH:mm:ss')
+            passWordStartTime: moment(this.form.signingTime).format('YYYY-MM-DD HH:mm:ss'),
+            passWordEndTime: moment(this.form.contractTime).format('YYYY-MM-DD HH:mm:ss')
           }
           this.savevoucherlist.push(data)
         }