Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

public/image-edit/js/tui-image-editor.js

@@ -4259,7 +4259,6 @@
               },
               /* eslint-disable complexity */
               objectActivated: function objectActivated(obj) {
-
                 _this12.activeObjectId = obj.id;
 
                 _this12.ui.changeHelpButtonEnabled('delete', true);
@@ -8673,6 +8672,7 @@
           }, {
             key: 'add',
             value: function add(type, options) {
+              // debugger
               var _this2 = this;
 
               return new _util.Promise(function (resolve) {
@@ -8926,6 +8926,7 @@
           }, {
             key: '_onFabricMouseMove',
             value: function _onFabricMouseMove(fEvent) {
+              // debugger
               var _this4 = this;
 
               var canvas = this.getCanvas();
@@ -8935,6 +8936,12 @@
               var width = startPointX - pointer.x;
               var height = startPointY - pointer.y;
               var shape = this._shapeObj;
+              
+              // 张改 -- 阻止标记点随鼠标拖拽放大
+              if (this._type == 'circle') {
+
+                return
+              }
 
               if (!shape) {
                 this.add(this._type, {
@@ -12991,9 +12998,7 @@
              * @override
              */
             initialize: function initialize() {
-              this.matrix = [4, 4, 4, 
-                            4, 0.7, -4,
-                            -4, -4, -4];
+              this.matrix = [4, 4, 4, 4, 0.7, -4, -4, -4, -4];
               // this.matrix = [1, 1, 1, 1, 0.7, -1, -1, -1, -1];
               // this.matrix = [0, -1,  0, -1,  5, -1, 0, -1,  0];
               // this.matrix = [1/9, 1/9,  1/9, 1/9,  1/9, 1/9, 1/9, 1/9, 1/9];
@@ -18371,6 +18376,7 @@
           }, {
             key: 'redo',
             value: function redo() {
+              // debugger
               var _this5 = this;
 
               var iterationCount = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;

src/i18n/zh-cn.js

 /*
  * @Author: your name
  * @Date: 2022-03-25 16:36:01
- * @LastEditTime: 2022-04-16 17:21:29
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-05-23 10:47:42
+ * @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \uuuz\founder_vue\src\i18n\zh-cn.js
  */
@@ -913,7 +913,8 @@ export default {
     hide_curve: '隐藏曲线',
     show_line: '显示直线',
     show_curve: '显示曲线',
-    show_marked_points: '显示标记点'
+    show_marked_points: '显示标记点',
+    delete_marked_points: '删除标记点'
   },
   // 人员指纹编辑
   Ryzwbj: {

src/views/AllPersonnelBase/AllPersonnelBase.vue

@@ -8,19 +8,6 @@
     <!-- <div class='title'>全部人员库</div> -->
     <!--二-->
     <div class="search">
-      <div class="search-right">
-        <span class="create-time-text">{{$t('Common.sarehousing_time')}}:</span>&nbsp;&nbsp;
-        <el-date-picker
-          v-model="reqParam.personStoreCustomSearch.createTime"
-          type="daterange"
-          range-separator="~"
-          :start-placeholder="$t('Common.start_time2')"
-          :end-placeholder="$t('Common.end_time2')"
-          :picker-options="{ disabledDate: disabledDate }"
-          @change="selectTime"
-        >
-        </el-date-picker>
-      </div>
       <div class="search-left">
         <el-input
           clear="search-input"
@@ -36,7 +23,50 @@
           v-if="reqParam.personStoreCustomSearch.ysxtAsjxgrybh.length > 0"
           @click="empty"
         ></i>
-        <div class="search-icon el-icon-search" @click="search()"></div>
+        <div
+          class="search-icon el-icon-search"
+          @click="search()"
+        ></div>
+      </div>
+      <div class="search-right">
+        <div class="rksj">
+          <span class="create-time-text">{{$t('Common.sarehousing_time')}}:</span>&nbsp;&nbsp;
+          <el-date-picker
+            v-model="reqParam.personStoreCustomSearch.createTime"
+            type="daterange"
+            range-separator="~"
+            :start-placeholder="$t('Common.start_time2')"
+            :end-placeholder="$t('Common.end_time2')"
+            :picker-options="{ disabledDate: disabledDate }"
+            @change="selectTime"
+          >
+          </el-date-picker>
+        </div>
+        <div class="xm">
+          <span class="create-time-text">{{$t('Common.xm')}}:</span>&nbsp;&nbsp;
+          <el-input
+            clear="search-input"
+            :placeholder="$t('Common.xm_placeholder')"
+            v-model.trim="reqParam.personStoreCustomSearch.xm"
+            @keyup.enter.native="search()"
+            show-word-limit
+            clearable
+          >
+          </el-input>
+        </div>
+        <div class="sfzh">
+          <span class="create-time-text">{{$t('Common.sfzh')}}:</span>&nbsp;&nbsp;
+          <el-input
+            clear="search-input"
+            :placeholder="$t('Common.sfzh_placeholder')"
+            v-model.trim="reqParam.personStoreCustomSearch.zjhm"
+            @keyup.enter.native="search()"
+            maxlength="18"
+            show-word-limit
+            clearable
+          >
+          </el-input>
+        </div>
       </div>
       <!-- <el-radio-group
                           v-model="reqParam.personStoreCustomSearch.searchOptions"
@@ -539,6 +569,8 @@ export default {
           createTime: [],
           createBeginTime: '',
           createEndTime: '',
+          zjhm: '',
+          xm: ''
         },
       },
       tableDate: [
@@ -626,6 +658,7 @@ export default {
     },
     // 获取全部人员列表请求
     search(page = 1) {
+      let self = this
       this.selectBoo = false
       // //console.info("请求===>", this.reqParam);
       this.reqParam.page.currPage = page
@@ -652,8 +685,9 @@ export default {
         this.reqParam.personStoreCustomSearch.createBeginTime = ''
         this.reqParam.personStoreCustomSearch.createEndTime = ''
       }
+      console.log(this.reqParam);
       this.$axios
-        .post('/api/personstore/person/list', this.reqParam)
+        .post('/api/personstore/person/list', self.reqParam)
         .then((response) => {
           if (response.data.code === 0) {
             this.tableDate = response.data.ret.list
@@ -1113,6 +1147,8 @@ export default {
           createTime: [],
           createBeginTime: '',
           createEndTime: '',
+          zjhm: '',
+          xm: ''
         },
       }
     },
@@ -1276,11 +1312,24 @@ export default {
       align-items: center;
     }
     .search-right {
-      margin-right: 30px;
+      display: flex;
+      align-items: center;
       .create-time-text {
         font-size: 14px;
         color: #606266;
       }
+      .rksj {
+        margin-right: 30px;
+      }
+      .xm {
+        margin-right: 30px;
+        .el-input {
+          width: 180px;
+        }
+        /deep/.el-input__inner {
+          width: 180px;
+        }
+      }
     }
 
     .el-input {

src/views/AllPersonnelBase/qbalk.vue

@@ -5,19 +5,6 @@
     <!--二-->
     <div class="search">
       <div class="search-left">
-        <span class="create-time-text">{{$t('Common.sarehousing_time')}}:</span>&nbsp;&nbsp;
-        <el-date-picker
-          v-model="reqParam.caseStoreCustomSearchReq.createTime"
-          type="daterange"
-          range-separator="~"
-          :start-placeholder="$t('Common.start_time2')"
-          :end-placeholder="$t('Common.end_time2')"
-          :picker-options="{ disabledDate: disabledDate }"
-          @change="selectTime"
-        >
-        </el-date-picker>
-      </div>
-      <div class="search-right">
         <el-input
           clear="search-input"
           :placeholder="$t('Allperson.input_barcode_vague_search')"
@@ -33,6 +20,19 @@
         ></i>
         <div class="search-icon el-icon-search" @click="search()"></div>
       </div>
+      <div class="search-right">
+        <span class="create-time-text">{{$t('Common.sarehousing_time')}}:</span>&nbsp;&nbsp;
+        <el-date-picker
+          v-model="reqParam.caseStoreCustomSearchReq.createTime"
+          type="daterange"
+          range-separator="~"
+          :start-placeholder="$t('Common.start_time2')"
+          :end-placeholder="$t('Common.end_time2')"
+          :picker-options="{ disabledDate: disabledDate }"
+          @change="selectTime"
+        >
+        </el-date-picker>
+      </div>
       <!-- <el-radio-group v-model="reqParam.caseStoreCustomSearchReq.searchOptions">
               <el-radio :label="3">通用搜索</el-radio>
               <el-radio :label="6">指定条码搜索</el-radio>
@@ -1161,18 +1161,17 @@ const datas1 = [
     align-items: center;
 
     .search-left {
-      margin-right: 30px;
+      display: flex;
+      align-items: center;
+    }
+
+    .search-right {
       .create-time-text {
         font-size: 14px;
         color: #606266;
       }
     }
 
-    .search-right {
-      display: flex;
-      align-items: center;
-    }
-
     /deep/ .el-input {
       /deep/ .el-input__inner {
         border: none;