orderby

.env.development

@@ -5,8 +5,12 @@ NODE_ENV = development
 VUE_APP_ZEROAPI_BASEURL = http://www.qdeasydo.com
 # VUE_APP_API_BASEURL = http://www.qdeasydo.com/api
 # VUE_APP_OPS_BASEURL = http://www.qdeasydo.com/ops
-# VUE_APP_API_BASEURL  = http://192.168.101.93:8802
-# VUE_APP_OPS_BASEURL = http://192.168.101.93:8804
+# VUE_APP_API_BASEURL  = http://192.168.101.230:8802
+# VUE_APP_OPS_BASEURL = http://192.168.101.230:8804 #宏宏
+
+# VUE_APP_API_BASEURL  = http://192.168.101.251:8802 #卢
+# VUE_APP_OPS_BASEURL = http://192.168.101.251:8804
+
 VUE_APP_API_BASEURL  = http://192.168.101.135:8802
 VUE_APP_OPS_BASEURL = http://192.168.101.135:8804
 

src/components/scTable/index.vue

@@ -212,9 +212,8 @@ const getData = () => {
 
         gridOptions.value.loading = true;
         const reqData = config.framework[props.framework].queryData(gridOptions.value, props.paramsColums);
-        const query = props.apiObj.url == "/ops/projectInfo" ? XEUtils.omit(reqData, "orderBy") : reqData;
 
-        props.apiObj[props.apiKey](query).then(res => {
+        props.apiObj[props.apiKey](reqData).then(res => {
             const response = config.framework[props.framework].parseData(res);
             gridOptions.value.data = response.data || [];
             gridOptions.value.pagerConfig.total = response.total || 0;

src/views/equipment/env.vue

@@ -35,6 +35,8 @@ const toolbarConfig = reactive({
 
 const formConfig = reactive({
     data: {
+        orderBy: "id_asc",
+        projectIdNot: 1,
         categoryId: 9,
         modelId: 12
     },
@@ -45,6 +47,8 @@ const formConfig = reactive({
 })
 
 const paramsColums = reactive([
+    { column: "orderBy" },
+    { column: "projectIdNot" },
     { column: "categoryId" },
     { column: "modelId" },
     { column: "projectId" },
@@ -55,8 +59,8 @@ const columns = reactive([
     { type: "seq", fixed: "left", width: 60 },
     { type: "html", field: "deviceCode", title: "设备唯一标识", fixed: "left", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || row.deviceNum },
     { type: "html", field: "projectName", title: "所属项目", minWidth: 200, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(XEUtils.find(TOOL.data.get("PROJECT"), item => item.fpiId === row.projectId), "projectName") },
-    { type: "html", field: "groundName", title: "工地场区", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "ground.groundName") },
-    { type: "html", field: "mountedName", title: "安装点名称", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "mountedName") },
+    { type: "html", field: "groundName", title: "工地场区", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "ground.groundName", "") },
+    { type: "html", field: "mountedName", title: "安装点名称", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "mountedName", "") },
     { field: "state", title: "在线状态", minWidth: 100, align: "center", formatter: ({ row }) => !TOOL.dateFormat(XEUtils.get(XEUtils.get(formatGate(row), "devices", []).find(d => d.device_num === row.deviceNum), "healthbeatTime")) || moment().diff(TOOL.dateFormat(XEUtils.get(XEUtils.get(formatGate(row), "devices", []).find(d => d.device_num === row.deviceNum), "healthbeatTime")), "minute") > 5 ? "离线" : "在线", editRender: { name: "$cell-tag" } }
 ])
 

src/views/equipment/facerec.vue

@@ -39,6 +39,7 @@ const toolbarConfig = reactive({
 
 const formConfig = reactive({
     data: {
+        orderBy: "id_asc",
         categoryId: 1,
         modelId: 1
     },
@@ -49,6 +50,7 @@ const formConfig = reactive({
 })
 
 const paramsColums = reactive([
+    { column: "orderBy" },
     { column: "categoryId" },
     { column: "modelId" },
     { column: "projectId" },
@@ -59,9 +61,9 @@ const columns = reactive([
     { type: "seq", fixed: "left", width: 60 },
     { type: "html", field: "deviceCode", title: "设备唯一标识", fixed: "left", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || row.deviceNum },
     { type: "html", field: "projectName", title: "所属项目", minWidth: 200, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(XEUtils.find(TOOL.data.get("PROJECT"), item => item.fpiId === row.projectId), "projectName") },
-    { type: "html", field: "groundName", title: "工地场区", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "ground.groundName") },
-    { type: "html", field: "gateName", title: "闸口名称", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "gateName") },
-    { type: "html", field: "gateType", title: "闸口类型", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(gateTypeDic, XEUtils.get(formatGate(row), "gateType")) },
+    { type: "html", field: "groundName", title: "工地场区", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "ground.groundName", "") },
+    { type: "html", field: "gateName", title: "闸口名称", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "gateName", "") },
+    { type: "html", field: "gateType", title: "闸口类型", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(gateTypeDic, XEUtils.get(formatGate(row), "gateType"), "") },
     { field: "state", title: "在线状态", minWidth: 100, align: "center", formatter: ({ row }) => XEUtils.get(deviceStateDic, XEUtils.get(deviceState.value, row.deviceNum), "离线"), editRender: { name: "$cell-tag" } },
     // { title: "操作", fixed: "right", minWidth: 310, slots: { default: "action" } }
 ])

src/views/equipment/passqrcode.vue

@@ -39,6 +39,7 @@ const toolbarConfig = reactive({
 
 const formConfig = reactive({
     data: {
+        orderBy: "id_asc",
         categoryId: 22,
         modelId: 29
     },
@@ -49,6 +50,7 @@ const formConfig = reactive({
 })
 
 const paramsColums = reactive([
+    { column: "orderBy" },
     { column: "categoryId" },
     { column: "modelId" },
     { column: "projectId" },
@@ -59,9 +61,9 @@ const columns = reactive([
     { type: "seq", fixed: "left", width: 60 },
     { type: "html", field: "deviceCode", title: "设备唯一标识", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || row.deviceNum },
     { type: "html", field: "projectName", title: "所属项目", minWidth: 200, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(XEUtils.find(TOOL.data.get("PROJECT"), item => item.fpiId === row.projectId), "projectName") },
-    { type: "html", field: "groundName", title: "工地场区", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "ground.groundName") },
-    { type: "html", field: "gateName", title: "闸口名称", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "gateName") },
-    { type: "html", field: "gateType", title: "闸口类型", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(gateTypeDic, XEUtils.get(formatGate(row), "gateType")) },
+    { type: "html", field: "groundName", title: "工地场区", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "ground.groundName", "") },
+    { type: "html", field: "gateName", title: "闸口名称", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "gateName", "") },
+    { type: "html", field: "gateType", title: "闸口类型", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(gateTypeDic, XEUtils.get(formatGate(row), "gateType", "")) },
     { field: "state", title: "在线状态", minWidth: 100, align: "center", formatter: ({ row }) => XEUtils.get(deviceStateDic, XEUtils.get(deviceState.value, row.deviceNum), "离线"), editRender: { name: "$cell-tag" } },
     // { title: "操作", fixed: "right", minWidth: 400, slots: { default: "action" } }
 ])

src/views/equipment/tower.vue

@@ -35,6 +35,8 @@ const toolbarConfig = reactive({
 
 const formConfig = reactive({
     data: {
+        orderBy: "id_asc",
+        projectIdNot: 1,
         categoryId: 11,
         modelId: 14
     },
@@ -45,6 +47,8 @@ const formConfig = reactive({
 })
 
 const paramsColums = reactive([
+    { column: "orderBy" },
+    { column: "projectIdNot" },
     { column: "categoryId" },
     { column: "modelId" },
     { column: "projectId" },
@@ -55,8 +59,8 @@ const columns = reactive([
     { type: "seq", fixed: "left", width: 60 },
     { type: "html", field: "deviceCode", title: "设备唯一标识", fixed: "left", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || row.deviceNum },
     { type: "html", field: "projectName", title: "所属项目", minWidth: 200, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(XEUtils.find(TOOL.data.get("PROJECT"), item => item.fpiId === row.projectId), "projectName") },
-    { type: "html", field: "groundName", title: "工地场区", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "ground.groundName") },
-    { type: "html", field: "mountedName", title: "安装点名称", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "mountedName") },
+    { type: "html", field: "groundName", title: "工地场区", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "ground.groundName", "") },
+    { type: "html", field: "mountedName", title: "安装点名称", minWidth: 150, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.get(formatGate(row), "mountedName", "") },
     { field: "state", title: "在线状态", minWidth: 100, align: "center", formatter: ({ row }) => !TOOL.dateFormat(XEUtils.get(XEUtils.get(formatGate(row), "devices", []).find(d => d.device_num === row.deviceNum), "healthbeatTime")) || moment().diff(TOOL.dateFormat(XEUtils.get(XEUtils.get(formatGate(row), "devices", []).find(d => d.device_num === row.deviceNum), "healthbeatTime")), "minute") > 5 ? "离线" : "在线", editRender: { name: "$cell-tag" } }
 ])
 

src/views/project/info/index.vue

@@ -60,6 +60,7 @@ const toolbarConfig = reactive({
 
 const formConfig = reactive({
     data: {
+        orderBy: "fpiId_asc",
         projectStatusNot: "学校"
     },
     items: [
@@ -71,6 +72,7 @@ const formConfig = reactive({
 })
 
 const paramsColums = reactive([
+    { column: "orderBy" },
     { column: "projectStatusNot" },
     { column: "projectNameLike" },
     { column: "projectFirmName" },