222
lkk
2024-12-05 e4aa2d49ae837e46258c42909c10661da903ee0f
222
3个文件已修改
312 ■■■■■ 已修改文件
src/views/sampling/sampling/index.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/tijian/index.vue 148 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/tijianall/index.vue 155 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sampling/sampling/index.vue
@@ -959,18 +959,11 @@
    handleChange(selection) {
      // console.log(selection);
      // this.selectList = selection;
      this.selectList = selection;
      // console.log(this.selectList, 5555);
      var array = selection;
      this.ids = array.map((item) => item.id);
    },
    selectAllRows() {
      this.$nextTick(() => {
        if (this.$refs.tab1) {
          this.$refs.tab1.toggleAllSelection();
        }
      });
    },
    // 禁选
src/views/system/tijian/index.vue
@@ -1620,7 +1620,7 @@
        pacRemark: null,
      },
      // valueUrl: "ws://127.0.0.1:18890",
      valueUrl: "ws://127.0.0.1:6789/websocket",
      valueUrl: "ws://127.0.0.1::6789/websocket",
      valueUrls: "ws://127.0.0.1:6789/websocket",
      // valueUrls: "ws://"+getIp() +":6789/websocket",
      webSocket: null,
@@ -1692,9 +1692,8 @@
    this.getList1();
    // this.getData();
  },
  mounted(){
    console.log(this.dict.type.dict_user_marry,555);
  mounted() {
    console.log(this.dict.type.dict_user_marry, 555);
  },
  methods: {
@@ -2327,59 +2326,14 @@
              };
              //接收到消息的回调方法
              websocket.onmessage = function (event) {
              websocket.onmessage = (event)=> {
                console.log(event, "event");
                var resultObj = eval("(" + event.data + ")");
                //resultFlag为0代表读卡成功
                if (
                  resultObj.name == "readCard" ||
                  resultObj.name == "readCert" ||
                  resultObj.name == "PushWithImg" ||
                  resultObj.name == "PushWithOutImg"
                ) {
                  if (resultObj.resultFlag == "0") {
                    //回显相关数据
                    _this.form.cusName = resultObj.resultContent.partyName;
                    _this.form.cusSex =
                      resultObj.resultContent.gender == "0" ? "女" : "男";
                    _this.form.cusNational = resultObj.resultContent.nation;
                    _this.form.cusBrithday = resultObj.resultContent.bornDay;
                    if (_this.form.cusBrithday) {
                      _this.form.cusBrithday = _this.form.cusBrithday.replace(
                        /^(\d{4})(\d{2})(\d{2})$/,
                        "$1-$2-$3"
                      );
                    }
                    _this.form.cusAddr = resultObj.resultContent.certAddress;
                    _this.form.cusIdcard = resultObj.resultContent.certNumber;
                    _this.imageUrl =
                      "data:image/jpeg;base64," +
                      resultObj.resultContent.identityPic;
                    if (
                      resultObj.name == "readCert" ||
                      resultObj.name == "PushWithImg"
                    ) {
                      this.imageUrl =
                        "data:image/jpeg;base64," +
                        resultObj.resultContent.identityPrintPic;
                    }
                  } else if (resultObj.resultFlag == "-1") {
                    if (resultObj.errorMsg == "端口打开失败") {
                      //alert("读卡器未连接");
                    } else {
                      //alert(resultObj.errorMsg);
                    }
                  } else if (resultObj.resultFlag == "-2") {
                    //alert(resultObj.errorMsg);
                  }
                } else if (resultObj.name == "getStatus") {
                  if (resultObj.resultFlag == "0") {
                    if (resultObj.status == "0") {
                    } else {
                      alert("设备连接已断开,请检查读卡器连接");
                    }
                  }
                }
                console.log(resultObj);
                // TODO 以下代码可能是泾川使用的
                // this.jingChuanHandlerWebSocketResult(resultObj)
                this.readCardWebSocket(resultObj)
              };
              //连接关闭的回调方法
@@ -2425,6 +2379,90 @@
        });
      }
    },
    // 最新使用webSocket通信
    readCardWebSocket(resultObj){
      let _this = this;
      if (resultObj.code === 200) {
          //回显相关数据
          _this.form.cusName = resultObj.data.name;
          _this.form.cusSex =
            resultObj.data.sex == "0" ? "女" : "男";
          _this.form.cusNational = resultObj.data.mz;
          _this.form.cusBrithday = resultObj.data.csrq;
          if (_this.form.cusBrithday) {
            _this.form.cusBrithday = _this.form.cusBrithday.replace(
              /^(\d{4})(\d{2})(\d{2})$/,
              "$1-$2-$3"
            );
          }
          _this.form.cusAddr = resultObj.data.addres;
          _this.form.cusIdcard = resultObj.data.card;
          _this.imageUrl =
            "data:image/jpeg;base64," + resultObj.data.img;
          if (resultObj.name == "readCert" || resultObj.name == "PushWithImg") {
            this.imageUrl =
              "data:image/jpeg;base64," +
              resultObj.data.img;
          }
        } else if (resultObj.resultFlag == "-1") {
          if (resultObj.errorMsg == "端口打开失败") {
            //alert("读卡器未连接");
          } else {
            //alert(resultObj.errorMsg);
          }
        } else if (resultObj.resultFlag == "-2") {
          //alert(resultObj.errorMsg);
        }
    },
    // TODO 以下代码可能是泾川使用的
    jingChuanHandlerWebSocketResult(resultObj) {
      let _this = this;
      if (
        resultObj.name == "readCard" ||
        resultObj.name == "readCert" ||
        resultObj.name == "PushWithImg" ||
        resultObj.name == "PushWithOutImg"
      ) {
        if (resultObj.resultFlag == "0") {
          //回显相关数据
          _this.form.cusName = resultObj.resultContent.partyName;
          _this.form.cusSex =
            resultObj.resultContent.gender == "0" ? "女" : "男";
          _this.form.cusNational = resultObj.resultContent.nation;
          _this.form.cusBrithday = resultObj.resultContent.bornDay;
          if (_this.form.cusBrithday) {
            _this.form.cusBrithday = _this.form.cusBrithday.replace(
              /^(\d{4})(\d{2})(\d{2})$/,
              "$1-$2-$3"
            );
          }
          _this.form.cusAddr = resultObj.resultContent.certAddress;
          _this.form.cusIdcard = resultObj.resultContent.certNumber;
          _this.imageUrl =
            "data:image/jpeg;base64," + resultObj.resultContent.identityPic;
          if (resultObj.name == "readCert" || resultObj.name == "PushWithImg") {
            this.imageUrl =
              "data:image/jpeg;base64," +
              resultObj.resultContent.identityPrintPic;
          }
        } else if (resultObj.resultFlag == "-1") {
          if (resultObj.errorMsg == "端口打开失败") {
            //alert("读卡器未连接");
          } else {
            //alert(resultObj.errorMsg);
          }
        } else if (resultObj.resultFlag == "-2") {
          //alert(resultObj.errorMsg);
        }
      } else if (resultObj.name == "getStatus") {
        if (resultObj.resultFlag == "0") {
          if (resultObj.status == "0") {
          } else {
            alert("设备连接已断开,请检查读卡器连接");
          }
        }
      }
    },
    changeradio() {
      if (this.cardreaderradio != 3) {
        this.$nextTick(() => {
src/views/system/tijianall/index.vue
@@ -227,7 +227,7 @@
                  v-for="dict in dict.type.dict_team"
                  :key="dict.value"
                  :label="dict.label"
                  :value="parseInt(dict.value)"
                  :value="dict.value"
                ></el-option>
              </el-select>
            </el-form-item>
@@ -1213,7 +1213,7 @@
      // 表单参数
      form: {
        cusIdcard: "",
        tjType: 2,
        tjType: '3',
        category: "01",
        cusSex: 1,
        cusNational: "1",
@@ -1278,6 +1278,8 @@
  },
  created() {
    this.getList1();
    console.log(this.dict.type.dict_team,999);
  },
  methods: {
    inputChange() {
@@ -1653,72 +1655,28 @@
                this.websocket = websocket;
                // 连接设备
                var jsonObj = {
                  name: "connect",
                  type: "1",
                };
                var jStr = JSON.stringify(jsonObj);
                this.websocket.send(jStr);
                alert("请放身份证再点确认");
                var jsonObj = {
                  name: "readCert",
                  // name: "readCert",
                };
                var jStr = JSON.stringify(jsonObj);
                this.websocket.send(jStr);
                // var jStr = JSON.stringify(jsonObj);
                // this.websocket.send(jStr);
                this.dialogVisible = false;
              };
              //接收到消息的回调方法
              websocket.onmessage = function (event) {
              websocket.onmessage =  (event)=> {
                var resultObj = eval("(" + event.data + ")");
                //resultFlag为0代表读卡成功
                if (
                  resultObj.name == "readCard" ||
                  resultObj.name == "readCert" ||
                  resultObj.name == "PushWithImg" ||
                  resultObj.name == "PushWithOutImg"
                ) {
                  if (resultObj.resultFlag == "0") {
                    //回显相关数据
                    _this.form.cusName = resultObj.resultContent.partyName;
                    _this.form.cusSex =
                      resultObj.resultContent.gender == "0" ? "女" : "男";
                    _this.form.cusNational = resultObj.resultContent.nation;
                    _this.form.cusBrithday = resultObj.resultContent.bornDay;
                    if (_this.form.cusBrithday) {
                      _this.form.cusBrithday = _this.form.cusBrithday.replace(
                        /^(\d{4})(\d{2})(\d{2})$/,
                        "$1-$2-$3"
                      );
                    }
                    _this.form.cusAddr = resultObj.resultContent.certAddress;
                    _this.form.cusIdcard = resultObj.resultContent.certNumber;
                    _this.imageUrl =
                      "data:image/jpeg;base64," +
                      resultObj.resultContent.identityPic;
                    if (
                      resultObj.name == "readCert" ||
                      resultObj.name == "PushWithImg"
                    ) {
                      this.imageUrl =
                        "data:image/jpeg;base64," +
                        resultObj.resultContent.identityPrintPic;
                    }
                  } else if (resultObj.resultFlag == "-1") {
                    if (resultObj.errorMsg == "端口打开失败") {
                      //alert("读卡器未连接");
                    } else {
                      //alert(resultObj.errorMsg);
                    }
                  } else if (resultObj.resultFlag == "-2") {
                    //alert(resultObj.errorMsg);
                  }
                } else if (resultObj.name == "getStatus") {
                  if (resultObj.resultFlag == "0") {
                    if (resultObj.status == "0") {
                    } else {
                      alert("设备连接已断开,请检查读卡器连接");
                    }
                  }
                }
                // TODO 以下代码可能是泾川使用的
                console.log(resultObj);
                // this.jingChuanHandlerWebSocketResult(resultObj)
                this.readCardWebSocket(resultObj)
              };
              //连接关闭的回调方法
@@ -1764,7 +1722,90 @@
        });
      }
    },
// 最新使用webSocket通信
readCardWebSocket(resultObj){
      let _this = this;
      if (resultObj.code === 200) {
          //回显相关数据
          _this.form.cusName = resultObj.data.name;
          _this.form.cusSex =
            resultObj.data.sex == "0" ? "女" : "男";
          _this.form.cusNational = resultObj.data.mz;
          _this.form.cusBrithday = resultObj.data.csrq;
          if (_this.form.cusBrithday) {
            _this.form.cusBrithday = _this.form.cusBrithday.replace(
              /^(\d{4})(\d{2})(\d{2})$/,
              "$1-$2-$3"
            );
          }
          _this.form.cusAddr = resultObj.data.addres;
          _this.form.cusIdcard = resultObj.data.card;
          _this.imageUrl =
            "data:image/jpeg;base64," + resultObj.data.img;
          if (resultObj.name == "readCert" || resultObj.name == "PushWithImg") {
            this.imageUrl =
              "data:image/jpeg;base64," +
              resultObj.data.img;
          }
        } else if (resultObj.resultFlag == "-1") {
          if (resultObj.errorMsg == "端口打开失败") {
            //alert("读卡器未连接");
          } else {
            //alert(resultObj.errorMsg);
          }
        } else if (resultObj.resultFlag == "-2") {
          //alert(resultObj.errorMsg);
        }
    },
    // TODO 以下代码可能是泾川使用的
    jingChuanHandlerWebSocketResult(resultObj) {
      let _this = this;
      if (
        resultObj.name == "readCard" ||
        resultObj.name == "readCert" ||
        resultObj.name == "PushWithImg" ||
        resultObj.name == "PushWithOutImg"
      ) {
        if (resultObj.resultFlag == "0") {
          //回显相关数据
          _this.form.cusName = resultObj.resultContent.partyName;
          _this.form.cusSex =
            resultObj.resultContent.gender == "0" ? "女" : "男";
          _this.form.cusNational = resultObj.resultContent.nation;
          _this.form.cusBrithday = resultObj.resultContent.bornDay;
          if (_this.form.cusBrithday) {
            _this.form.cusBrithday = _this.form.cusBrithday.replace(
              /^(\d{4})(\d{2})(\d{2})$/,
              "$1-$2-$3"
            );
          }
          _this.form.cusAddr = resultObj.resultContent.certAddress;
          _this.form.cusIdcard = resultObj.resultContent.certNumber;
          _this.imageUrl =
            "data:image/jpeg;base64," + resultObj.resultContent.identityPic;
          if (resultObj.name == "readCert" || resultObj.name == "PushWithImg") {
            this.imageUrl =
              "data:image/jpeg;base64," +
              resultObj.resultContent.identityPrintPic;
          }
        } else if (resultObj.resultFlag == "-1") {
          if (resultObj.errorMsg == "端口打开失败") {
            //alert("读卡器未连接");
          } else {
            //alert(resultObj.errorMsg);
          }
        } else if (resultObj.resultFlag == "-2") {
          //alert(resultObj.errorMsg);
        }
      } else if (resultObj.name == "getStatus") {
        if (resultObj.resultFlag == "0") {
          if (resultObj.status == "0") {
          } else {
            alert("设备连接已断开,请检查读卡器连接");
          }
        }
      }
    },
    handleChanges(param1) {
      if (this.form.pacCode == "不详") {
        this.form.cusIdcard = param1[0].xh;