소스 검색

lims 配置

yuedefeng 6 년 전
부모
커밋
229309358d

+ 2 - 2
src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -158,8 +158,8 @@ module.exports = {
     limsimgserverhost: 'http://47.92.212.59:10091', //lims图片上传
     onlyofficeUrl: 'http://47.92.212.59:9221', //onlyoffice地址 Lims
     onlyofficeCallBackUrl: 'http://47.92.212.59:10091', //onlyofficeCallBack地址  Lims
-    //baseURL: '//47.92.212.59:10091/api/'
-    baseURL: '//localhost:10091/api/'
+    // baseURL: '//47.92.212.59:10091/api/'
+	baseURL: '//localhost:10091/api/'
   },
   ignore: [
   ]

+ 6 - 19
src/dashoo.cn/frontend_web/nuxt.config.js

@@ -164,14 +164,8 @@ module.exports = {
 
   axios: {
     // baseURL: '//localhost:10091/api/' // 本机开发使用
-    // baseURL: '//47.92.212.59:10091/api/' // Lims使用
-    // baseURL: '//api09.labsop.cn/api/'
-    // baseURL: '//52.80.133.197:10091/api/' // DQM 爱萨尔发布使用
-    // baseURL: '//192.168.0.211:10091/api/' // 花生所系统
-    // baseURL: '//121.42.244.202:9081/api/' // 基石发布使用
-    baseURL: '//52.80.133.197:9081/api/' // BioBank on AWS发布使用
-    // baseURL: '//52.80.133.197:10092/api/' // 因顿LIMS发布
-    // baseURL: '//188.188.30.89:9081/api/' //临沂使用
+    baseURL: '//47.92.212.59:10091/api/' // Lims使用
+   
     // proxyHeaders: false
   },
   /*
@@ -179,23 +173,16 @@ module.exports = {
    ** 客户端使用:process.env.appclient 服务端使用:context.appclient
    */
   env: {
-    appclient: 'biobank', //因顿LIMS:lims,样本库:biobank,细胞制备:cellbank,样本搜索判断,登录跳转判断
-    // imgserverhost: 'http://52.80.133.197:10091', // 服务地址,图片上传文件
+    appclient: 'lims', //lims
 
-    imgserverhost: 'http://52.80.133.197:9081', // BioBank服务地址,图片上传文件
+    imgserverhost: 'http://47.92.212.59:10091', //图片上传文件
     upfilehost: 'http://weed1.labsop.cn:9333/dir/assign', // 附件上传
 
-    // imgserverhost: 'http://192.168.0.211:10091', // 花生所系统服务地址,图片上传文件
-    // upfilehost: 'http://192.168.0.211:9333/dir/assign' // 花生所系统附件上传
-
-    //imgserverhost: 'http://188.188.30.89:9081', // 临沂服务地址,图片上传文件
-    //upfilehost: '188.188.30.89:9333/dir/assign', // 临沂附件上传
-
-    //limsimgserverhost:' http://47.92.212.59:10091',//lims图片上传
+   
     //onlyofficeUrl: 'http://192.168.0.252:9221', //onlyoffice地址
     //onlyofficeCallBackUrl: 'http://192.168.0.108:10091', //onlyofficeCallBack的本地地址
     //onlyofficeUrl: 'http://47.92.212.59:9221', //onlyoffice地址 Lims
     //onlyofficeCallBackUrl: 'http://47.92.212.59:10091' //onlyofficeCallBack地址  Lims
-    baseURL: '//localhost:10091/api/' // 本机开发使用
+    baseURL: '//47.92.212.59:10091/api/' // 本机开发使用
   }
 }

+ 2 - 2
src/dashoo.cn/frontend_web/src/pages/lims/reportelecground/subdata/datalist.vue

@@ -604,10 +604,10 @@
           if (valid) {
             this.formData.Instrument1 = this.CGRMeterOptions.join(',')
             this.formData.Instrument2 = this.GRMeterOptions.join(',')
-            if (this.formData.Instrument1 === '' || this.formData.Instrument2 === '') {
+            /*if (this.formData.Instrument1 === '' || this.formData.Instrument2 === '') {
               this.$message.warning('检测依据不能为空!')
               return
-            }
+            }*/
             this.formData.PositionCheckId = parseInt(this.formData.PositionCheckId)
             this.formData.TestDepartId = parseInt(this.formData.TestDepartId)
             this.formData.TestDepart = this.$refs.selectTestDepart.selectedLabel + ''

+ 250 - 0
src/dashoo.cn/frontend_web/src/pages/prototype/deviceList.vue

@@ -0,0 +1,250 @@
+<template>
+  <div style="width: 100%; overflow-y: auto">
+
+    <el-row :gutter="10" style="margin-top: 10px; width: 100%; overflow: hidden">
+      <el-col :span="4">
+        <el-card class="box-card" style="height: 100vh">
+          <el-tree :data="datatree" :props="defaultProps" default-expand-all></el-tree>
+        </el-card>
+      </el-col>
+
+      <el-col :span="20">
+        <el-card class="box-card">
+          <div slot="header">
+            <legend style="color:#436EEE"></legend>
+            <i class="icon icon-database"> 安装位置及设备列表</i>
+            <span style="float: right;">
+                <el-button size="mini" plain type="primary" @click="dialogFormVisible=true">添加</el-button>
+              </span>
+          </div>
+
+          <el-table
+            :data="tableData2"
+            stripe
+            style="width: 100%; height: 100vh">
+            <el-table-column
+              prop="seqNo"
+              label="序号"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="设备分类"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="address"
+              label="地点名称"
+              width="180">
+            </el-table-column>
+            <el-table-column
+              prop="address2"
+              label="设备厂家">
+            </el-table-column>
+            <el-table-column
+              prop="address3"
+              label="设备型号">
+            </el-table-column>
+          </el-table>
+
+        </el-card>
+      </el-col>
+
+    </el-row>
+
+    <el-dialog title="编辑" :visible.sync="dialogFormVisible">
+      <el-form :model="form">
+        <el-form-item label="序号" :label-width="formLabelWidth">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="设备名称" :label-width="formLabelWidth">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="安装地点" :label-width="formLabelWidth" style="width: 100%;">
+          <el-select v-model="form.region" placeholder="请选择安装地点">
+            <el-option label="1#楼 一 1号位置" value="shanghai"></el-option>
+            <el-option label="2#楼 一 2号位置" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="生产厂家" :label-width="formLabelWidth">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="设备型号" :label-width="formLabelWidth">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="备注" :label-width="formLabelWidth">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+
+
+</template>
+
+<style>
+  .el-table .warning-row {
+    background: oldlace;
+  }
+
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+</style>
+
+<script>
+  const chartData = [
+    { year: '1951 年', sales: 38 },
+    { year: '1952 年', sales: 52 },
+    { year: '1956 年', sales: 61 },
+    { year: '1957 年', sales: 145 },
+    { year: '1958 年', sales: 48 },
+    { year: '1959 年', sales: 38 },
+    { year: '1960 年', sales: 38 },
+    { year: '1962 年', sales: 38 },
+  ];
+
+  const scale = [{
+    dataKey: 'sales',
+    tickInterval: 20,
+  }];
+
+  const lineData = [
+    { year: '1991', value: 3 },
+    { year: '1992', value: 4 },
+    { year: '1993', value: 3.5 },
+    { year: '1994', value: 5 },
+    { year: '1995', value: 4.9 },
+    { year: '1996', value: 6 },
+    { year: '1997', value: 7 },
+    { year: '1998', value: 9 },
+    { year: '1999', value: 13 },
+  ];
+
+  const lineScale = [{
+    dataKey: 'value',
+    min: 0,
+  },{
+    dataKey: 'year',
+    min: 0,
+    max: 1,
+  }];
+
+  export default {
+    methods: {
+      tableRowClassName({row, rowIndex}) {
+        if (rowIndex === 1) {
+          return 'warning-row';
+        } else if (rowIndex === 3) {
+          return 'success-row';
+        }
+        return '';
+      }
+    },
+    created () {
+
+    },
+    data () {
+      return {
+        chartData,
+        scale,
+        lineData,
+        lineScale,
+        height: 400,
+        tableData2: [{
+          seqNo: '1',
+          name: '无游梁式抽油机检测',
+          address: '1号位',
+          address2: '大连制表厂',
+          address3: 'A001'
+        }, {
+          seqNo: '2',
+          name: '阻火器检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'B002'
+        }, {
+          seqNo: '3',
+          name: '呼吸阀检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'C003'
+
+        }, {
+          seqNo: '4',
+          name: '空气泡沫产生器检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'D004'
+        },{
+          seqNo: '5',
+          name: '无游梁式抽油机检测',
+          address: '1号位',
+          address2: '大连制表厂',
+          address3: 'A001'
+        }, {
+          seqNo: '6',
+          name: '阻火器检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'B002'
+        }, {
+          seqNo: '7',
+          name: '呼吸阀检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'C003'
+
+        }, {
+          seqNo: '8',
+          name: '空气泡沫产生器检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'D004'
+        }],
+
+        datatree: [{
+          label: '设备台账(所有台账)',
+          children: [{
+            label: '防雷装置'
+          }, {
+            label: '漏电保护'
+          }, {
+            label: '液压安全阀'
+          }, {
+            label: '呼吸阀'
+          }, {
+            label: '阻火器'
+          }, {
+            label: '空气泡沫产生器'
+          }]
+        }],
+
+        defaultProps: {
+          children: 'children',
+          label: 'label'
+        },
+
+        dialogTableVisible: false,
+        dialogFormVisible: false,
+        form: {
+          name: '',
+          region: '',
+          date1: '',
+          date2: '',
+          delivery: false,
+          type: [],
+          resource: '',
+          desc: ''
+        },
+        formLabelWidth: '120px'
+
+      }
+    }
+  }
+</script>

+ 361 - 0
src/dashoo.cn/frontend_web/src/pages/prototype/placeList.vue

@@ -0,0 +1,361 @@
+<template>
+  <div style="width: 100%; overflow-y: auto">
+
+    <el-row :gutter="10" style="margin-top: 10px; width: 100%; overflow: hidden">
+      <el-col :span="4">
+        <el-card class="box-card" style="height: 100vh">
+          <el-tree :data="datatree" :props="defaultProps" default-expand-all></el-tree>
+        </el-card>
+      </el-col>
+
+      <el-col :span="20">
+        <el-tabs value="first">
+          <el-tab-pane label="位置列表" name="first">
+            <el-card class="box-card">
+              <div slot="header">
+                <legend style="color:#436EEE"></legend>
+                <i class="icon icon-database"> 位置列表</i>
+                <span style="float: right;">
+                <el-button size="mini" plain type="primary" @click="dialogFormVisible=true">添加</el-button>
+              </span>
+              </div>
+
+              <el-table
+                :data="tableData1"
+                stripe
+                style="width: 100%; height: 100vh">
+                <el-table-column
+                  prop="seqNo"
+                  label="序号"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="name"
+                  label="位置分类"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="address"
+                  label="位置名称"
+                  width="180">
+                </el-table-column>
+              </el-table>
+
+            </el-card>
+          </el-tab-pane>
+
+          <el-tab-pane label="设备列表" name="second">
+            <el-card class="box-card">
+              <div slot="header">
+                <legend style="color:#436EEE"></legend>
+                <i class="icon icon-database"> 设备列表</i>
+                <span style="float: right;">
+                <el-button size="mini" plain type="primary" @click="dialogFormVisible=true">添加</el-button>
+              </span>
+              </div>
+
+              <el-table
+                :data="tableData2"
+                stripe
+                style="width: 100%; height: 100vh">
+                <el-table-column
+                  prop="seqNo"
+                  label="序号"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="name"
+                  label="设备分类"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="address"
+                  label="地点名称"
+                  width="180">
+                </el-table-column>
+                <el-table-column
+                  prop="address2"
+                  label="设备厂家">
+                </el-table-column>
+                <el-table-column
+                  prop="address3"
+                  label="设备型号">
+                </el-table-column>
+              </el-table>
+
+            </el-card>
+          </el-tab-pane>
+
+        </el-tabs>
+
+      </el-col>
+
+    </el-row>
+
+    <el-dialog title="编辑" :visible.sync="dialogFormVisible">
+      <el-form :model="form">
+        <el-form-item label="序号" :label-width="formLabelWidth">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="设备名称" :label-width="formLabelWidth">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="安装地点" :label-width="formLabelWidth" style="width: 100%;">
+          <el-select v-model="form.region" placeholder="请选择安装地点">
+            <el-option label="1#楼 一 1号位置" value="shanghai"></el-option>
+            <el-option label="2#楼 一 2号位置" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="生产厂家" :label-width="formLabelWidth">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="设备型号" :label-width="formLabelWidth">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="备注" :label-width="formLabelWidth">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+
+
+</template>
+
+<style>
+  .el-table .warning-row {
+    background: oldlace;
+  }
+
+  .el-table .success-row {
+    background: #f0f9eb;
+  }
+</style>
+
+<script>
+  const chartData = [
+    { year: '1951 年', sales: 38 },
+    { year: '1952 年', sales: 52 },
+    { year: '1956 年', sales: 61 },
+    { year: '1957 年', sales: 145 },
+    { year: '1958 年', sales: 48 },
+    { year: '1959 年', sales: 38 },
+    { year: '1960 年', sales: 38 },
+    { year: '1962 年', sales: 38 },
+  ];
+
+  const scale = [{
+    dataKey: 'sales',
+    tickInterval: 20,
+  }];
+
+  const lineData = [
+    { year: '1991', value: 3 },
+    { year: '1992', value: 4 },
+    { year: '1993', value: 3.5 },
+    { year: '1994', value: 5 },
+    { year: '1995', value: 4.9 },
+    { year: '1996', value: 6 },
+    { year: '1997', value: 7 },
+    { year: '1998', value: 9 },
+    { year: '1999', value: 13 },
+  ];
+
+  const lineScale = [{
+    dataKey: 'value',
+    min: 0,
+  },{
+    dataKey: 'year',
+    min: 0,
+    max: 1,
+  }];
+
+  export default {
+    methods: {
+      tableRowClassName({row, rowIndex}) {
+        if (rowIndex === 1) {
+          return 'warning-row';
+        } else if (rowIndex === 3) {
+          return 'success-row';
+        }
+        return '';
+      }
+    },
+    created () {
+
+    },
+    data () {
+      return {
+        chartData,
+        scale,
+        lineData,
+        lineScale,
+        height: 400,
+
+        tableData1: [{
+          seqNo: '1',
+          name: '采油1厂',
+          address: '1号位',
+          address2: '大连制表厂',
+          address3: 'A001'
+        }, {
+          seqNo: '2',
+          name: '2号位',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'B002'
+        }, {
+          seqNo: '3',
+          name: '3号位',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'C003'
+
+        }, {
+          seqNo: '4',
+          name: '4号位',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'D004'
+        },{
+          seqNo: '5',
+          name: '5号位',
+          address: '1号位',
+          address2: '大连制表厂',
+          address3: 'A001'
+        }, {
+          seqNo: '6',
+          name: '6号位',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'B002'
+        }, {
+          seqNo: '7',
+          name: '72号位',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'C003'
+
+        }, {
+          seqNo: '8',
+          name: '82号位',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'D004'
+        }],
+
+        tableData2: [{
+          seqNo: '1',
+          name: '无游梁式抽油机检测',
+          address: '1号位',
+          address2: '大连制表厂',
+          address3: 'A001'
+        }, {
+          seqNo: '2',
+          name: '阻火器检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'B002'
+        }, {
+          seqNo: '3',
+          name: '呼吸阀检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'C003'
+
+        }, {
+          seqNo: '4',
+          name: '空气泡沫产生器检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'D004'
+        },{
+          seqNo: '5',
+          name: '无游梁式抽油机检测',
+          address: '1号位',
+          address2: '大连制表厂',
+          address3: 'A001'
+        }, {
+          seqNo: '6',
+          name: '阻火器检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'B002'
+        }, {
+          seqNo: '7',
+          name: '呼吸阀检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'C003'
+
+        }, {
+          seqNo: '8',
+          name: '空气泡沫产生器检测',
+          address: '2号位',
+          address2: '大连制表厂',
+          address3: 'D004'
+        }],
+
+        datatree: [{
+          label: '采油一厂',
+          children: [{
+            label: '1#采油机',
+            children: [{
+              label: '1-1#位置'
+            }, {
+              label: '1-2#位置'
+            }, {
+              label: '1-3#位置'
+            }, {
+              label: '1-4#位置'
+            }, {
+              label: '1-5#位置'
+            }, {
+              label: '1-6#位置'
+            }]
+          }, {
+            label: '2#采油机',
+            children: [{
+              label: '2-1#位置'
+            }, {
+              label: '2-2#位置'
+            }, {
+              label: '2-3#位置'
+            }, {
+              label: '2-4#位置'
+            }, {
+              label: '2-5#位置'
+            }, {
+              label: '2-6#位置'
+            }]
+          }]
+        }],
+
+        defaultProps: {
+          children: 'children',
+          label: 'label'
+        },
+
+        dialogTableVisible: false,
+        dialogFormVisible: false,
+        form: {
+          name: '',
+          region: '',
+          date1: '',
+          date2: '',
+          delivery: false,
+          type: [],
+          resource: '',
+          desc: ''
+        },
+        formLabelWidth: '120px'
+
+      }
+    }
+  }
+</script>

+ 2 - 2
src/dashoo.cn/frontend_web/src/pages/prototype/towLevelUnitIndex.vue

@@ -3,8 +3,8 @@
     <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect">
       <el-menu-item index="1">部门首页</el-menu-item>
       <!--<el-menu-item index="2">安全分析</el-menu-item>-->
-      <el-menu-item index="3">设备台账</el-menu-item>
-      <el-menu-item index="4">报告台账</el-menu-item>
+      <el-menu-item index="3">设备统计</el-menu-item>
+      <el-menu-item index="4">报告统计</el-menu-item>
     </el-menu>
     <tow-level-center v-if="activeIndex==1"></tow-level-center>
     <safe-check v-if="activeIndex==2"></safe-check>