Merge remote-tracking branch 'guAn_client/master'

src/api/api.js

@@ -2,10 +2,14 @@ import { getAction, deleteAction, putAction, postAction, httpAction } from '@/ap
 import Vue from 'vue'
 import {UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
 
-//固安
+//大屏参数
 const addDashParam = (params)=>postAction("/guan/dashboardparam/add",params);
 const editDashParam = (params)=>putAction("/guan/dashboardparam/edit",params);
 
+//测试信息
+const addGuanTest = (params)=>postAction("/guan/test/add",params);
+const editGuanTest = (params)=>putAction("/guan/test/edit",params);
+
 //角色管理
 const addRole = (params)=>postAction("/sys/role/add",params);
 const editRole = (params)=>putAction("/sys/role/edit",params);
@@ -107,6 +111,9 @@ export {
   addDashParam,
   editDashParam,
 
+  addGuanTest,
+  editGuanTest,
+
   addRole,
   editRole,
   checkRoleCode,

src/views/modules_guAn/dashboardparam/index.vue

@@ -62,7 +62,7 @@
   import Vue from 'vue'
 
   export default {
-    name: "edit",
+    name: "dashboardparam",
     mixins:[JeecgListMixin],
     components: {DashParamModal},
     data() {

src/views/modules_guAn/guantest/index.vue

@@ -0,0 +1,172 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 左侧面板 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="12">
+          <a-col :md="7" :sm="8">
+            <a-form-item label="试验名称" :labelCol="{span: 6}" :wrapperCol="{span: 14, offset: 1}">
+              <a-input placeholder="请输入试验名称" v-model="queryParam.testname"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="7" :sm="8">
+            <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>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+
+      <div class="table-operator" style="border-top: 5px">
+        <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> -->
+      </div>
+
+      <a-table
+        ref="table"
+        rowKey="id"
+        size="middle"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        @change="handleTableChange">
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">
+            <a-icon type="edit"/>
+            编辑
+          </a>
+          <a-divider type="vertical"/>
+          <a-popconfirm title="确定删除吗?" @confirm="() =>handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+        </span>
+      </a-table>
+
+    </div>
+    <guan-test-modal ref="modalForm" @ok="modalFormOk"></guan-test-modal>  <!-- 编辑 -->
+  </a-card>
+</template>
+
+<script>
+  import { filterObj } from '@/utils/util';
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import GuanTestModal from './testmodal'
+  import { getAction } from '@/api/manage'
+  import { UI_CACHE_DB_DICT_DATA } from "@/store/mutation-types"
+  import Vue from 'vue'
+
+  export default {
+    name: "guantest",
+    mixins:[JeecgListMixin],
+    components: {GuanTestModal},
+    data() {
+      return {
+        description: '这是试验信息页面',
+        visible: false,
+        // 查询条件
+        queryParam: {
+          testname: "",
+        },
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key: 'rowIndex',
+            width: 120,
+            align: "center",
+            customRender: function (t, r, index) {
+              return parseInt(index) + 1;
+            }
+          },
+          {
+            title: '试验名称',
+            align: "left",
+            dataIndex: 'testname',
+          },
+          {
+            title: '试验类型',
+            align: "left",
+            dataIndex: 'testtype',
+          },
+          {
+            title: '试验条件',
+            align: "left",
+            dataIndex: 'conditions',
+          },
+          {
+            title: '客户名称',
+            align: "left",
+            dataIndex: 'clientname',
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align: "center",
+            scopedSlots: {customRender: 'action'},
+          }
+        ],
+        dict: "",
+        labelCol: {
+          xs: {span: 8},
+          sm: {span: 5},
+        },
+        wrapperCol: {
+          xs: {span: 16},
+          sm: {span: 19},
+        },
+        url: {
+          list: "/guan/test/list",
+          delete: "/guan/test/delete",
+          exportXlsUrl: "/guan/test/exportXls",
+          importExcelUrl: "/guan/test/importExcel",
+        },
+      }
+    },
+    computed: {
+      importExcelUrl: function () {
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      }
+    },
+    methods: {
+      getQueryParams() {
+        var param = Object.assign({}, this.queryParam, this.isorter);
+        param.field = this.getQueryField();
+        param.pageNo = this.ipagination.current;
+        param.pageSize = this.ipagination.pageSize;
+        if (this.superQueryParams) {
+          param['superQueryParams'] = encodeURI(this.superQueryParams)
+          param['superQueryMatchType'] = this.superQueryMatchType
+        }
+        return filterObj(param);
+      },
+    add() {
+      this.edit(this.modelDefault)
+    },
+    edit(record) {
+      this.model = Object.assign({}, record)
+      this.visible = true
+    },
+      // 重置字典类型搜索框的内容
+      searchReset() {
+        var that = this;
+        that.queryParam.testname = "";
+        that.loadData(this.ipagination.current);
+      },
+    },
+    watch: {
+      // openKeys(val) {
+      //   console.log('openKeys', val)
+      // },
+    },
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less'
+</style>

src/views/modules_guAn/guantest/testmodal.vue

@@ -0,0 +1,152 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form-model  ref="form" :model="model" :rules="validatorRules">
+
+        <a-form-model-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          prop="testname"
+          label="试验名称">
+          <a-input placeholder="请输入试验名称" v-model="model.testname"/>
+        </a-form-model-item>
+
+        <a-form-model-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          prop="testtype"
+          label="试验类型">
+          <a-input placeholder="请输入试验类型" v-model="model.testtype" />
+        </a-form-model-item>
+
+        <a-form-model-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          prop="conditions"
+          label="试验条件">
+          <a-textarea :rows="5" placeholder="请输入试验条件" v-model="model.conditions" />
+        </a-form-model-item>
+
+        <a-form-model-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          prop="clientname"
+          label="客户名称">
+          <a-input placeholder="请输入客户名称" v-model="model.clientname" />
+        </a-form-model-item>
+
+        <a-form-model-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          prop="linker"
+          label="联系人">
+          <a-input placeholder="请输入联系人" v-model="model.linker" />
+        </a-form-model-item>
+
+      </a-form-model>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import pick from 'lodash.pick'
+  import {addGuanTest, editGuanTest} from '@/api/api'
+  import { getAction } from '@api/manage'
+
+  export default {
+    name: "GuanTestModal",
+    data() {
+      return {
+        title: "操作",
+        visible: false,
+        // visibleCheck: true,
+        model: {},
+        status: 1,
+        labelCol: {
+          xs: {span: 24},
+          sm: {span: 5},
+        },
+        wrapperCol: {
+          xs: {span: 24},
+          sm: {span: 16},
+        },
+        confirmLoading: false,
+        validatorRules: {
+          testname:  [{required: true, message: '请输入试验名称!'}],
+          testtype:  [{required: true, message: '请输入试验类型!'}],
+        },
+      }
+    },
+    created() {
+    },
+    methods: {
+      add() {
+        //初始化默认值
+        this.edit({});
+      },
+      edit(record) {
+        // this.status = record.status;
+        // this.visibleCheck = (record.status == 1) ? true : false;
+        this.model = Object.assign({}, record);
+        console.log(this.model)
+        // this.model.status = this.status;
+        this.visible = true
+      },
+    //   onChose(checked) {
+    //     // if (checked) {
+    //     //   this.status = 1;
+    //     //   this.visibleCheck = true;
+    //     // } else {
+    //     //   this.status = 0;
+    //     //   this.visibleCheck = false;
+    //     // }
+    //   },
+      // 确定
+      handleOk() {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let obj;
+            if (!this.model.id) {
+              obj = addGuanTest(this.model);
+            } else {
+              obj = editGuanTest(this.model);
+            }
+            obj.then((res) => {
+              if (res.success) {
+                that.$message.success(res.message);
+                that.$emit('ok');
+              } else {
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }else{
+            return false;
+          }
+        })
+      },
+      // 关闭
+      handleCancel() {
+        this.close();
+      },
+      close() {
+        this.$emit('close');
+        this.visible = false;
+        this.$refs.form.resetFields();
+      },
+    }
+  }
+</script>