wyh hace 1 año
padre
commit
3dea2255e2

+ 207 - 0
itdmWeb/src/views/module-iTDM/itdmGuoqi/itdmChuanganqiGq.vue

@@ -0,0 +1,207 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="型号">
+              <a-input placeholder="请输入型号" v-model="queryParam.xinghao"></a-input>
+            </a-form-item>
+          </a-col> -->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="序列号">
+              <a-input placeholder="请输入序列号" v-model="queryParam.xuliehao"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a> -->
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <!-- <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('传感器管理')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload> -->
+      <!-- 高级查询区域 -->
+      <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div> -->
+
+    <!-- table区域-begin -->
+    <div>
+      <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div> -->
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: 'ItdmChuanganqiList',
+    mixins:[JeecgListMixin, mixinDevice],
+    data () {
+      return {
+        description: '传感器管理管理页面',
+        // 表头
+        columns: [
+        //   {
+        //     title: '#',
+        //     dataIndex: '',
+        //     key:'rowIndex',
+        //     width:60,
+        //     align:"center",
+        //     customRender:function (t,r,index) {
+        //       return parseInt(index)+1;
+        //     }
+        //   },
+          {
+            title:'型号',
+            align:"center",
+            dataIndex: 'xinghao'
+          },
+          {
+            title:'序列号',
+            align:"center",
+            dataIndex: 'xuliehao'
+          },
+          {
+            title:'灵敏度',
+            align:"center",
+            dataIndex: 'lingmindu'
+          },
+          {
+            title:'有效期',
+            align:"center",
+            dataIndex: 'youxiaoqi'
+          },
+        //   {
+        //     title: '操作',
+        //     dataIndex: 'action',
+        //     align:"center",
+        //     fixed:"right",
+        //     width:147,
+        //     scopedSlots: { customRender: 'action' }
+        //   }
+        ],
+        url: {
+          list: "/chuanganqi/itdmChuanganqi/expireList",
+          delete: "/chuanganqi/itdmChuanganqi/delete",
+          deleteBatch: "/chuanganqi/itdmChuanganqi/deleteBatch",
+          exportXlsUrl: "/chuanganqi/itdmChuanganqi/exportXls",
+          importExcelUrl: "chuanganqi/itdmChuanganqi/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'xinghao',text:'型号',dictCode:''})
+        fieldList.push({type:'string',value:'xuliehao',text:'序列号',dictCode:''})
+        fieldList.push({type:'string',value:'lingmindu',text:'灵敏度',dictCode:''})
+        fieldList.push({type:'string',value:'youxiaoqi',text:'有效期',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+  ::v-deep .ant-card-body{
+    padding-top: 0px !important;
+    padding-left: 10px !important;
+    padding-right: 10px !important;
+  }
+</style>

+ 220 - 0
itdmWeb/src/views/module-iTDM/itdmGuoqi/itdmDeviceGq.vue

@@ -0,0 +1,220 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <!-- <a-col :xl="10" :lg="11" :md="12" :sm="24">
+            <a-form-item label="创建时间">
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.createTime_begin"></j-date>
+              <span class="query-group-split-cust"></span>
+              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.createTime_end"></j-date>
+            </a-form-item>
+          </a-col> -->
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="设备名称">
+              <a-input placeholder="请输入设备名称" v-model="queryParam.deviceName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="设备类型">
+              <a-input placeholder="请输入设备类型" v-model="queryParam.deviceType"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--              </a>-->
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('1立方温箱历史数据')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
+<!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
+<!--        <a-menu slot="overlay">-->
+<!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
+<!--        </a-menu>-->
+<!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
+<!--      </a-dropdown>-->
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
+<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
+<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
+<!--      </div>-->
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        
+        <!-- <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template> -->
+
+        <!-- <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span> -->
+
+      </a-table>
+    </div>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import { downFile } from '@/api/manage'
+
+  export default {
+    name: 'ItdmWenxiangHistory1List',
+    mixins:[JeecgListMixin, mixinDevice],
+    data () {
+      return {
+        description: '1立方温箱历史数据管理页面',
+        // 表头
+        columns: [
+          // {
+          //   title: '#',
+          //   dataIndex: '',
+          //   key:'rowIndex',
+          //   width:60,
+          //   align:"center",
+          //   customRender:function (t,r,index) {
+          //     return parseInt(index)+1;
+          //   }
+          // },
+          // {
+          //   title:'设备id',
+          //   align:"center",
+          //   dataIndex: 'deviceId_dictText'
+          // },
+          {
+            title:'设备名称',
+            align:"center",
+            dataIndex: 'deviceName'
+          },
+          {
+            title:'设备编号',
+            align:"center",
+            dataIndex: 'deviceNo'
+          },
+          {
+            title:'设备规格',
+            align:"center",
+            dataIndex: 'deviceSpecification'
+          },
+          {
+            title:'设备型号',
+            align:"center",
+            dataIndex: 'deviceModel'
+          },
+          {
+            title:'设备状态',
+            align:"center",
+            dataIndex: 'deviceStatus_dictText'
+          },
+          {
+            title:'设备类型',
+            align:"center",
+            dataIndex: 'deviceType'
+          },
+          {
+            title:'有效期',
+            align:"center",
+            dataIndex: 'deviceLife'
+          },
+          // {
+          //   title: '操作',
+          //   dataIndex: 'action',
+          //   align:"center",
+          //   fixed:"right",
+          //   width:147,
+          //   scopedSlots: { customRender: 'action' }
+          // }
+        ],
+        url: {
+          list: "/itdmDevice/itdmDevice/expireList",
+
+        },
+        dictOptions:{},
+      }
+    },
+    created() {
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+  ::v-deep .ant-card-body{
+    padding-top: 0px !important;
+    padding-left: 10px !important;
+    padding-right: 10px !important;
+  }
+  .y {
+    color: red;
+  }
+</style>

+ 56 - 0
itdmWeb/src/views/module-iTDM/itdmGuoqi/itdmGuoqiList.vue

@@ -0,0 +1,56 @@
+<template>
+        <a-tabs default-active-key="1" @change="callback" class="card-container">
+          <a-tab-pane key="1" tab="库存过期查看">
+            <itdm-sample-expire-real-list :key="timer1"></itdm-sample-expire-real-list>
+          </a-tab-pane>
+          <a-tab-pane key="2" tab="设备过期" force-render>
+            <itdm-device-gq :key="timer2"></itdm-device-gq>
+          </a-tab-pane>
+          <a-tab-pane key="3" tab="传感器过期" force-render>
+            <itdm-chuanganqi-gq :key="timer3"></itdm-chuanganqi-gq>
+          </a-tab-pane>
+        </a-tabs>
+</template>
+
+<script>
+import ItdmSampleExpireRealList from '../inventory/ItdmSampleExpireRealList.vue';
+import ItdmDeviceGq from './itdmDeviceGq.vue';
+import itdmChuanganqiGq from './itdmChuanganqiGq.vue';
+
+
+  export default {
+    name: 'itdmDeviceDataList',
+    components: {
+        ItdmSampleExpireRealList,
+        ItdmDeviceGq,
+        itdmChuanganqiGq
+    },
+    data () {
+      return {
+        timer1: '',
+        timer2: '',
+        timer3: '',
+      }
+    },
+    methods: {
+      submitCallback(){
+        this.$emit('ok');
+      },
+      callback(key) {
+        if (key == 1) {
+          this.timer1 = new Date().getTime()
+        } else if (key == 2) {
+          this.timer2 = new Date().getTime()
+        } else if (key == 3) {
+          this.timer3 = new Date().getTime()
+        }
+      },
+    }
+  }
+</script>
+
+<style scoped>
+.ant-card-body{
+    padding-top: 10px !important;
+}
+</style>