xj před 3 měsíci
rodič
revize
f6c90fec5b
4 změnil soubory, kde provedl 83 přidání a 2 odebrání
  1. 1 0
      src/qml.qrc
  2. 72 0
      src/qml/components/ReturnKeyLockProcess.qml
  3. 8 0
      src/qml/main.qml
  4. 2 2
      src/usr/config.h

+ 1 - 0
src/qml.qrc

@@ -35,5 +35,6 @@
         <file>qml/main.qml</file>
         <file>qml/components/MVirtualKeyboard.qml</file>
         <file>qml/components/JobTicketColockProcess.qml</file>
+        <file>qml/components/ReturnKeyLockProcess.qml</file>
     </qresource>
 </RCC>

+ 72 - 0
src/qml/components/ReturnKeyLockProcess.qml

@@ -0,0 +1,72 @@
+import QtQuick 2.12
+
+Rectangle {
+    id: control
+
+    anchors.fill: parent
+
+    MBlurCard {
+        id: __blurCard
+        anchors.fill: parent
+        blurSource: appBlurItem
+        blurAmount: 1.2
+        blurMax: 32
+        z: 1000
+
+        opacity: 1
+        scale: 1.0
+
+        Rectangle {
+            anchors.fill: parent
+
+            color: "#0A1929"
+            opacity: 0.85
+            radius: 16
+            border.color: "orange"
+
+            Text {
+                id: __dialogTitle
+                y: 42
+                anchors.horizontalCenter: parent.horizontalCenter
+
+                text: qsTr("归还钥匙和锁处理")
+                color: "#1890FF"
+                opacity: 1
+                font.pixelSize: 64
+                font.family: iconFont.name
+                verticalAlignment: Text.AlignVCenter
+                horizontalAlignment: Text.AlignHCenter
+            }
+
+            Flickable {
+                id: __colockView
+                anchors.horizontalCenter: parent.horizontalCenter
+                anchors.top: __dialogTitle.bottom
+                anchors.topMargin: 35
+                width: __taskColumn.width
+                height: __taskColumn.height + 30
+
+                clip: true
+                flickableDirection: Flickable.VerticalFlick
+
+                contentWidth: __taskColumn.width
+                contentHeight: height
+
+                Column {
+                    id: __taskColumn
+                    spacing: 15
+                }
+            }
+        }
+    }
+    MouseArea {
+        id: __mouseArea
+        anchors.fill: parent
+        // 防鼠标事件穿透
+        onClicked: function(mouse) { mouse.accepted=true; }
+        onPressed: function(mouse) { mouse.accepted=true; }
+        onReleased: function(mouse) { mouse.accepted=true; }
+        onWheel: function(mouse) { mouse.accepted=true; }
+        onDoubleClicked: function(mouse) { mouse.accepted=true; }
+    }
+}

+ 8 - 0
src/qml/main.qml

@@ -323,6 +323,14 @@ ApplicationWindow {
         // anchors.verticalCenter: parent.verticalCenter
         // anchors.horizontalCenter: parent.horizontalCenter
     }
+    
+    Loader {
+        id: __returnKeyLockProcess
+        visible: false
+        
+        anchors.fill: parent
+        source: "components/ReturnKeyLockProcess.qml"
+    }
 
     Timer {
         id: swipeTimer

+ 2 - 2
src/usr/config.h

@@ -73,8 +73,8 @@ public:
 
     QString m_systemMACAddr;
 
-//    QString httpHost = "120.27.232.27:9292";
-    QString httpHost = "192.168.0.10:48080";
+    QString httpHost = "120.27.232.27:9292";
+//    QString httpHost = "192.168.0.10:48080";
     QString tenant_id = "1";
 
     QString userInfoUrl = "/admin-api/system/user/profile/get";                                             // 用户中心