qx
2025-02-14 f2ea5740f50afcbcf59cf27198fe127843db05f1
Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb
3个文件已修改
16 ■■■■■ 已修改文件
src/views/sampling/sampling/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/comp/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/tijian/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sampling/sampling/index.vue
@@ -21,10 +21,10 @@
        </el-select>
      </el-form-item>
      <!-- <el-form-item label="是否采样" prop="isSignFor">
                    <el-select style="width:100px" v-model="queryParams.isSignFor" placeholder="是否采样">
                    <el-select1 style="width:100px" v-model="queryParams.isSignFor" placeholder="是否采样">
                            <el-option v-for="dict in dict.type.sampling_type" :key="dict.value" :label="dict.label"
                                :value="dict.value"></el-option>
                        </el-select>
                        </el-select1>
            </el-form-item> -->
      <!-- <el-form-item label="体检时间" prop="tjTime">
                <el-date-picker clearable v-model="queryParams.tjTime" type="date" value-format="yyyy-MM-dd"
src/views/system/comp/index.vue
@@ -289,6 +289,8 @@
                </template>
              </el-table-column>
            </el-table>
            <div style="font-size: 16px;margin-top: 10px;">当前项目条数:<span style="font-weight: 700;">{{ OnenewpacName.length }}</span>条</div>
          </el-col>
          <el-col :span="2" :xs="24">
            <div style="margin: 240% 16%">
@@ -368,6 +370,8 @@
                </template>
              </el-table-column>
            </el-table>
            <div style="font-size: 16px;margin-top: 10px;">当前项目条数:<span style="font-weight: 700;">{{ OnenewpacName.length }}</span>条</div>
          </el-col>
          <el-col :span="2" :xs="24">
            <div style="margin: 240% 16%" class="btntoleft">
@@ -455,6 +459,8 @@
                </template>
              </el-table-column>
            </el-table>
            <div style="font-size: 16px;margin-top: 10px;">当前项目条数:<span style="font-weight: 700;">{{ OnenewpacName.length }}</span>条</div>
          </el-col>
          <el-col :span="2" :xs="24">
            <div style="margin: 240% 16%">
src/views/system/tijian/index.vue
@@ -1862,11 +1862,9 @@
              websocket.onmessage = (event) => {
                var resultObj = eval("(" + event.data + ")");  // 注意:eval存在安全隐患,建议用JSON.parse
                this.readCardWebSocket(resultObj);
                websocket.close();
              };
              websocket.onclose = () => {
                alert("读卡器连接关闭");
              };
            } else if (res.msg == "Y") {
              /* this.$refs.aaa.open = true;
              this.$refs.aaa.getAllList();