调试

src/utils/ruoyi.js

@@ -1,5 +1,3 @@
-
-
 /**
  * 通用js方法封装处理
  * Copyright (c) 2019 ruoyi
@@ -7,148 +5,160 @@
 
 // 日期格式化
 export function parseTime(time, pattern) {
-  if (arguments.length === 0 || !time) {
+    if (arguments.length === 0 || !time) {
-    return null
+        return null
-  }
-  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
-  let date
-  if (typeof time === 'object') {
-    date = time
-  } else {
-    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
-      time = parseInt(time)
-    } else if (typeof time === 'string') {
-      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
     }
-    if ((typeof time === 'number') && (time.toString().length === 10)) {
+    const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
-      time = time * 1000
+    let date
+    if (typeof time === 'object') {
+        date = time
+    } else {
+        if (typeof time === 'string' && /^[0-9]+$/.test(time)) {
+            time = parseInt(time)
+        } else if (typeof time === 'string') {
+            time = time
+                .replace(new RegExp(/-/gm), '/')
+                .replace('T', ' ')
+                .replace(new RegExp(/\.[\d]{3}/gm), '')
+        }
+        if (typeof time === 'number' && time.toString().length === 10) {
+            time = time * 1000
+        }
+        date = new Date(time)
     }
-    date = new Date(time)
+    const formatObj = {
-  }
+        y: date.getFullYear(),
-  const formatObj = {
+        m: date.getMonth() + 1,
-    y: date.getFullYear(),
+        d: date.getDate(),
-    m: date.getMonth() + 1,
+        h: date.getHours(),
-    d: date.getDate(),
+        i: date.getMinutes(),
-    h: date.getHours(),
+        s: date.getSeconds(),
-    i: date.getMinutes(),
+        a: date.getDay(),
-    s: date.getSeconds(),
-    a: date.getDay()
-  }
-  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
-    let value = formatObj[key]
-    // Note: getDay() returns 0 on Sunday
-    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
-    if (result.length > 0 && value < 10) {
-      value = '0' + value
     }
-    return value || 0
+    const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
-  })
+        let value = formatObj[key]
-  return time_str
+        // Note: getDay() returns 0 on Sunday
+        if (key === 'a') {
+            return ['日', '一', '二', '三', '四', '五', '六'][value]
+        }
+        if (result.length > 0 && value < 10) {
+            value = '0' + value
+        }
+        return value || 0
+    })
+    return time_str
 }
 
 // 表单重置
 export function resetForm(refName) {
-  if (this.$refs[refName]) {
+    if (this.$refs[refName]) {
-    this.$refs[refName].resetFields();
+        this.$refs[refName].resetFields()
-  }
+    }
 }
 
 // 添加日期范围
 export function addDateRange(params, dateRange, propName) {
-  let search = params;
+    let search = params
-  search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
+    search.params =
-  dateRange = Array.isArray(dateRange) ? dateRange : [];
+        typeof search.params === 'object' &&
-  if (typeof (propName) === 'undefined') {
+        search.params !== null &&
-    search.params['beginTime'] = dateRange[0];
+        !Array.isArray(search.params)
-    search.params['endTime'] = dateRange[1];
+            ? search.params
-  } else {
+            : {}
-    search.params['begin' + propName] = dateRange[0];
+    dateRange = Array.isArray(dateRange) ? dateRange : []
-    search.params['end' + propName] = dateRange[1];
+    if (typeof propName === 'undefined') {
-  }
+        search.params['beginTime'] = dateRange[0]
-  return search;
+        search.params['endTime'] = dateRange[1]
+    } else {
+        search.params['begin' + propName] = dateRange[0]
+        search.params['end' + propName] = dateRange[1]
+    }
+    return search
 }
 
 // 回显数据字典
 export function selectDictLabel(datas, value) {
-  if (value === undefined) {
+    if (value === undefined) {
-    return "";
+        return ''
-  }
-  var actions = [];
-  Object.keys(datas).some((key) => {
-    if (datas[key].value == ('' + value)) {
-      actions.push(datas[key].label);
-      return true;
     }
-  })
+    var actions = []
-  if (actions.length === 0) {
+    Object.keys(datas).some((key) => {
-    actions.push(value);
+        if (datas[key].value == '' + value) {
-  }
+            actions.push(datas[key].label)
-  return actions.join('');
+            return true
+        }
+    })
+    if (actions.length === 0) {
+        actions.push(value)
+    }
+    return actions.join('')
 }
 
 // 回显数据字典（字符串、数组）
 export function selectDictLabels(datas, value, separator) {
-  if (value === undefined || value.length === 0) {
+    if (value === undefined || value.length === 0) {
-    return "";
+        return ''
-  }
-  if (Array.isArray(value)) {
-    value = value.join(",");
-  }
-  var actions = [];
-  var currentSeparator = undefined === separator ? "," : separator;
-  var temp = value.split(currentSeparator);
-  Object.keys(value.split(currentSeparator)).some((val) => {
-    var match = false;
-    Object.keys(datas).some((key) => {
-      if (datas[key].value == ('' + temp[val])) {
-        actions.push(datas[key].label + currentSeparator);
-        match = true;
-      }
-    })
-    if (!match) {
-      actions.push(temp[val] + currentSeparator);
     }
-  })
+    if (Array.isArray(value)) {
-  return actions.join('').substring(0, actions.join('').length - 1);
+        value = value.join(',')
+    }
+    var actions = []
+    var currentSeparator = undefined === separator ? ',' : separator
+    var temp = value.split(currentSeparator)
+    Object.keys(value.split(currentSeparator)).some((val) => {
+        var match = false
+        Object.keys(datas).some((key) => {
+            if (datas[key].value == '' + temp[val]) {
+                actions.push(datas[key].label + currentSeparator)
+                match = true
+            }
+        })
+        if (!match) {
+            actions.push(temp[val] + currentSeparator)
+        }
+    })
+    return actions.join('').substring(0, actions.join('').length - 1)
 }
 
 // 字符串格式化(%s )
 export function sprintf(str) {
-  var args = arguments, flag = true, i = 1;
+    var args = arguments,
-  str = str.replace(/%s/g, function () {
+        flag = true,
-    var arg = args[i++];
+        i = 1
-    if (typeof arg === 'undefined') {
+    str = str.replace(/%s/g, function () {
-      flag = false;
+        var arg = args[i++]
-      return '';
+        if (typeof arg === 'undefined') {
-    }
+            flag = false
-    return arg;
+            return ''
-  });
+        }
-  return flag ? str : '';
+        return arg
+    })
+    return flag ? str : ''
 }
 
 // 转换字符串，undefined,null等转化为""
 export function parseStrEmpty(str) {
-  if (!str || str == "undefined" || str == "null") {
+    if (!str || str == 'undefined' || str == 'null') {
-    return "";
+        return ''
-  }
+    }
-  return str;
+    return str
 }
 
 // 数据合并
 export function mergeRecursive(source, target) {
-  for (var p in target) {
+    for (var p in target) {
-    try {
+        try {
-      if (target[p].constructor == Object) {
+            if (target[p].constructor == Object) {
-        source[p] = mergeRecursive(source[p], target[p]);
+                source[p] = mergeRecursive(source[p], target[p])
-      } else {
+            } else {
-        source[p] = target[p];
+                source[p] = target[p]
-      }
+            }
-    } catch (e) {
+        } catch (e) {
-      source[p] = target[p];
+            source[p] = target[p]
+        }
     }
-  }
+    return source
-  return source;
+}
-};
 
 /**
  * 构造树型结构数据
@@ -158,81 +168,85 @@ export function mergeRecursive(source, target) {
  * @param {*} children 孩子节点字段 默认 'children'
  */
 export function handleTree(data, id, parentId, children) {
-  let config = {
+    let config = {
-    id: id || 'id',
+        id: id || 'id',
-    parentId: parentId || 'parentId',
+        parentId: parentId || 'parentId',
-    childrenList: children || 'children'
+        childrenList: children || 'children',
-  };
-
-  var childrenListMap = {};
-  var nodeIds = {};
-  var tree = [];
-
-  for (let d of data) {
-    let parentId = d[config.parentId];
-    if (childrenListMap[parentId] == null) {
-      childrenListMap[parentId] = [];
     }
-    nodeIds[d[config.id]] = d;
-    childrenListMap[parentId].push(d);
-  }
 
-  for (let d of data) {
+    var childrenListMap = {}
-    let parentId = d[config.parentId];
+    var nodeIds = {}
-    if (nodeIds[parentId] == null) {
+    var tree = []
-      tree.push(d);
-    }
-  }
 
-  for (let t of tree) {
+    for (let d of data) {
-    adaptToChildrenList(t);
+        let parentId = d[config.parentId]
-  }
+        if (childrenListMap[parentId] == null) {
+            childrenListMap[parentId] = []
+        }
+        nodeIds[d[config.id]] = d
+        childrenListMap[parentId].push(d)
+    }
 
-  function adaptToChildrenList(o) {
+    for (let d of data) {
-    if (childrenListMap[o[config.id]] !== null) {
+        let parentId = d[config.parentId]
-      o[config.childrenList] = childrenListMap[o[config.id]];
+        if (nodeIds[parentId] == null) {
+            tree.push(d)
+        }
     }
-    if (o[config.childrenList]) {
+
-      for (let c of o[config.childrenList]) {
+    for (let t of tree) {
-        adaptToChildrenList(c);
+        adaptToChildrenList(t)
-      }
     }
-  }
+
-  return tree;
+    function adaptToChildrenList(o) {
+        if (childrenListMap[o[config.id]] !== null) {
+            o[config.childrenList] = childrenListMap[o[config.id]]
+        }
+        if (o[config.childrenList]) {
+            for (let c of o[config.childrenList]) {
+                adaptToChildrenList(c)
+            }
+        }
+    }
+    return tree
 }
 
 /**
-* 参数处理
+ * 参数处理
-* @param {*} params  参数
+ * @param {*} params  参数
-*/
+ */
 export function tansParams(params) {
-  let result = ''
+    let result = ''
-  for (const propName of Object.keys(params)) {
+    for (const propName of Object.keys(params)) {
-    const value = params[propName];
+        const value = params[propName]
-    var part = encodeURIComponent(propName) + "=";
+        var part = encodeURIComponent(propName) + '='
-    if (value !== null && value !== "" && typeof (value) !== "undefined") {
+        if (value !== null && value !== '' && typeof value !== 'undefined') {
-      if (typeof value === 'object') {
+            if (typeof value === 'object') {
-        for (const key of Object.keys(value)) {
+                for (const key of Object.keys(value)) {
-          if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
+                    if (
-            let params = propName + '[' + key + ']';
+                        value[key] !== null &&
-            var subPart = encodeURIComponent(params) + "=";
+                        value[key] !== '' &&
-            result += subPart + encodeURIComponent(value[key]) + "&";
+                        typeof value[key] !== 'undefined'
-          }
+                    ) {
+                        let params = propName + '[' + key + ']'
+                        var subPart = encodeURIComponent(params) + '='
+                        result += subPart + encodeURIComponent(value[key]) + '&'
+                    }
+                }
+            } else {
+                result += part + encodeURIComponent(value) + '&'
+            }
         }
-      } else {
-        result += part + encodeURIComponent(value) + "&";
-      }
     }
-  }
+    return result
-  return result
 }
 
 // 验证是否为blob格式
 export function blobValidate(data) {
-  return data.type !== 'application/json'
+    return data.type !== 'application/json'
 }
 
 // 处理表格索引延续问题
 export function indexContinuation(num, size) {
-  return (num - 1) * size + 1
+    return (num - 1) * size + 1
 }

src/views/nw-login.vue

@@ -51,7 +51,7 @@
                             <el-form-item
                                 prop="textCode"
                                 class="code-container"
-                                v-if="loginForm.username === 'adminBns'"
+                                v-if="loginForm.username === 'adm'"
                             >
                                 <el-input
                                     v-model="loginForm.textCode"

src/views/warehouseManage/machinery/coding-nw/index.vue

@@ -125,7 +125,7 @@
         </el-form>
 
         <el-row :gutter="10" class="mb8">
-            <!-- <el-col :span="1.5">
+            <el-col :span="1.5">
                 <el-button
                     type="primary"
                     plain
@@ -134,7 +134,7 @@
                     :disabled="ids.length == 0"
                     >推送租赁平台</el-button
                 >
-            </el-col> -->
+            </el-col>
             <right-toolbar
                 :showSearch.sync="showSearch"
                 @queryTable="getList"

vue.config.js

@@ -42,9 +42,9 @@ module.exports = {
                 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
                 // target: `https://z.csgmall.com.cn`,
 
-                target: `http://192.168.2.152:39080`, //超
+                // target: `http://192.168.2.152:39080`, //超
                 // target: `http://10.40.92.81:8080`, //韩/
-                // target: `http://192.168.2.81:39080`,//旭/
+                target: `http://192.168.10.236:49080`, //旭/
                 // target: `http://10.40.92.138:28080`, //帅
                 // target: `http://192.168.2.218:39080`, //福
                 // target: `http://192.168.2.120:39080`, //跃