tx-lims-before.git

licp

2024-07-03 02abdc9c856da39026f26843856bf4ab302e7def

修改luckysheet引用

已修改4个文件

	index.html	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/assets/api/controller.js	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/do/b1-ins-order/add.vue	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/components/do/b1-inspect-order-plan/Inspection.vue	84 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 index.html

@@ -6,6 +6,12 @@
        <meta http-equiv="Expires" CONTENT="0">
        <meta http-equiv="Cache-Control" CONTENT="no-cache">
        <meta http-equiv="Pragma" CONTENT="no-cache">
    <link rel='stylesheet' href='/static/luckysheet\plugins\css/pluginsCss.css' />
    <link rel='stylesheet' href='/static/luckysheet/plugins/plugins.css' />
    <link rel='stylesheet' href='/static/luckysheet/css/luckysheet.css' />
    <link rel='stylesheet' href='/static/luckysheet/assets/iconfont/iconfont.css' />
        <script src="/static/luckysheet/plugins/js/plugin.js"></script>
        <script src="/static/luckysheet/luckysheet.umd.js"></script>
        <title>LIMS实验室管理系统</title>
        <link rel="icon" type="image/x-icon" href="./static/img/logo.png">

@@ -13,10 +19,6 @@
        <link href="./static/luckysheet/plugins/plugins.css" rel="stylesheet" />
        <link href="./static/luckysheet/css/luckysheet.css" rel="stylesheet" />
        <link href="./static/luckysheet/assets/iconfont/iconfont.css" rel="stylesheet" /> -->
    <link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet\plugins\css/pluginsCss.css' />
    <link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet/plugins/plugins.css' />
    <link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet/css/luckysheet.css' />
    <link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet/assets/iconfont/iconfont.css' />
    <style>
      #app{
        overflow: hidden;
@@ -29,8 +31,6 @@
    </head>
    <body>
        <div id="app"></div>
        <script type='text/javascript' src='http://10.16.173.59:81/web-apps/apps/api/documents/api.js'></script>
        <script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/plugins/js/plugin.js"></script>
        <script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/luckysheet.umd.js"></script>
    <script type='text/javascript' src='http://10.16.173.59:81/web-apps/apps/api/documents/api.js'></script>
    </body>
</html>

 src/assets/api/controller.js

@@ -188,6 +188,7 @@
  downFile: "/insOrderPlan/downFile", // 附件下载
  checkSubmitPlan: "/insOrderPlan/checkSubmitPlan", // 校验检验任务提交
  getReportModel: "/insOrderPlan/getReportModel", // 切换光纤-光纤带记录模版查询检验内容
  write: "/insOrderPlan/write", // 填写温度与湿度
}

const systemLog = {

 src/components/do/b1-ins-order/add.vue

@@ -1183,18 +1183,36 @@
                  })
                }else if(type==1){
                  let arr = this.editTable.filter(b => b.sampleId == item.id)
                  arr.forEach(f => {
                    if(a.ask.includes(f.symbolItem)){
                      let ask = calBack(a.ask, f.symbolItem,f.value)
                      if (ask) {
                        a.ask = ask
                  for (var i=0;i<arr.length;i++){
                    if(a.ask){
                      if(a.ask.includes(arr[i].symbolItem)){
                        let ask = calBack(a.ask, arr[i].symbolItem,arr[i].value)
                        if (ask) {
                          a.ask = ask
                        }
                        let tell = this.handleTell(a.tell, arr[i].symbolItem,arr[i].value)
                        if (tell) {
                          a.tell = tell
                        }
                      }
                      let tell = this.handleTell(a.tell, f.symbolItem,f.value)
                      if (tell) {
                        a.tell = tell
                      }
                    }else{
                      this.$message.error('要求值为空，需要去标准库维护！')
                    }
                  })
                  }
                  // arr.forEach(f => {
                  //   if(a.ask){
                  //     if(a.ask.includes(f.symbolItem)){
                  //       let ask = calBack(a.ask, f.symbolItem,f.value)
                  //       if (ask) {
                  //         a.ask = ask
                  //       }
                  //       let tell = this.handleTell(a.tell, f.symbolItem,f.value)
                  //       if (tell) {
                  //         a.tell = tell
                  //       }
                  //     }
                  //   }else{}
                  // })
                }
              }
            })

 src/components/do/b1-inspect-order-plan/Inspection.vue

@@ -276,6 +276,16 @@
            <el-radio-button :label="item.id" v-for="(item,index) in fiber" :key="index"
              size="small">{{ item.color }}</el-radio-button>
          </el-radio-group>
          <el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px">
            <el-form-item label="温度:" style="margin-bottom: 0;">
              <el-input clearable v-model="otherForm.temperature" size="small" placeholder="" style="width: 70px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
              <span style="margin-left: 4px;">℃</span>
            </el-form-item>
            <el-form-item label="湿度:" style="margin-bottom: 0;">
              <el-input clearable v-model="otherForm.humidity" size="small" placeholder="" style="width: 70px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
              <span style="margin-left: 4px;">%</span>
            </el-form-item>
          </el-form>
        </div>
      </div>
      <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||tableLists.find(m=>m.templateId==currentTable).templateName!='温度循环检验原始记录'">
@@ -385,6 +395,7 @@
        </table>
      </div>
      <div class="center-box" v-loading="tableLoading" v-else>
        <!-- <el-divider></el-divider> -->
        <h4 style="margin-bottom: 20px;">温度循环检验原始记录</h4>
        <el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px">
        <el-form-item label="型号:" style="margin-bottom: 0;">
@@ -419,7 +430,7 @@
        </el-form-item>
        </el-form>
        <el-divider></el-divider>
        <el-form :inline="true" :model="wareForm" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;margin-bottom: 20px;">
        <el-form :inline="true" :model="wareForm" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
          <el-form-item label="仪器名称:">
            <el-select v-model="wareForm.value" placeholder="请选择" size="small">
              <el-option
@@ -464,9 +475,14 @@
        <el-table
          :data="wareTableData"
          border
          style="width: 100%">
          style="width: 100%;margin-bottom: 30px;" align="center">
          <el-table-column
            fixed
            label="序号"
            type="index"
            width="65"
            >
          </el-table-column>
          <el-table-column
            prop="date"
            label="管色标"
            width="150">
@@ -474,17 +490,17 @@
          <el-table-column
            prop="name"
            label="光纤带编号"
            width="120">
            width="180">
          </el-table-column>
          <el-table-column
            prop="province"
            label="光纤色标"
            width="120">
            width="150">
          </el-table-column>
          <el-table-column
            prop="city"
            label="外端"
            width="120">
            width="150">
            <template slot-scope="scope">
              <el-input size="small" v-model="scope.row.input" placeholder="请输入内容"></el-input>
            </template>
@@ -492,7 +508,7 @@
          <el-table-column
            prop="address"
            label="内端"
            width="300">
            width="150">
            <template slot-scope="scope">
              <el-input size="small" v-model="scope.row.input" placeholder="请输入内容"></el-input>
            </template>
@@ -500,17 +516,17 @@
          <el-table-column
            prop="zip"
            label="平均值"
            width="120">
            min-width="150">
          </el-table-column>
          <el-table-column
            prop="zip"
            label="衰减查"
            width="120">
            label="衰减差"
            min-width="150">
          </el-table-column>
          <el-table-column
            prop="zip"
            label="检测人"
            width="120">
            min-width="150">
          </el-table-column>
        </el-table>
      </div>
@@ -769,7 +785,11 @@
        temperatureOptions:[],
        wareTableData:[
          {}
        ]
        ],
        otherForm:{
          humidity:null,
          temperature:null,
        }
      }
    },
    computed: {
@@ -816,8 +836,17 @@
          }
          this.sampleProduct = res.data.sampleProduct
          this.currentSample = this.HaveJson(this.sampleProduct[0])
          let insProduct = this.HaveJson(this.currentSample.insProduct)
          if(insProduct&&insProduct.length>0){
            let {temperature,humidity} = insProduct[0];
            this.otherForm = {
              temperature:temperature?temperature:null,
              humidity:humidity?humidity:null,
            }
          }
          let list = await this.getCurrentProduct(this.currentSample.id,0)
          this.currentSample.insProduct = this.HaveJson(list)
          console.log(this.currentSample)
          this.currentSample.insProduct.forEach(a => {
            this.param[a.id] = {
              insValue: [],
@@ -831,7 +860,6 @@
          this.getReportModel(this.currentSample.id)
          if (this.currentSample.index == undefined) this.currentSample['index'] = 1
          let bushing = this.currentSample.bushing
          // this.handleTableData()
          this.getTableLists();
          this.componentData.currentId = val;
          this.currentKey = 1;
@@ -862,6 +890,24 @@
      },
    },
    methods: {
      subOtherForm(m,type){
        let ids = []
        for (let i in this.param) {
          ids.push(i)
        }
        this.$axios.post(this.$api.insOrderPlan.write,{
          [type]:Number(m),
          ids
        }, {
          headers: {
            'Content-Type': 'application/json'
          },
          noQs:true
        }).then(res => {
          if (res.code == 201) return
          this.$message.success('保存成功')
        })
      },
      getPower(){
        let power = JSON.parse(sessionStorage.getItem('power'))
        let fileDel = false
@@ -970,7 +1016,7 @@
        if(bushing&&bushing.length>0){
          this.bushing = bushing
        }
        this.handleTableData()
        // this.handleTableData()
        this.getTableLists();
        this.currentKey = row.index
        this.currentTab = null;
@@ -1146,6 +1192,7 @@
            count++
          })
        })
        // 问题开始
        this.tableList.forEach(a => {
          let dels = new Set()
          let ids = []
@@ -1202,6 +1249,8 @@
              }
            }
          })
          console.log(5555,a.template)
          return
          ids.forEach(id => {
            for (let b = 0; b < a.template.length; b++) {
              if (a.template[b].r === id.r) {
@@ -1236,6 +1285,7 @@
            }
          })
        })
        // 问题结束
        this.tableList.forEach(a => {
          let arrs = []
          let set = new Set()
@@ -1346,7 +1396,6 @@
            this.param[a.id].insResult.v.v = a.insResult
          } catch (e) {}
        })
        console.log(this.tableList)
        this.handleExcelMethod()
      },
      changeInput(m, code) {
@@ -1394,10 +1443,8 @@
              try {
                if (this.currentSample.insProduct.find(m => m.id == item.i)) {
                let ask = this.currentSample.insProduct.find(m => m.id == item.i).ask?this.currentSample.insProduct.find(m => m.id == item.i).ask.split('&'):null;
                console.log(comValue)
                let res = Object.values(comValue)[0]
                let comp = []
                console.log(res, ask)
                if(res==''||res==null||res==undefined||res=='Infinity'){
                  item.v.v = ''
                }else{
@@ -1411,10 +1458,8 @@
                          return  eval(res) == eval(str)
                        }
                      } else if (m.includes('≥')) {
                        console.log(res, eval(res <= m.split('≥')[1]))
                        return eval(res) >= eval(m.split('≥')[1])
                      }else if (m.includes('≤')) {
                        console.log(res,m.split('≤')[1])
                        return eval(res) <= eval(m.split('≤')[1])
                      }else if (m.includes('<')) {
                        return  eval(res) < eval(m.split('<')[1])
@@ -1428,7 +1473,6 @@
                        return  eval(res) >= eval(k[0]) && eval(res) <= eval(k[1])
                      }else if(m.includes('±')){
                        let k = m.split('±')
                        console.log(eval(res),eval((k[0] - k[1])),eval(res),eval((k[0] + k[1])))
                        return  eval(res) >= eval((k[0] - k[1])) && eval(res) <= eval((k[0] + k[1]))
                      }else if(m.includes('＞')){
                        return  eval(res) > eval(m.split('＞')[1])

			@@ -6,6 +6,12 @@
			<meta http-equiv="Expires" CONTENT="0">
			<meta http-equiv="Cache-Control" CONTENT="no-cache">
			<meta http-equiv="Pragma" CONTENT="no-cache">
			<link rel='stylesheet' href='/static/luckysheet\plugins\css/pluginsCss.css' />
			<link rel='stylesheet' href='/static/luckysheet/plugins/plugins.css' />
			<link rel='stylesheet' href='/static/luckysheet/css/luckysheet.css' />
			<link rel='stylesheet' href='/static/luckysheet/assets/iconfont/iconfont.css' />
			<script src="/static/luckysheet/plugins/js/plugin.js"></script>
			<script src="/static/luckysheet/luckysheet.umd.js"></script>
			<title>LIMS实验室管理系统</title>
			<link rel="icon" type="image/x-icon" href="./static/img/logo.png">

			@@ -13,10 +19,6 @@
			<link href="./static/luckysheet/plugins/plugins.css" rel="stylesheet" />
			<link href="./static/luckysheet/css/luckysheet.css" rel="stylesheet" />
			<link href="./static/luckysheet/assets/iconfont/iconfont.css" rel="stylesheet" /> -->
			<link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet\plugins\css/pluginsCss.css' />
			<link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet/plugins/plugins.css' />
			<link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet/css/luckysheet.css' />
			<link rel='stylesheet' href='<%= htmlWebpackPlugin.options.url %>/static/luckysheet/assets/iconfont/iconfont.css' />
			<style>
			#app{
			overflow: hidden;
			@@ -29,8 +31,6 @@
			</head>
			<body>
			<div id="app"></div>
			<script type='text/javascript' src='http://10.16.173.59:81/web-apps/apps/api/documents/api.js'></script>
			<script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/plugins/js/plugin.js"></script>
			<script src="<%= htmlWebpackPlugin.options.url %>/static/luckysheet/luckysheet.umd.js"></script>
			<script type='text/javascript' src='http://10.16.173.59:81/web-apps/apps/api/documents/api.js'></script>
			</body>
			</html>

			@@ -188,6 +188,7 @@
			downFile: "/insOrderPlan/downFile", // 附件下载
			checkSubmitPlan: "/insOrderPlan/checkSubmitPlan", // 校验检验任务提交
			getReportModel: "/insOrderPlan/getReportModel", // 切换光纤-光纤带记录模版查询检验内容
			write: "/insOrderPlan/write", // 填写温度与湿度
			}

			const systemLog = {

			@@ -1183,18 +1183,36 @@
			})
			}else if(type==1){
			let arr = this.editTable.filter(b => b.sampleId == item.id)
			arr.forEach(f => {
			if(a.ask.includes(f.symbolItem)){
			let ask = calBack(a.ask, f.symbolItem,f.value)
			if (ask) {
			a.ask = ask
			for (var i=0;i<arr.length;i++){
			if(a.ask){
			if(a.ask.includes(arr[i].symbolItem)){
			let ask = calBack(a.ask, arr[i].symbolItem,arr[i].value)
			if (ask) {
			a.ask = ask
			}
			let tell = this.handleTell(a.tell, arr[i].symbolItem,arr[i].value)
			if (tell) {
			a.tell = tell
			}
			}
			let tell = this.handleTell(a.tell, f.symbolItem,f.value)
			if (tell) {
			a.tell = tell
			}
			}else{
			this.$message.error('要求值为空，需要去标准库维护！')
			}
			})
			}
			// arr.forEach(f => {
			// if(a.ask){
			// if(a.ask.includes(f.symbolItem)){
			// let ask = calBack(a.ask, f.symbolItem,f.value)
			// if (ask) {
			// a.ask = ask
			// }
			// let tell = this.handleTell(a.tell, f.symbolItem,f.value)
			// if (tell) {
			// a.tell = tell
			// }
			// }
			// }else{}
			// })
			}
			}
			})

			@@ -276,6 +276,16 @@
			<el-radio-button :label="item.id" v-for="(item,index) in fiber" :key="index"
			size="small">{{ item.color }}</el-radio-button>
			</el-radio-group>
			<el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px">
			<el-form-item label="温度:" style="margin-bottom: 0;">
			<el-input clearable v-model="otherForm.temperature" size="small" placeholder="" style="width: 70px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
			<span style="margin-left: 4px;">℃</span>
			</el-form-item>
			<el-form-item label="湿度:" style="margin-bottom: 0;">
			<el-input clearable v-model="otherForm.humidity" size="small" placeholder="" style="width: 70px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
			<span style="margin-left: 4px;">%</span>
			</el-form-item>
			</el-form>
			</div>
			</div>
			<div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)\|\|tableLists.find(m=>m.templateId==currentTable).templateName!='温度循环检验原始记录'">
			@@ -385,6 +395,7 @@
			</table>
			</div>
			<div class="center-box" v-loading="tableLoading" v-else>
			<!-- <el-divider></el-divider> -->
			<h4 style="margin-bottom: 20px;">温度循环检验原始记录</h4>
			<el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px">
			<el-form-item label="型号:" style="margin-bottom: 0;">
			@@ -419,7 +430,7 @@
			</el-form-item>
			</el-form>
			<el-divider></el-divider>
			<el-form :inline="true" :model="wareForm" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;margin-bottom: 20px;">
			<el-form :inline="true" :model="wareForm" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
			<el-form-item label="仪器名称:">
			<el-select v-model="wareForm.value" placeholder="请选择" size="small">
			<el-option
			@@ -464,9 +475,14 @@
			<el-table
			:data="wareTableData"
			border
			style="width: 100%">
			style="width: 100%;margin-bottom: 30px;" align="center">
			<el-table-column
			fixed
			label="序号"
			type="index"
			width="65"
			>
			</el-table-column>
			<el-table-column
			prop="date"
			label="管色标"
			width="150">
			@@ -474,17 +490,17 @@
			<el-table-column
			prop="name"
			label="光纤带编号"
			width="120">
			width="180">
			</el-table-column>
			<el-table-column
			prop="province"
			label="光纤色标"
			width="120">
			width="150">
			</el-table-column>
			<el-table-column
			prop="city"
			label="外端"
			width="120">
			width="150">
			<template slot-scope="scope">
			<el-input size="small" v-model="scope.row.input" placeholder="请输入内容"></el-input>
			</template>
			@@ -492,7 +508,7 @@
			<el-table-column
			prop="address"
			label="内端"
			width="300">
			width="150">
			<template slot-scope="scope">
			<el-input size="small" v-model="scope.row.input" placeholder="请输入内容"></el-input>
			</template>
			@@ -500,17 +516,17 @@
			<el-table-column
			prop="zip"
			label="平均值"
			width="120">
			min-width="150">
			</el-table-column>
			<el-table-column
			prop="zip"
			label="衰减查"
			width="120">
			label="衰减差"
			min-width="150">
			</el-table-column>
			<el-table-column
			prop="zip"
			label="检测人"
			width="120">
			min-width="150">
			</el-table-column>
			</el-table>
			</div>
			@@ -769,7 +785,11 @@
			temperatureOptions:[],
			wareTableData:[
			{}
			]
			],
			otherForm:{
			humidity:null,
			temperature:null,
			}
			}
			},
			computed: {
			@@ -816,8 +836,17 @@
			}
			this.sampleProduct = res.data.sampleProduct
			this.currentSample = this.HaveJson(this.sampleProduct[0])
			let insProduct = this.HaveJson(this.currentSample.insProduct)
			if(insProduct&&insProduct.length>0){
			let {temperature,humidity} = insProduct[0];
			this.otherForm = {
			temperature:temperature?temperature:null,
			humidity:humidity?humidity:null,
			}
			}
			let list = await this.getCurrentProduct(this.currentSample.id,0)
			this.currentSample.insProduct = this.HaveJson(list)
			console.log(this.currentSample)
			this.currentSample.insProduct.forEach(a => {
			this.param[a.id] = {
			insValue: [],
			@@ -831,7 +860,6 @@
			this.getReportModel(this.currentSample.id)
			if (this.currentSample.index == undefined) this.currentSample['index'] = 1
			let bushing = this.currentSample.bushing
			// this.handleTableData()
			this.getTableLists();
			this.componentData.currentId = val;
			this.currentKey = 1;
			@@ -862,6 +890,24 @@
			},
			},
			methods: {
			subOtherForm(m,type){
			let ids = []
			for (let i in this.param) {
			ids.push(i)
			}
			this.$axios.post(this.$api.insOrderPlan.write,{
			[type]:Number(m),
			ids
			}, {
			headers: {
			'Content-Type': 'application/json'
			},
			noQs:true
			}).then(res => {
			if (res.code == 201) return
			this.$message.success('保存成功')
			})
			},
			getPower(){
			let power = JSON.parse(sessionStorage.getItem('power'))
			let fileDel = false
			@@ -970,7 +1016,7 @@
			if(bushing&&bushing.length>0){
			this.bushing = bushing
			}
			this.handleTableData()
			// this.handleTableData()
			this.getTableLists();
			this.currentKey = row.index
			this.currentTab = null;
			@@ -1146,6 +1192,7 @@
			count++
			})
			})
			// 问题开始
			this.tableList.forEach(a => {
			let dels = new Set()
			let ids = []
			@@ -1202,6 +1249,8 @@
			}
			}
			})
			console.log(5555,a.template)
			return
			ids.forEach(id => {
			for (let b = 0; b < a.template.length; b++) {
			if (a.template[b].r === id.r) {
			@@ -1236,6 +1285,7 @@
			}
			})
			})
			// 问题结束
			this.tableList.forEach(a => {
			let arrs = []
			let set = new Set()
			@@ -1346,7 +1396,6 @@
			this.param[a.id].insResult.v.v = a.insResult
			} catch (e) {}
			})
			console.log(this.tableList)
			this.handleExcelMethod()
			},
			changeInput(m, code) {
			@@ -1394,10 +1443,8 @@
			try {
			if (this.currentSample.insProduct.find(m => m.id == item.i)) {
			let ask = this.currentSample.insProduct.find(m => m.id == item.i).ask?this.currentSample.insProduct.find(m => m.id == item.i).ask.split('&'):null;
			console.log(comValue)
			let res = Object.values(comValue)[0]
			let comp = []
			console.log(res, ask)
			if(res==''\|\|res==null\|\|res==undefined\|\|res=='Infinity'){
			item.v.v = ''
			}else{
			@@ -1411,10 +1458,8 @@
			return eval(res) == eval(str)
			}
			} else if (m.includes('≥')) {
			console.log(res, eval(res <= m.split('≥')[1]))
			return eval(res) >= eval(m.split('≥')[1])
			}else if (m.includes('≤')) {
			console.log(res,m.split('≤')[1])
			return eval(res) <= eval(m.split('≤')[1])
			}else if (m.includes('<')) {
			return eval(res) < eval(m.split('<')[1])
			@@ -1428,7 +1473,6 @@
			return eval(res) >= eval(k[0]) && eval(res) <= eval(k[1])
			}else if(m.includes('±')){
			let k = m.split('±')
			console.log(eval(res),eval((k[0] - k[1])),eval(res),eval((k[0] + k[1])))
			return eval(res) >= eval((k[0] - k[1])) && eval(res) <= eval((k[0] + k[1]))
			}else if(m.includes('＞')){
			return eval(res) > eval(m.split('＞')[1])