+++++

src/api/iceRaft.js

@@ -7,6 +7,13 @@ export function getIceRaftCode(parameter) {
     method: 'get',
   })
 }
+// 获取未入库冰排
+export function getCoolerIceRaft() {
+  return request({
+    url: '/api/ice-raft/GetCoolerIceRaft',
+    method: 'get',
+  })
+}
 // 获取冰排追溯列表
 export function getIceRaftNewest(parameter) {
   return request({
@@ -34,6 +41,15 @@ export function getExportExecl(parameter) {
   })
 }
 
+// 获取保温箱可使用冰排
+export function getCoolerBoxBindCieRaft(parameter) {
+  return request({
+    url: '/api/ice-raft/GetCoolerBoxBindCieRaft',
+    method: 'post',
+    data: parameter
+  })
+}
+
 // 冰排入库
 export function iceraftIn(parameter) {
   return request({

src/api/login.js

@@ -50,6 +50,8 @@ export function aliMsfx(parameter) {
     url: '/Ali_msfx/codedetail',
     method: 'get',
     params: parameter,
-    baseURL: process.env.NODE_ENV === 'production' ? Url : '/APP',
+    baseURL: Url,
+    withCredentials: true,
+    // baseURL: process.env.NODE_ENV === 'production' ? Url : '/APP'
   })
 }

src/components/actionBar.vue

@@ -30,7 +30,7 @@
               <!-- 时间区间 -->
               <template v-if="item.type === 'picker'">
                 <el-date-picker size="medium" v-model="ruleForm[`${item.field}`]" type="datetimerange" align="right"
-                  value-format="yyyy-MM-dd hh:mm:ss" unlink-panels range-separator="至" start-placeholder="开始日期"
+                  value-format="yyyy-MM-dd HH:mm:ss" unlink-panels range-separator="至" start-placeholder="开始日期"
                   end-placeholder="结束日期" :picker-options="pickerOptions" @change="searchProtocol">
                 </el-date-picker>
               </template>
@@ -113,7 +113,7 @@
       },
       // 搜索
       searchProtocol() {
-        console.log(this.ruleForm, '搜索')
+        // console.log(this.ruleForm, '搜索')
         this.$emit('searchProtocol', this.ruleForm)
       },
       // 重置

src/components/forms.vue

@@ -77,6 +77,9 @@
               </div>
             </div>
           </el-form-item>
+          <!-- <div v-if="item.type === 'scan'">
+            <el-transfer v-model="value" :data="data"></el-transfer>
+          </div> -->
           <div v-if="formIceTracing && item.type === 'scan'"
             :style="{height:scanHeight(inputsList.length),width:'100%'}"></div>
           <el-form-item :label-width="item.labelWidth" :label="item.label" :prop="item.field"
@@ -239,7 +242,7 @@
       append-to-body @opened="mapOpened">
       <div class="card_search_box">
         <div style="width: 50%;">
-          <el-input v-model="address" placeholder="请输入地址搜索" id="tipinputMap"></el-input>
+          <el-input v-model="inputAddress" placeholder="请输入地址搜索" id="tipinputMap"></el-input>
         </div>
       </div>
       <div class="card_coordMap">
@@ -249,12 +252,12 @@
       <span slot="footer" class="dialog-footer">
         <div class="space_between_in">
           <div class="card_coord">
-            <div class="coord_address">当前坐标:</div>
-            <div class="coord_address">地址:</div>
+            <div class="coord_address">当前坐标:{{dataForm.kqLongitude}},{{dataForm.kqLatitude}}</div>
+            <div class="coord_address">地址:{{dataForm.kqLocation}}</div>
           </div>
           <div style="display: flex;align-items: center;">
             <el-button @click="innerVisible = false">取 消</el-button>
-            <el-button type="primary" @click="innerVisible = false">确 定</el-button>
+            <el-button type="primary" @click="confirmLocation">确 定</el-button>
           </div>
         </div>
       </span>
@@ -356,10 +359,30 @@
         innerVisible: false,
         map: null,
 
+        inputAddress: '',
         address: '',
         auto: null,
         placeSearch: null,
         lnglat: [],
+        markers: [],
+        dataForm: {
+          kqLocation: undefined,
+          kqLongitude: undefined,
+          kqLatitude: undefined,
+        },
+        position: {},
+        city: [],
+        province: {},
+        form: {
+          province: {},
+          city: [],
+          address: '',
+        },
+        value: [],
+        data: [{
+          key: 1,
+          label: '004'
+        }],
       }
     },
     methods: {
@@ -517,35 +540,49 @@
             // 如果有就替换，没有就添加
             if (index == -1) {
               this.loadedDrug = true
-              aliMsfx({
-                code: this.inputs,
-              }).then(res => {
-                if (res.status == 200) {
-                  this.inputs = ''
-                  let arr = JSON.parse(res.data)
-                  // console.log(arr, 24)
-                  if (arr.result.models.length > 0) {
-                    let drugList = {
-                      code: '',
-                      physic_name: '',
-                      physic_type_desc: '',
-                      pkg_spec_crit: '',
-                      ent_name: '',
+              var requestOptions = {
+                method: 'GET',
+                redirect: 'follow'
+              };
+              fetch("https://public.coldbaozhida.com/Ali_msfx/codedetail?code=" + this.inputs, requestOptions)
+                .then(response => response.json())
+                .then(data => {
+                  if (data.status == 200) {
+                    this.inputs = ''
+                    let arr = JSON.parse(data.data)
+                    // console.log(arr, 24)
+                    if (arr.result.models.length > 0) {
+                      let drugList = {
+                        code: '',
+                        physic_name: '',
+                        physic_type_desc: '',
+                        pkg_spec_crit: '',
+                        ent_name: '',
+                      }
+                      drugList.code = arr.result.models[0].code
+                      drugList.physic_name = arr.result.models[0].drug_ent_base_d_t_o.physic_name
+                      drugList.physic_type_desc = arr.result.models[0].drug_ent_base_d_t_o.physic_type_desc
+                      drugList.pkg_spec_crit = arr.result.models[0].drug_ent_base_d_t_o.pkg_spec_crit
+                      drugList.ent_name = arr.result.models[0].p_user_ent_d_t_o.ent_name
+                      this.commodityList.push(drugList)
+                      this.commodityList = this.uniqueArray(this.commodityList)
+                      this.ruleForm[`${field}`] = this.commodityList
+                    } else {
+                      this.$message.error('该商品不存在');
                     }
-                    drugList.code = arr.result.models[0].code
-                    drugList.physic_name = arr.result.models[0].drug_ent_base_d_t_o.physic_name
-                    drugList.physic_type_desc = arr.result.models[0].drug_ent_base_d_t_o.physic_type_desc
-                    drugList.pkg_spec_crit = arr.result.models[0].drug_ent_base_d_t_o.pkg_spec_crit
-                    drugList.ent_name = arr.result.models[0].p_user_ent_d_t_o.ent_name
-                    this.commodityList.push(drugList)
-                    this.commodityList = this.uniqueArray(this.commodityList)
-                    this.ruleForm[`${field}`] = this.commodityList
-                  } else {
-                    this.$message.warning('该商品不存在');
                   }
-                }
-                this.loadedDrug = false
-              })
+                  this.loadedDrug = false
+                }).catch(error => {
+                  this.$message.error('添加失败');
+                  this.loadedDrug = false
+                });
+              // return
+              // aliMsfx({
+              //   code: this.inputs,
+              // }).then(res => {}).catch(() => {
+              //   this.$message.error('添加失败');
+              //   this.loadedDrug = false
+              // })
             } else {
               this.$message.warning('该商品已存在');
             }
@@ -554,6 +591,7 @@
               if (res.code == 200) {
                 this.inputsList.push(this.inputs)
                 this.inputsList = this.uniqueArray(this.inputsList)
+                console.log(this.inputsList, 889)
                 this.inputs = ''
                 this.ruleForm[`${field}`] = this.inputsList
               }
@@ -659,7 +697,6 @@
       },
       //选中查询出的记录
       selectSite(e) {
-        console.log(e,669)
         if (e.poi.location) {
           // this.lnglat = [e.poi.location.lng, e.poi.location.lat];
           this.placeSearch.setCity(e.poi.adcode);
@@ -668,15 +705,17 @@
           let that = this;
           geocoder.getAddress(this.lnglat, function(status, result) {
             if (status === "complete" && result.regeocode) {
-              that.province = result.regeocode.addressComponent.province;
-              that.city = result.regeocode.addressComponent.city;
-              //自己想要赋的值，根据自己的做修改
-              that.$set(that.form, "province", that.province);
+              if (result.regeocode) {
+                that.province = result.regeocode.addressComponent.province;
+                that.city = result.regeocode.addressComponent.city;
+                //自己想要赋的值，根据自己的做修改
+                that.$set(that.form, "province", that.province);
+              }
               that.$set(that.form, "city", that.city);
               that.$set(that.form, "address", e.poi.name);
               that.$set(
                 that.form,
-                "coordinate",
+                "companyCoordinate",
                 e.poi.location.lng + "," + e.poi.location.lat
               ); //纬度，经度
             } else {}
@@ -685,8 +724,56 @@
           this.$message.error("查询地址失败，请重新输入地址");
         }
       },
-      clickMapHandler() {
-        console.log(23)
+      // 点击地图事件获取经纬度，并添加标记
+      clickMapHandler(e) {
+        // console.log(e, 23)
+        this.dataForm.kqLongitude = e.lnglat.getLng();
+        this.dataForm.kqLatitude = e.lnglat.getLat();
+        this.lnglat = [e.lnglat.getLng(), e.lnglat.getLat()];
+        // this.ruleForm.companyCoordinate = e.lnglat.getLng() + ',' + e.lnglat.getLat();
+        this.setMarker(this.lnglat);
+        // 点击地图上的位置，根据经纬度转换成详细地址
+        let geocoder = new AMap.Geocoder({});
+        let that = this;
+        geocoder.getAddress(this.lnglat, function(status, result) {
+          if (status === "complete" && result.regeocode) {
+            // that.ruleForm.companyAddress = result.regeocode.formattedAddress;
+            that.dataForm.kqLocation = result.regeocode.formattedAddress;
+          } else {}
+        });
+        this.position = {
+          longitude: e.lnglat.getLng(),
+          latitude: e.lnglat.getLat(),
+          address: that.address,
+        };
+        this.inputAddress = that.address;
+      },
+      //  添加标记
+      setMarker(lnglat) {
+        this.removeMarker();
+        let marker = new AMap.Marker({
+          position: lnglat,
+        });
+        marker.setMap(this.map);
+        this.markers.push(marker);
+      },
+      // 删除之前后的标记点
+      removeMarker() {
+        if (this.markers) {
+          this.map.remove(this.markers);
+        }
+      },
+      // 确定经纬度
+      confirmLocation() {
+        if (this.dataForm.kqLongitude) {
+          this.innerVisible = false
+          this.ruleForm.companyCoordinate = this.dataForm.kqLongitude + ',' + this.dataForm.kqLatitude
+          this.ruleForm.companyAddress = this.dataForm.kqLocation
+          this.$refs.ruleForm.validateField('companyCoordinate')
+          this.$refs.ruleForm.validateField('companyAddress')
+        } else {
+          this.$message.warning("请点击选择具体位置");
+        }
       }
     }
   }
@@ -833,6 +920,24 @@
     border-radius: 4px;
   }
 
+  ::v-deep .el-transfer {
+    display: flex;
+    align-items: center;
+  }
+
+  ::v-deep .el-transfer__buttons {
+    display: flex;
+    padding: 0px 10px;
+
+    .el-button {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      width: 30px;
+      height: 30px;
+    }
+  }
+
   .forms_switch {
     height: 40px;
     width: 100%;
@@ -893,6 +998,7 @@
 
   .card_coord {
     display: flex;
+    align-items: flex-start;
     flex-direction: column;
     background-color: rgba(103, 194, 58, .6);
     padding: 4px 10px;

src/views/IceCreamFreezer/IceTracingManagement.vue

@@ -40,7 +40,7 @@
     <el-dialog :title="staffTitle" :visible.sync="staffDialogVisible" width="600px" :close-on-click-modal="false"
       @close="closeDialog">
       <forms ref="childRules" :formNewList="formRuleList" :ruleForm="ruleForm" :iceTracing="true" :iceBank="true"
-        labelWidth="120px" @handleScroll="handleScroll" @remoteMethod="remoteMethod">
+        labelWidth="120px" @handleScroll="handleScroll" @remoteMethod="remoteMethod" @changeOption="changeOption">
       </forms>
       <span slot="footer" class="dialog-footer" v-if="operationType != 'logs'">
         <el-button plain @click="staffDialogVisible = false">取 消</el-button>
@@ -66,7 +66,7 @@
                 </el-form-item>
                 <el-form-item label="使用日期" prop="dateService">
                   <el-date-picker v-model="formInline.dateService" type="datetimerange" range-separator="至"
-                    start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd hh:mm:ss"
+                    start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"
                     @change="timeChange">
                   </el-date-picker>
                 </el-form-item>
@@ -106,7 +106,9 @@
     delIceRaftRecord,
     getRecording,
     getExportExecl,
-    raftIsoutstorage
+    raftIsoutstorage,
+    getCoolerIceRaft,
+    getCoolerBoxBindCieRaft
   } from '@/api/iceRaft'
   import {
     getIcelocker,
@@ -348,6 +350,8 @@
           const params = {
             ...this.ruleForm,
           }
+          console.log(params,242)
+          // return
           if (this.operationType == 'come') {
             delete params.coolerBoxId
             params.iceLockerId = Number(params.iceLockerId)
@@ -421,6 +425,7 @@
           this.formRuleList.unshift(this.coldCupboard)
           this.limitNo = true
           this.getFreezer()
+          this.notStoredIce(type)
         } else if (type == 'goOut') {
           this.staffDialogVisible = true
           this.staffTitle = '出库'
@@ -438,6 +443,27 @@
         }
         this.$forceUpdate()
       },
+      // 获取未入库冰排
+      notStoredIce(type) {
+        getCoolerIceRaft().then(res => {
+          if (res.code == 200) {
+            let arrData = []
+            let arrList = res.data
+            arrList.forEach(item1 => {
+              let iceArr = {
+                label: item1.code,
+                value: item1.code,
+              }
+              arrData.push(iceArr)
+            })
+            this.formRuleList.forEach(item => {
+              if (item.field == 'code') {
+                item.options = arrData
+              }
+            })
+          }
+        })
+      },
       // 选择保温箱
       changeSelect(value) {
         this.getraftRecording()
@@ -536,6 +562,38 @@
           }
         }
       },
+      // 选择保温箱
+      changeOption(value, type) {
+        if (this.operationType == 'goOut') {
+          this.ruleForm.code = []
+          getCoolerBoxBindCieRaft({
+            id: value,
+          }).then(res => {
+            if (res.code == 200) {
+              let arrData = []
+              let arrList = res.data
+              arrList.forEach(item1 => {
+                let iceArr = {
+                  label: item1,
+                  value: item1,
+                }
+                arrData.push(iceArr)
+              })
+              this.formRuleList.forEach(item => {
+                if (item.field == 'code') {
+                  item.options = arrData
+                }
+              })
+            } else {
+              this.formRuleList.forEach(item => {
+                if (item.field == 'code') {
+                  item.options = []
+                }
+              })
+            }
+          })
+        }
+      },
       // 搜索
       remoteMethod(value) {
         this.resetSelect()
@@ -856,6 +914,11 @@
         this.$refs.childRules.resetCheck();
         this.coldCupboard.options = []
         this.thermostat.options = []
+        this.formRuleList.forEach(item => {
+          if (item.field == 'code') {
+            item.options = []
+          }
+        })
       },
       iceTracingDialog() {
         this.page = 2

src/views/IceCreamFreezer/iceRaft.js

@@ -252,14 +252,29 @@ export const iceRaftRules = () => {
       field: 'code',
       label: '冰排编号',
       placeholder: '请输入冰排编号',
-      type: 'scan',
+      type: 'select',
       colWidth: 24,
+      multiple: true,
+      createEntry: true,
+      options: [],
       rules: [{
         required: true,
         message: '请输入冰排编号',
         trigger: 'blur'
       }]
-    }
+    },
+    // {
+    //   field: 'code',
+    //   label: '冰排编号',
+    //   placeholder: '请输入冰排编号',
+    //   type: 'scan',
+    //   colWidth: 24,
+    //   rules: [{
+    //     required: true,
+    //     message: '请输入冰排编号',
+    //     trigger: 'blur'
+    //   }]
+    // }
   ]
 }
 
@@ -294,14 +309,29 @@ export const freezerRules = () => {
       field: 'code',
       label: '冰排编号',
       placeholder: '请输入冰排编号',
-      type: 'scan',
+      type: 'select',
       colWidth: 24,
+      multiple: true,
+      createEntry: true,
+      options: [],
       rules: [{
         required: true,
         message: '请输入冰排编号',
         trigger: 'blur'
       }]
-    }
+    },
+    // {
+    //   field: 'code',
+    //   label: '冰排编号',
+    //   placeholder: '请输入冰排编号',
+    //   type: 'scan',
+    //   colWidth: 24,
+    //   rules: [{
+    //     required: true,
+    //     message: '请输入冰排编号',
+    //     trigger: 'blur'
+    //   }]
+    // }
   ]
 }
 

src/views/OrderManagement/uncertainOrder.vue

@@ -229,6 +229,7 @@
       openModel(type) {
         this.operationType = type
         if (type == 'add') {
+          this.staffTitle = '添加'
           this.orderInformation = {}
           this.$refs.orderAddEdit.staffDialogVisible = true
         } else if (type == 'sends') {

src/views/common/topNav.vue

@@ -3,6 +3,8 @@
     <el-image style="height: 35px;width: 35px;flex: none;" :src="require('@/assets/logo3.png')"></el-image>
     <div class="head_title" v-if="!iceRaftManage">智配送安全追溯AI管理平台</div>
     <div class="head_title" v-else>智慧冰排管理系统</div>
+    <!-- <div class="head_title" v-if="!iceRaftManage">美克医疗-智配送安全追溯AI管理平台</div> -->
+    <!-- <div class="head_title" v-else>美克医疗-智慧冰排管理系统</div> -->
     <!-- <i class="card_unpack" :class="iconFlag ? 'el-icon-s-unfold' : 'el-icon-s-fold'" @click="getUnpack"></i> -->
     <div style="width: 1200px;flex: none;margin-left: 20px;">
       <el-menu mode="horizontal" :default-active="$route.path" class="el-menu-vertical-demo" router @open="handleOpen"

src/views/common/userInfo.vue

@@ -123,6 +123,10 @@
   }
 
   .user_title {
+    flex: none;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
     margin-left: 5px;
     font-size: 16px;
   }

src/views/login.vue

@@ -7,6 +7,7 @@
           <el-image style="height: 35px;width: 35px;margin-right: 10px;"
             :src="require('@/assets/logo3.png')"></el-image>
           <h3>智配送安全追溯AI管理平台</h3>
+          <!-- <h3>美克医疗-智配送安全追溯AI管理平台</h3> -->
         </div>
         <el-form :model="form" status-icon :rules="rules" ref="ruleForm" class="demo-ruleForm"
           @keyup.enter.native="getLogin">

src/views/page/chinaMap.vue

@@ -164,10 +164,32 @@
     },
     methods: {
       initEchart() {
+        // function f_center_map(adcode, level) {
+        //     my_adcode = adcode
+        //     // 基于准备好的dom，初始化echarts实例
+        //     myChart = echarts.init(document.getElementById('v_map'));
+        //     // 指定图表的配置项和数据
+        //     myChart.showLoading();
+        //     $.get('https://iot3d-oss.baozhida.cn/geo/' + adcode + '.json', function (geoJson) {
+        //         echarts.registerMap('json_map', geoJson);
+        //         center_map_geoJson = geoJson
+        //         f_Map_handy(level)
+        //     }).fail(function () {
+        //         adcode = adcode.replace("_full", "")
+        //         $.get('https://iot3d-oss.baozhida.cn/geo/' + adcode + '.json', function (geoJson) {
+        //             echarts.registerMap('json_map', geoJson);
+        //             center_map_geoJson = geoJson
+        //             f_Map_handy(level)
+        //         });
+        //     });
+        //     window.addEventListener("resize", function () {
+        //         myChart.resize();
+        //     });
+        // }
         let dataList = this.dataList;
-        for (let i = 0; i < dataList.length; i++) {
-          dataList[i].value = Math.ceil(Math.random() * 1000 - 1);
-        }
+        // for (let i = 0; i < dataList.length; i++) {
+        //   dataList[i].value = Math.ceil(Math.random() * 1000 - 1);
+        // }
         const _this = this;
         _this.myChartChina = _this.$echarts.init(document.getElementById("main"));
         _this.$echarts.registerMap('china', chinaJson)
@@ -175,6 +197,7 @@
           tooltip: {
             //数据格式化
             formatter: function(params, callback) {
+              // console.log(params,265256)
               return (
                 params.seriesName + "<br />" + params.name + "：" + params.value
               );

src/views/page/homeView.vue

@@ -244,6 +244,7 @@
       },
       // 选中省份
       cutChina(event) {
+        console.log(event,24)
         this.chinaFlag = false
         this.provinceFlag = true
         this.provinceName = event.provinceName

src/views/page/incubatorView.vue

@@ -190,7 +190,7 @@
       classOption() {
         return {
           step: 0.2, // 数值越大速度滚动越快
-          limitMoveNum: 10, // 开始无缝滚动的数据量
+          limitMoveNum: 5, // 开始无缝滚动的数据量
           hoverStop: true, // 是否开启鼠标悬停stop
           direction: 1, // 0向下 1向上 2向左 3向右
           openWatch: true, // 开启数据实时监控刷新dom
@@ -270,16 +270,18 @@
       handleScroll(e) {
         // 改变组件内部 yPos 的值，这样html的translate(0, yPos)就会随之改变
         // e.deltaY是滚动的距离
-        this.$refs.vueSeamlessScroll.yPos = this.$refs.vueSeamlessScroll.yPos - e.deltaY
-        // 如果是正数 说明是往上滚
-        if (this.$refs.vueSeamlessScroll.yPos > 0) {
-          this.$refs.vueSeamlessScroll.yPos = 0
-          return
-        }
-        // 如果yPos超过内部实际高度的一半则重新到顶部滚动
-        // 一半的原因是因为组件实际上创建了两个dom，以达到无缝衔接的效果
-        if (Math.abs(this.$refs.vueSeamlessScroll.yPos) > this.$refs.vueSeamlessScroll.realBoxHeight / 2) {
-          this.$refs.vueSeamlessScroll.yPos = 0
+        if (this.tableData.length > 3) {
+          this.$refs.vueSeamlessScroll.yPos = this.$refs.vueSeamlessScroll.yPos - e.deltaY
+          // 如果是正数 说明是往上滚
+          if (this.$refs.vueSeamlessScroll.yPos > 0) {
+            this.$refs.vueSeamlessScroll.yPos = 0
+            return
+          }
+          // 如果yPos超过内部实际高度的一半则重新到顶部滚动
+          // 一半的原因是因为组件实际上创建了两个dom，以达到无缝衔接的效果
+          if (Math.abs(this.$refs.vueSeamlessScroll.yPos) > this.$refs.vueSeamlessScroll.realBoxHeight / 2) {
+            this.$refs.vueSeamlessScroll.yPos = 0
+          }
         }
       },
       // 更新保温箱实时数据

src/views/system/CompanyManagement.vue

@@ -79,6 +79,7 @@
         ruleForm: {
           name: '',
           appName: '',
+          companyCoordinate: '',
           companyAddress: '',
           coldKey: '',
           isIceReleaseCold: false,

src/views/system/company.js

@@ -130,7 +130,7 @@ export const formRules = () => {
     type: 'coord',
     colWidth: 24,
     rules: [{
-      required: true,
+      required: false,
       message: '请输入公司坐标',
       trigger: 'blur'
     }]

vue.config.js

@@ -17,8 +17,8 @@ module.exports = defineConfig({
     proxy: {
       '/api': {
         // target: process.env.VUE_APP_BASE_API,
-        // target: 'https://colddelivery.coldbaozhida.com/cold_delivery',
-        target: 'http://colddeliverytest.coldbaozhida.com:9090/cold_delivery', //测试
+        target: 'https://colddelivery.coldbaozhida.com/cold_delivery',
+        // target: 'http://colddeliverytest.coldbaozhida.com:9090/cold_delivery', //测试
         // target: 'http://192.168.11.49:6280', //本地
         ws: false,
         changeOrigin: true,