heyang

src/api/gasManage3_0/gasManage.js

@@ -537,6 +537,14 @@ export function gasCategoryList(query) {
     params: query
   })
 }
+//危险源类型-列表
+export function dangerList(query) {
+  return request({
+    url: '/system/dict/data/list?dictType=lab_hazard_type',
+    method: 'get',
+    params: query
+  })
+}
 //规格管理-详情
 export function specificationInfo(query) {
   return request({

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -1011,7 +1011,7 @@
         display: flex;
         flex-direction: column;
         margin-right:20px;
-        overflow: hidden;
+        overflow: hidden ;
       }
       .overflow-box{
         overflow: hidden;

src/views/comprehensive/message/labNotify/addPage.vue

@@ -18,6 +18,17 @@
           <el-radio :label="2">校院通知</el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="执行日期" prop="executionTime" class="form-item" v-if="form.notifyType==1">
+        <el-date-picker
+          :clearable="false"
+          v-model="form.executionTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="date"
+          placeholder="请选择执行日期"
+        ></el-date-picker>
+      </el-form-item>
       <el-form-item label="摘要" prop="conAbstract" class="form-item">
         <el-input type="textarea" v-model="form.conAbstract"
                   :rows="6" maxLength="250" placeholder="请输入内容"

src/views/comprehensive/message/labNotify/index.vue

@@ -52,7 +52,7 @@
         <el-table-column label="类型" align="left" prop="notifyType">
           <template slot-scope="scope">{{scope.row.notifyType == 1?'工作通知':(scope.row.notifyType == 2?'校院通知':'')}}</template>
         </el-table-column>
-        <el-table-column label="发布人" align="left" prop="createUsername" />
+        <el-table-column label="发布人" align="left" prop="createBy" />
         <el-table-column label="发布时间" align="left" prop="createTime" />
         <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160" v-if="tableButtonType">
           <template slot-scope="scope">

src/views/gasManage3_0/manage/recognizerManage/recognizerManage.vue

@@ -5,7 +5,7 @@
       <el-form-item label="关键字" prop="name">
         <el-input
           v-model="queryParams.searchValue"
-          placeholder="设备编号/所属实验室"
+          placeholder="识别器名称/设备编号/所属实验室"
           clearable
           maxLength="30"
           size="small"
@@ -77,14 +77,9 @@
         <el-form-item label="检测门编号" prop="hardwareNum">
           <el-input v-model="form.hardwareNum" placeholder="请输入检测门编号" />
         </el-form-item>
-        <el-form-item label="IP地址" >
+        <el-form-item label="IP地址" prop="ipAddress">
           <el-input v-model="form.ipAddress" placeholder="请输入IP地址" />
         </el-form-item>
-        <el-form-item label="供应商">
-          <el-select v-model="form.manufacturerType" placeholder="请选择" style="width:320px;">
-            <el-option :label="item.dictLabel" :value="item.dictValue" v-for="(item,index) in materialTypeList" :key="index"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="信道数量" >
           <el-select v-model="form.channels" placeholder="请选择信道数量">
             <el-option  label="1通道" value="1"></el-option>
@@ -132,13 +127,33 @@ import {
   recognizerDelete,
   recognizerList,
   recognizerSwitch,
-  supplierStop, RFIDTypeList
+  supplierStop
 } from '@/api/gasManage3_0/gasManage'
 
 export default {
   name: "Sensor",
   components: { Treeselect },
   data() {
+    let validatePort1 = (rule, value, callback) => {
+      let reg =
+
+        /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
+
+      if (value == "") {
+
+        callback(new Error("请输入IP地址"));
+
+      } else if (value !== "" && reg.test(value) === false) {
+
+        callback(new Error("请输入正确格式IP如(11.11.11.11)"));
+
+      } else {
+
+        callback();
+
+      }
+
+    }
     return {
       // 遮罩层
       loading: true,
@@ -154,7 +169,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize:20,
+        pageSize: 10,
         searchValue:'',
         type:'RFID_RECOGNIZER'
       },
@@ -168,9 +183,7 @@ export default {
         channels:4,//信道
         sessionIndex:0,//设备推送频率
         uniformPower:33,//设备推送频率
-        manufacturerType:'',//供应商
       },
-      materialTypeList:[],
       // 表单校验
       rules: {
         name:[
@@ -181,7 +194,11 @@ export default {
         ],
         subjectId:[
           {required: true, message: '所属实验室不能为空', trigger: 'blur'}
-        ]
+        ],
+        ipAddress:[
+          {required: true,message: validatePort1.Error, validator: validatePort1, trigger: 'blur'}
+        ],
+
       },
     };
   },
@@ -190,18 +207,8 @@ export default {
   mounted(){
     this.getList();
     this.getSubjectAddDictList();
-    this.supplierTypeList();
   },
   methods: {
-    //供应商类型
-    supplierTypeList(){
-      let _this=this;
-      RFIDTypeList().then( response => {
-        let res=response.rows;
-        _this.materialTypeList=res;
-
-      });
-    },
     //状态
     switchChange(row){
       console.log(row)
@@ -295,7 +302,6 @@ export default {
       this.form.channels=row.channels+''
       this.form.sessionIndex=row.sessionIndex+''
       this.form.uniformPower=row.uniformPower
-      this.form.manufacturerType=row.manufacturerType+''
 
 
     },
@@ -327,15 +333,15 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm('确认删除传感器吗?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return recognizerDelete(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return recognizerDelete(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -348,26 +354,26 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-  .certification{
-    display: flex!important;
-    flex-direction: column;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-    padding:20px!important;
-    .button-box{
-      width:200px;
-      display: flex;
-    }
-    .form-box{
-    }
+.certification{
+  display: flex!important;
+  flex-direction: column;
+  box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
+  padding:20px!important;
+  .button-box{
+    width:200px;
+    display: flex;
+  }
+  .form-box{
   }
+}
 
 
 </style>
 <style lang="scss">
-  .add-hardware-dialog-box{
-    .el-form-item__error {
-      left: 21%!important;
-    }
+.add-hardware-dialog-box{
+  .el-form-item__error {
+    left: 21%!important;
   }
+}
 </style>
 

src/views/hazardManagement/hazard/addLaboratory.vue

@@ -12,7 +12,7 @@
           size="small"
         />
       </el-form-item>
-      <el-form-item label="编号：" prop="code" style="margin-bottom:40px;">
+      <el-form-item label="型号：" prop="code" style="margin-bottom:40px;">
         <el-input
           v-model="form.code"
           maxlength="10"
@@ -21,6 +21,11 @@
           size="small"
         />
       </el-form-item>
+      <el-form-item label="危险源类型：" prop="hazardTypeMode">
+        <el-select v-model="form.hazardTypeMode" placeholder="请选择">
+          <el-option :label="item.dictLabel" :value="item.dictValue" v-for="(item,index) in materialTypeList" :key="index"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="详情：" prop="content">
         <UEditor ref="UEditor" :content="form.content" :min-height="192" />
         <!--<ueditortwo :config=config ref="ueditor"></ueditortwo>-->
@@ -34,129 +39,149 @@
 </template>
 
 <script>
-  import { getHazard, addHazard, updateHazard } from "@/api/laboratory/hazard";
-  export default {
-    props:{
-      hazardId: null,
+import { getHazard, addHazard, updateHazard } from "@/api/laboratory/hazard";
+import { dangerList, gasCategoryList } from '@/api/gasManage3_0/gasManage'
+export default {
+  props:{
+    hazardId: null,
+  },
+  name: 'addLaboratory',
+  data() {
+    return {
+      getType:false,
+      form:{},
+      // 表单校验
+      rules: {
+        chName: [
+          { required: true, message: "请输入标题", trigger: "blur" },
+          { required: true, message: "请输入标题", validator: this.spaceJudgment, trigger: "blur" }
+        ],
+        code: [
+          { required: true, message: "请输入编号", trigger: "blur" },
+          { required: true, message: "请输入编号", validator: this.spaceJudgment, trigger: "blur" }
+        ],
+        content: [
+          { required: true, message: "请编辑详情", trigger: "change" },
+          { required: true, message: "请编辑详情", validator: this.spaceJudgmentHTML, trigger: "blur" }
+        ],
+        hazardTypeMode: [
+          { required: true, message: "请选择危险源类型", trigger: "change" },
+          { required: true, message: "请选择危险源类型", validator: this.spaceJudgmentHTML, trigger: "blur" }
+        ],
+
+
+      },
+      config: {
+        autoHeightEnabled: false,
+        autoFloatEnabled: true,
+        initialContent: '请输入内容',   //初始化编辑器的内容,也可以通过textarea/script给值，看官网例子
+        autoClearinitialContent: true, //是否自动清除编辑器初始内容，注意：如果focus属性设置为true,这个也为真，那么编辑器一上来就会触发导致初始化的内容看不到了
+        initialFrameWidth: null,
+        initialFrameHeight: 450,
+        BaseUrl: '',
+        // serverUrl: '//192.168.1.8:9300/exec',
+        //serverUrl: '//180.76.134.43:30002/file/exec',
+        serverUrl: '//'+process.env.VUE_APP_BASE_API+'/file/exec',
+        UEDITOR_HOME_URL: '/public/ueditor-1.4.3.3/'
+      },
+      materialTypeList:[],
+    }
+  },
+  created() {
+    // this.reset();
+    console.log(this.form.content)
+    this.form.id = this.hazardId
+    if(this.form.id){
+      this.handleUpdate()
+    }else{
+      this.getType = true;
+    }
+
+    this.getDicts("combustibility").then(response => {
+      this.combustibilitys= response.data;
+    })
+  },
+  methods: {
+    //获取危险源类型
+    dangerList(){
+      let _this=this;
+      dangerList().then( response => {
+        let res=response.rows;
+        _this.materialTypeList=res;
+      });
+    },
+    leftButtonClick(){
+      this.$parent.offLaboratoryButton();
     },
-    name: 'addLaboratory',
-    data() {
-      return {
-        getType:false,
-        form:{},
-        // 表单校验
-        rules: {
-          chName: [
-            { required: true, message: "请输入标题", trigger: "blur" },
-            { required: true, message: "请输入标题", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-          code: [
-            { required: true, message: "请输入编号", trigger: "blur" },
-            { required: true, message: "请输入编号", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-          content: [
-            { required: true, message: "请编辑详情", trigger: "change" },
-            { required: true, message: "请编辑详情", validator: this.spaceJudgmentHTML, trigger: "blur" }
-          ],
-        },
-        config: {
-          autoHeightEnabled: false,
-          autoFloatEnabled: true,
-          initialContent: '请输入内容',   //初始化编辑器的内容,也可以通过textarea/script给值，看官网例子
-          autoClearinitialContent: true, //是否自动清除编辑器初始内容，注意：如果focus属性设置为true,这个也为真，那么编辑器一上来就会触发导致初始化的内容看不到了
-          initialFrameWidth: null,
-          initialFrameHeight: 450,
-          BaseUrl: '',
-          // serverUrl: '//192.168.1.8:9300/exec',
-          //serverUrl: '//180.76.134.43:30002/file/exec',
-          serverUrl: '//'+process.env.VUE_APP_BASE_API+'/file/exec',
-          UEDITOR_HOME_URL: '/public/ueditor-1.4.3.3/'
-        },
-      }
+    rightButtonClick(){
+      this.form.content = this.$refs.UEditor.text;
+      this.submitForm()
     },
-    created() {
-      // this.reset();
-      console.log(this.form.content)
-      this.form.id = this.hazardId
-      if(this.form.id){
-        this.handleUpdate()
-      }else{
+    /** 修改按钮操作 */
+    handleUpdate() {
+      getHazard(this.form.id).then(response => {
+        this.form = response.data;
+        this.form.hazardTypeMode=response.data.hazardTypeMode+''
+        this.form.content = unescape(response.data.content);
         this.getType = true;
-      }
-
-      this.getDicts("combustibility").then(response => {
-        this.combustibilitys= response.data;
-      })
+      });
     },
-    methods: {
-      leftButtonClick(){
-        this.$parent.offLaboratoryButton();
-      },
-      rightButtonClick(){
-        this.form.content = this.$refs.UEditor.text;
-        this.submitForm()
-      },
-      /** 修改按钮操作 */
-      handleUpdate() {
-        getHazard(this.form.id).then(response => {
-          this.form = response.data;
-          this.form.content = unescape(response.data.content);
-          this.getType = true;
-        });
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-            this.form.content = escape(this.form.content);
-            // this.form.ignitionPoint = this.form.ignitionPoint + '℃';
-            if (this.form.id != null) {
-              updateHazard(this.form).then(response => {
-                if(response.code = 200){
-                  this.msgSuccess("修改成功");
-                  this.$parent.clickPageTypeOne()
-                }
-              });
-            } else {
-              addHazard(this.form).then(response => {
-                if(response.code = 200){
-                  this.msgSuccess("新增成功");
-                  this.$parent.clickPageTypeOne()
-                }
-              });
-            }
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.form.content = escape(this.form.content);
+          // this.form.ignitionPoint = this.form.ignitionPoint + '℃';
+          if (this.form.id != null) {
+            updateHazard(this.form).then(response => {
+              if(response.code = 200){
+                this.msgSuccess("修改成功");
+                this.$parent.clickPageTypeOne()
+              }
+            });
+          } else {
+            addHazard(this.form).then(response => {
+              if(response.code = 200){
+                this.msgSuccess("新增成功");
+                this.$parent.clickPageTypeOne()
+              }
+            });
           }
-        });
-      },
-    }
+        }
+      });
+    },
+  },
+  mounted() {
+    this.dangerList();
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  .addLaboratory{
-    padding:40px 20px;
-    .button-box{
-      margin:0 auto;
-      width:220px;
-      display: flex;
-      p{
-        cursor:pointer;
-        width: 100px;
-        height:40px;
-        line-height:40px;
-        font-size:14px;
-        text-align: center;
-      }
-      p:nth-child(1){
-        margin-right:20px;
-        color:#999;
-        background:#e0e0e0;
-        border-radius:4px;
-      }
-      p:nth-child(2){
-        color:#fff;
-        border-radius:4px;
-      }
+.addLaboratory{
+  padding:40px 20px;
+  .button-box{
+    margin:0 auto;
+    width:220px;
+    display: flex;
+    p{
+      cursor:pointer;
+      width: 100px;
+      height:40px;
+      line-height:40px;
+      font-size:14px;
+      text-align: center;
+    }
+    p:nth-child(1){
+      margin-right:20px;
+      color:#999;
+      background:#e0e0e0;
+      border-radius:4px;
+    }
+    p:nth-child(2){
+      color:#fff;
+      border-radius:4px;
     }
   }
+}
 </style>

src/views/home.vue

@@ -435,6 +435,7 @@
     background-image:url("../assets/ZDimages/home/img_tydlpt_bg.png")!important;
     -webkit-background-size: 100%;
     background-size: 100%;
+
   }
   .home {
     height:100%;