设备、人员管理看板

src/views/peopleManages/taskStatistics/index.vue

@@ -445,7 +445,7 @@ export default {
           }
         ],
         color: ["#FFFF00", "#99CC00", "#6666FF", "#FF6666"],
-        config: { title: "职称显示", idSelector: "ranksid" },
+        config: { title: "职称统计", idSelector: "ranksid" },
       },
       personInfoData: {
         //员工基本信息轮播表

src/views/sample/sampleView.vue

@@ -2,7 +2,7 @@
   <div class="sample-content">
     <!-- 表格組件 -->
     <div class="top-content">
-      <div class="top-title">样品间可视化11</div>
+      <div class="top-title">样品间可视化</div>
       <div class="query-content">
         <el-form :inline="true" :model="formInline" class="demo-form-inline">
           <el-form-item label="房间号：">
@@ -21,7 +21,6 @@
           </el-form-item>
           <!-- v-show="leixingcare" -->
           <el-form-item
-            style="margin-left: 50px"
             prop="title"
             label="区域名称："
           >
@@ -38,7 +37,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item style="margin-left: 50px" label="货架号：">
+          <el-form-item style="margin-left: 20px" label="货架号：">
             <el-select
               v-model="formInline.huo_jia_value"
               placeholder="请选择货架号"
@@ -54,7 +53,6 @@
           </el-form-item>
           <el-form-item
             v-show="!leixingcare"
-            style="margin-left: 50px"
             label="挂架号："
           >
             <el-select
@@ -70,6 +68,12 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="默认存放位置">
+            <el-input v-model="formInline.yang_pin_cun_fang" disabled></el-input>
+          </el-form-item>
+          <el-form-item label="默认留样位置">
+            <el-input v-model="formInline.yang_pin_liu_yang" disabled></el-input>
+          </el-form-item>
           <el-form-item>
             <button
               type="button"
@@ -79,6 +83,16 @@
               <i class="ibps-icon-search"></i><span>查询</span>
             </button>
           </el-form-item>
+          <el-form-item>
+            <button
+              type="button"
+              class="el-button el-button--primary el-button--mini"
+              @click="switchBtn"
+            >
+              <i v-if="ifweizhixuanze" class="el-icon-video-pause" style="font-size:16px"></i>
+              <i v-else class="el-icon-video-play" style="font-size:16px"></i><span>选择默认位置</span>
+            </button>
+          </el-form-item>
         </el-form>
       </div>
     </div>
@@ -159,6 +173,7 @@
                       background:
                         it.wei_zhi_zhuang_ta == '空余' ? '#E6A23C' : '',
                     }"
+                    @click="clickWeiZhiXuanZei(it)"
                   >
                     <div class="top-dsc">
                       <div class="position">
@@ -222,6 +237,10 @@ export default {
         qu_yu_value: "",
         huo_jia_value: "",
         gua_jia_value: "",
+        yang_pin_cun_fang:'',
+        cun_fang_id_:'',
+        yang_pin_liu_yang:'',
+        liu_yang_id_:'',
       },
       listData: [],
       warehouseOptions: [],
@@ -240,6 +259,13 @@ export default {
       // pagination: {},
       // secondshow: false,
       desString: "",
+      ifweizhixuanze:false,
+      // morenweizhi:{
+      //   yang_pin_cun_fang:'',
+      //   cun_fang_id_:'',
+      //   yang_pin_liu_yang:'',
+      //   liu_yang_id_:'',
+      // }
     };
   },
   filters: {
@@ -254,11 +280,10 @@ export default {
   created() {
     this.loadQueryData();
     this.firstLoadViewData();
+    this.morenweizhiLoad();
   },
   methods: {
     firstLoadViewData() {
-      //t_mjypcfwz  存放位置
-      //
       var this_ = this;
       var sqlString = `select * from t_ypcfwz where fang_jian_lei_xin = '样品间' and qu_yu_ ='待检区' and huo_jia_hao_ = '4' and huo_jia_lei_xing_ = '医用冷藏箱'`;
       this.huojiashow = "4号医用冷藏箱";
@@ -411,6 +436,55 @@ export default {
         this_.gua_jia_arr = response.variables.data;
       });
     },
+    switchBtn(){
+      this.ifweizhixuanze = !this.ifweizhixuanze;
+      if(this.ifweizhixuanze){
+        this.$message({
+          message: '点击视图位置，选择对应的样品存放位置',
+          type: 'success'
+        });
+      }else{
+        this.$message({
+          message: '已关闭样品默认位置选择',
+          type: 'success'
+        });
+      }
+    },
+    async morenweizhiLoad(){//样品默认位置选择加载
+      let data = []
+      var sqlString ="select * from t_ypwzmrxzb";
+      await curdPost("sql", sqlString).then((response) => {
+        data = response.variables.data[0];
+      })
+      .catch((err) => {
+        console.log(err, "err------>");
+      });
+      debugger
+      this.formInline.yang_pin_cun_fang = data.yang_pin_cun_fang;
+      this.formInline.cun_fang_id_ = data.cun_fang_id_;
+      this.formInline.yang_pin_liu_yang = data.yang_pin_liu_yang;
+      this.formInline.liu_yang_id_ = data.liu_yang_id_;
+    },
+    clickWeiZhiXuanZei(data){//点击视图选择位置
+      if(!this.ifweizhixuanze){
+        return
+      }
+      // alert(data.id_);
+      if(this.formInline.qu_yu_value =='待检区' || !this.formInline.qu_yu_value){
+        this.formInline.yang_pin_cun_fang = data.wei_zhi_bian_hao_;
+        this.formInline.cun_fang_id_ = data.id_;
+      }
+      if(this.formInline.qu_yu_value =='留样区'){
+        this.formInline.yang_pin_liu_yang = data.wei_zhi_bian_hao_;
+        this.formInline.liu_yang_id_ = data.id_;
+      }
+    curdPost('update','{"tableName":"t_ypwzmrxzb","paramWhere":{"id_":"1"},"paramCond":{"yang_pin_cun_fang":"'+this.formInline.yang_pin_cun_fang+'","cun_fang_id_":"'+this.formInline.cun_fang_id_+'","yang_pin_liu_yang":"'+this.formInline.yang_pin_liu_yang+'","liu_yang_id_":"'+ this.formInline.liu_yang_id_+'"}}')
+    .then(res => {
+        console.log(res, "当前补货状态更新成功");
+    }).catch(err=>{
+      alert("默认位置更新错误")
+    })
+    }
   },
   watch: {
     "formInline.fang_jian_hao_value": function (newdata, olddata) {

src/views/system/jbdHome/board/equipmentBoard.vue

@@ -28,7 +28,7 @@
             </div>
             <dv-decoration-2 :reverse="true" style="width:2%;height: 100%;" />
             <div class="middleCardRight1">
-              <CarouselTabl v-if="MiddleLeftPieViewList.data.length" :info="shiyonglvConfig" title="设备使用记录列表" isup=isup />
+              <CarouselTabl v-if="shiyonglvConfig.data.length" :info="shiyonglvConfig" title="设备使用记录列表" isup=isup />
             </div>
             <!-- <div class="middleCardCenter">
             <middleCard v-if="eBgRateData.data.length" :info="eBgRateData" ref="middleCardCenter"/>
@@ -110,9 +110,10 @@ export default {
       jianDingjiaoZhunSheBeiData: {},
       weiHuSheBeiData: {},
       shiyonglvConfig: {
-        header: ["名称","编号","部门","使用人","使用时间","存放位置", "状态", "频率"],
+        // header: ["名称","编号","部门","使用人","使用时间","存放位置", "状态", "频率"],
+        header: ["名称","编号","使用时间","存放位置", "状态", "频率"],
         data: [],
-        columnWidth: ["130","120","120","90","110","120"],
+        columnWidth: ["180","130","120","150","110","120"],
         rowNum: 6,
       },
       bottomData: {},
@@ -466,8 +467,8 @@ export default {
             data1 = [];
             data1.push(item.she_bei_ming_chen);
             data1.push(item.she_bei_shi_bie_h);
-            data1.push(item.bumen);
-            data1.push(item.name_);
+            // data1.push(item.bumen);
+            // data1.push(item.name_);
             data1.push(this_.timestampToTime(item.create_time_ / 1000));
             data1.push(item.cun_fang_di_dian_);
             // data1.push(item.create_time_);
@@ -501,7 +502,7 @@ export default {
     async getCarouselTable() {
       this.config = {
         header: ["设备名称", "编号", "状态"],
-        columnWidth: ["135","125", "50"],
+        columnWidth: ["180","150", "70"],
         rowNum: 6,
         data: [],
       };
@@ -667,7 +668,7 @@ export default {
       display: inline-block;
     }
     .middleCardLeft {
-      width: 26%;
+      width: 28%;
       height: 100%;
       box-sizing: border-box;
       overflow: hidden;
@@ -679,13 +680,13 @@ export default {
     //   overflow: hidden;
     // }
     .middleCardRight {
-      width: 22%;
+      width: 25%;
       height: 100%;
       box-sizing: border-box;
       overflow: hidden;
     }
     .middleCardRight1 {
-      width: 48%;
+      width: 43%;
       height: 100%;
       box-sizing: border-box;
       overflow: hidden;

src/views/system/jbdScan/goods/liuyangData.vue

@@ -191,12 +191,13 @@ export default {
   created() {
     // this.loadQueryData();
     // this.firstLoadViewData();
-    console.log(111)
+    this.morenweizhi();
   },
   methods: {
     positionBtn() {
       this.loadQueryData();
       this.firstLoadViewData();
+      
       this.viewShow = !this.viewShow;
       // console.log(this.viewShow);
     },
@@ -393,6 +394,21 @@ export default {
         this_.gua_jia_arr = response.variables.data;
       });
     },
+    async morenweizhi(){
+      let data = []
+      var sqlString ="select * from t_ypwzmrxzb";
+      await curdPost("sql", sqlString).then((response) => {
+        data = response.variables.data[0];
+      })
+      .catch((err) => {
+        console.log(err, "err------>");
+      });
+      this.placeValue = data.yang_pin_liu_yang;
+      this.value = data.yang_pin_liu_yang;
+      // this.formInline.cun_fang_id_ = data.cun_fang_id_;
+      // this.formInline.yang_pin_liu_yang = data.yang_pin_liu_yang;
+      // this.formInline.liu_yang_id_ = data.liu_yang_id_;
+    }
   },
   watch: {
     "formInline.fang_jian_hao_value": function (newdata, olddata) {

src/views/system/jbdScan/goods/weizhiData.vue

@@ -191,7 +191,7 @@ export default {
   created() {
     // this.loadQueryData();
     // this.firstLoadViewData();
-    console.log(111)
+    this.morenweizhi();
   },
   methods: {
     positionBtn() {
@@ -393,6 +393,21 @@ export default {
         this_.gua_jia_arr = response.variables.data;
       });
     },
+    async morenweizhi(){
+      let data = []
+      var sqlString ="select * from t_ypwzmrxzb";
+      await curdPost("sql", sqlString).then((response) => {
+        data = response.variables.data[0];
+      })
+      .catch((err) => {
+        console.log(err, "err------>");
+      });
+      this.placeValue = data.yang_pin_cun_fang;
+      this.value = data.yang_pin_cun_fang;
+      // this.formInline.cun_fang_id_ = data.cun_fang_id_;
+      // this.formInline.yang_pin_liu_yang = data.yang_pin_liu_yang;
+      // this.formInline.liu_yang_id_ = data.liu_yang_id_;
+    }
   },
   watch: {
     "formInline.fang_jian_hao_value": function (newdata, olddata) {