更新

View/die-bonder-ui/CameraMaterialGroupWnd/Group.cpp

@@ -607,30 +607,48 @@ void Group::setCurrentCombox(const int index){
 
 }
 
-void Group::initBorderStyle(int index,int color) {
-    if (index == 2) {
-        if(color == 0){
+void Group::initBorderStyle(int index, int color)
+{
+    if (index == 2)
+    {
+        if (color == 0)
+        {
             ui->rightBackground->setStyleSheet("border: 2px solid blue;");
             m_pPreviouslySelectedBlueGroup = this;
         }
-        else {
+        else
+        {
             ui->rightBackground->setStyleSheet("border: 2px solid red;");
             m_pCurrentlySelectedGroup = this;
             m_pLastClickedGroup = this;
+            if (m_pPreviouslySelectedBlueGroup != nullptr) {
+                m_pPreviouslySelectedBlueGroup->ui->leftBackground->setStyleSheet("");
+                m_pPreviouslySelectedBlueGroup->ui->rightBackground->setStyleSheet("");
+                m_pPreviouslySelectedBlueGroup = nullptr;
+            }
         }
- 
+
     }
-    else {
-        if (color == 0) {
+    else
+    {
+        if (color == 0)
+        {
             ui->leftBackground->setStyleSheet("border: 2px solid blue;");
             m_pPreviouslySelectedBlueGroup = this;
         }
-        else {
+        else
+        {
             ui->leftBackground->setStyleSheet("border: 2px solid red;");
             m_pCurrentlySelectedGroup = this;
             m_pLastClickedGroup = this;
+            if (m_pPreviouslySelectedBlueGroup != nullptr)
+            {
+                m_pPreviouslySelectedBlueGroup->ui->leftBackground->setStyleSheet("");
+                m_pPreviouslySelectedBlueGroup->ui->rightBackground->setStyleSheet("");
+                m_pPreviouslySelectedBlueGroup = nullptr;
+            }
         }
     }
-    
-    
+
+
 }

View/die-bonder-ui/OriginalWnd/DbTreeViewManager.cpp

@@ -275,6 +275,7 @@ void DbTreeViewManager::initializeTree(QString name, const int &userPrivilege)
     }
     else if (name == "Programme")
     {
+        ClearFieldBut();
         if (m_pProgrammPage == nullptr)
         {
             m_pProgrammPage = new ProgrammPage();
@@ -284,6 +285,7 @@ void DbTreeViewManager::initializeTree(QString name, const int &userPrivilege)
     }
     else if (name == "Msg")  //TODO:yang 推荐后续定制页面都使用我这个
     {
+        ClearFieldBut();
         m_pDiagnosisPage = new DiagnosisPage();
         CustomizeWndCall(m_pDiagnosisPage);
     }
@@ -466,6 +468,17 @@ void DbTreeViewManager::initializeTree(QString name, const int &userPrivilege)
     }
 }
 
+void DbTreeViewManager::ClearFieldBut()
+{
+    for (auto& a : m_fieldWidgets)
+    {
+        if (!a.isNull())
+        {
+            a->hide();
+        }
+    }
+}
+
 void DbTreeViewManager::CustomizeWndCall(QWidget* pWnd, bool isAdd /*= true*/)
 {
     // 隐藏目录树和分隔线

View/die-bonder-ui/OriginalWnd/DbTreeViewManager.h

@@ -40,6 +40,10 @@ public:
      */
     void initializeTree(QString name, const int &userPrivilege);
 
+    /**清除菜单
+     */
+    void ClearFieldBut();
+
     /**自定义窗口
     * @isAdd 添加窗口
      */
@@ -257,7 +261,7 @@ private:
     /**
      * @brief  用于存储第三层界面生成的控件列表，方便统一管理和销毁
      */
-    QList<QWidget*>                 m_fieldWidgets;
+    QList<QPointer<QWidget>>                 m_fieldWidgets;
 
 
     /**

View/die-bonder-ui/OriginalWnd/MainAndSecondaryCamerasWnd.cpp

@@ -91,7 +91,7 @@ void MainAndSecondaryCamerasWnd::InitPage()
             }
             else
             {
-                m_pMainCameraBind->m_vecCamera[i].eType = MATERIAL_WAFER;
+                m_pMainCameraBind->m_vecCamera[i].eType = MATERIAL_BOND;
                 manager = new CameraImageHandler(num, m_pMainCameraBind->m_vecCamera[i]);
             }
 

View/die-bonder-ui/SBTdie-bonder-ui.vcxproj

@@ -274,6 +274,7 @@
     <ClCompile Include="Src\RewriteControl\JoystickPage.cpp" />
     <ClCompile Include="Src\RewriteControl\LightJoystickSwitchPage.cpp" />
     <ClCompile Include="Src\RewriteControl\MsgDlg\CustomMessageDlg.cpp" />
+    <ClCompile Include="Src\RewriteControl\MsgDlg\JMessageDlg.cpp" />
     <ClCompile Include="Src\RewriteControl\Sidebar\LogStatePage.cpp" />
     <ClCompile Include="Src\RewriteControl\SpeedAdjPage.cpp" />
     <ClCompile Include="Src\RewriteControl\SpeedAdjWnd.cpp" />
@@ -334,6 +335,7 @@
     <QtMoc Include="Src\RewriteControl\Controls\CustomCheckBox.h" />
     <QtMoc Include="Src\RewriteControl\Controls\CustomComboBox.h" />
     <QtMoc Include="Src\Program\TempControl\Page\ShowTempPage.h" />
+    <QtMoc Include="Src\RewriteControl\MsgDlg\JMessageDlg.h" />
     <ClInclude Include="Src\Sql\GetUiConfigFormDB.h" />
     <QtMoc Include="Src\Sql\SqlOperation.h" />
     <QtMoc Include="Src\CameraBind.h" />
@@ -427,6 +429,7 @@
     <QtUic Include="Src\RewriteControl\ControlOperationPage.ui" />
     <QtUic Include="Src\RewriteControl\LightJoystickSwitchPage.ui" />
     <QtUic Include="Src\RewriteControl\MsgDlg\CustomMessageDlg.ui" />
+    <QtUic Include="Src\RewriteControl\MsgDlg\JMessageDlg.ui" />
     <QtUic Include="Src\RewriteControl\SpeedAdjPage.ui" />
     <QtUic Include="Src\RewriteControl\SpeedAdjWnd.ui" />
     <QtUic Include="Src\SystemInfoPage\PageWnd\AccountMaintenanceWnd.ui" />

View/die-bonder-ui/SBTdie-bonder-ui.vcxproj.filters

@@ -372,6 +372,9 @@
     <ClCompile Include="Src\Program\TempControl\Page\ShowTempPage.cpp">
       <Filter>Source Files\Src\Program\TempControl\Page</Filter>
     </ClCompile>
+    <ClCompile Include="Src\RewriteControl\MsgDlg\JMessageDlg.cpp">
+      <Filter>Source Files\Src\RewriteControl\MsgDlg</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="ImageWidget.h">
@@ -548,6 +551,9 @@
     <QtMoc Include="Src\Program\TempControl\Page\ShowTempPage.h">
       <Filter>Source Files\Src\Program\TempControl\Page</Filter>
     </QtMoc>
+    <QtMoc Include="Src\RewriteControl\MsgDlg\JMessageDlg.h">
+      <Filter>Source Files\Src\RewriteControl\MsgDlg</Filter>
+    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="debug\moc_predefs.h.cbt">
@@ -651,6 +657,9 @@
     <QtUic Include="Src\Program\TempControl\Page\ShowTempPage.ui">
       <Filter>Source Files\Src\Program\TempControl\Page</Filter>
     </QtUic>
+    <QtUic Include="Src\RewriteControl\MsgDlg\JMessageDlg.ui">
+      <Filter>Source Files\Src\RewriteControl\MsgDlg</Filter>
+    </QtUic>
   </ItemGroup>
   <ItemGroup>
     <None Include="images\Participation display\BlackDiamond.png">

View/die-bonder-ui/Src/Program/TempControl/Page/ShowTempPage.cpp

@@ -35,15 +35,9 @@ void ShowTempPage::Init()
         return;
     }
     setStyleSheet(
-        //"QWidget { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F1F4FD, stop: 1 #E5E4F6); }"
-        "QDoubleSpinBox { background: #FFFFFF; border: 1px solid #BABBDC; border-radius: 6px; padding: 2px 5px; }"
-        "QSpinBox { background: #FFFFFF; border: 1px solid #BABBDC; border-radius: 6px; padding: 2px 5px; }"
+        "QWidget { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F1F4FD, stop: 1 #E5E4F6); }"
+        "QLineEdit::disabled  { background: #D8D8E3; border: 1px solid #BABBDC; border-radius: 6px; padding: 2px 5px; }"
         "QLineEdit { background: #FFFFFF; border: 1px solid #BABBDC; border-radius: 6px; padding: 2px 5px; }"
-        "QCheckBox::indicator { width: 20px; height: 20px; }"
-        "QCheckBox::indicator:unchecked { background-color: #FFFFFF; border-radius: 2px; }"
-        "QComboBox { background: #FFFFFF; border: 1px solid #BABBDC; border-radius: 6px; padding: 2px 5px; }"
-        "QComboBox::drop-down { width: 20px; }"
-
         "QPushButton { background: #D0D0E8; border: 1px solid #BABBDC; border-radius: 6px; padding: 2px 5px; }"  // Button background color
         "QPushButton:hover { background-color: #B0B0D8; }" // Lighter color on hover
         "QPushButton:pressed { background-color: #A0A0C8; }" // Darker color on press
@@ -136,6 +130,11 @@ void ShowTempPage::AddOrDel(int iId, int iSerialNumber, bool isDel)
                     if (currentGroup[i].iSerialNumber == iSerialNumber)
                     {
                         currentGroup.erase(currentGroup.begin() + i);
+                        /*if (m_pProduct)
+                       {
+                           m_pProduct->DeleteTemperatureList(currentGroup[i].iId,
+                               currentGroup[i].iSerialNumber);
+                       }*/
                         break;
                     }
                 }
@@ -155,6 +154,10 @@ void ShowTempPage::AddOrDel(int iId, int iSerialNumber, bool isDel)
                 }
                 _list.iSerialNumber += 1;
                 currentGroup.push_back(_list);
+                /* if (m_pProduct)
+              {
+                  m_pProduct->AddTemperatureList(_list);
+              }*/
             }
 
             for (int i = 0; i < currentGroup.size(); i++)
@@ -208,11 +211,7 @@ void ShowTempPage::InitSerialNumberList()
     for (int i = 0; i < m_groupedById.size(); i++)
     {
         ui->idListComboBox->addItem(QString::number(i));
-    }
-
-   // const std::vector<ns_db::TEMPERATURE_LIST_STRUCT>& currentGroup = m_groupedById[0].second;
-
-    
+    }  
 }
 
 void ShowTempPage::UpDataParameter(bool isDel /*= false*/, const ns_db::TEMPERATURE_LIST_STRUCT temperaturePar /*= {}*/)
@@ -281,7 +280,10 @@ void ShowTempPage::on_addBut_clicked()
 void ShowTempPage::on_saveAllBut_clicked()
 {
     //保存所有
-    //m_pProduct->GetAllTemperatureList();
+     /*if (m_pProduct)
+    {
+        m_pProduct->TemperatureListSaveToDB();
+    }*/
 }
 
 void ShowTempPage::GetDelTemperatureListSlots(int iId, int iSerialNumber)
@@ -303,6 +305,10 @@ void ShowTempPage::GetModifyTemperatureListSlots(const ns_db::TEMPERATURE_LIST_S
                 {
                     // 直接全部替换
                     currentGroup[i] = temperaturePar;
+                    /* if (m_pProduct)
+                    {
+                        m_pProduct->ModifyTemperatureList(temperaturePar);
+                    }*/
                     break;
                 }
             }

View/die-bonder-ui/Src/Program/TempControl/Page/ShowTempPage.ui

@@ -7,43 +7,36 @@
     <x>0</x>
     <y>0</y>
     <width>460</width>
-    <height>900</height>
+    <height>896</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <widget class="QWidget" name="layoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>10</y>
-     <width>441</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <layout class="QHBoxLayout" name="horizontalLayout">
-    <item>
-     <widget class="QLabel" name="label">
-      <property name="text">
-       <string extracomment="温度列表Id">Temperature List Id</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QComboBox" name="idListComboBox"/>
-    </item>
-   </layout>
-  </widget>
+  <property name="styleSheet">
+   <string notr="true"/>
+  </property>
   <widget class="JListWidget" name="serialNumberList">
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>77</y>
+     <y>84</y>
      <width>441</width>
-     <height>221</height>
+     <height>331</height>
     </rect>
    </property>
+   <property name="styleSheet">
+    <string notr="true"> QListWidget {
+	border-radius: 4px;
+	}
+QListWidget::item:hover {
+	background-color: rgba(176, 176, 216, 0.6);
+}
+QListWidget::item:selected {
+	background-color: rgba(160, 160, 200, 0.8);
+	color: #fff;
+}</string>
+   </property>
   </widget>
   <widget class="QPushButton" name="addBut">
    <property name="geometry">
@@ -54,17 +47,26 @@
      <height>23</height>
     </rect>
    </property>
+   <property name="cursor">
+    <cursorShape>PointingHandCursor</cursorShape>
+   </property>
+   <property name="toolTip">
+    <string extracomment="添加">add</string>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">image: url(:/images/Program/addMatrix.png);</string>
+   </property>
    <property name="text">
-    <string>Add</string>
+    <string/>
    </property>
   </widget>
   <widget class="QTabWidget" name="praTabWidget">
    <property name="geometry">
     <rect>
      <x>10</x>
-     <y>310</y>
+     <y>430</y>
      <width>441</width>
-     <height>390</height>
+     <height>451</height>
     </rect>
    </property>
   </widget>
@@ -77,8 +79,110 @@
      <height>23</height>
     </rect>
    </property>
+   <property name="cursor">
+    <cursorShape>PointingHandCursor</cursorShape>
+   </property>
+   <property name="toolTip">
+    <string extracomment="保存所有">Save all</string>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">image: url(:/images/Program/saveBondInfo.png);</string>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+  </widget>
+  <widget class="QLabel" name="label">
+   <property name="geometry">
+    <rect>
+     <x>11</x>
+     <y>11</y>
+     <width>211</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">background-color: transparent;
+border: none;</string>
+   </property>
    <property name="text">
-    <string>save all</string>
+    <string extracomment="温度列表Id:">Temperature List Id:</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QComboBox" name="idListComboBox">
+   <property name="geometry">
+    <rect>
+     <x>234</x>
+     <y>11</y>
+     <width>171</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="font">
+    <font>
+     <family>Agency FB</family>
+     <pointsize>14</pointsize>
+    </font>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>422</y>
+     <width>441</width>
+     <height>2</height>
+    </rect>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">background-color: rgb(199,202,235);</string>
+   </property>
+   <property name="frameShape">
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow">
+    <enum>QFrame::Raised</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_2">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>78</y>
+     <width>441</width>
+     <height>2</height>
+    </rect>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">background-color: rgb(199,202,235);</string>
+   </property>
+   <property name="frameShape">
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow">
+    <enum>QFrame::Raised</enum>
+   </property>
+  </widget>
+  <widget class="QFrame" name="frame_3">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>46</y>
+     <width>441</width>
+     <height>2</height>
+    </rect>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">background-color: rgb(199,202,235);</string>
+   </property>
+   <property name="frameShape">
+    <enum>QFrame::StyledPanel</enum>
+   </property>
+   <property name="frameShadow">
+    <enum>QFrame::Raised</enum>
    </property>
   </widget>
  </widget>

View/die-bonder-ui/Src/Program/TempControl/Page/ShowTemperatureListNumberWnd.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>419</width>
-    <height>48</height>
+    <height>49</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,62 +16,95 @@
   <property name="styleSheet">
    <string notr="true"/>
   </property>
-  <widget class="QWidget" name="layoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>9</x>
-     <y>9</y>
-     <width>401</width>
-     <height>31</height>
-    </rect>
-   </property>
-   <layout class="QHBoxLayout" name="horizontalLayout">
-    <item>
-     <widget class="QLabel" name="numbLabe">
-      <property name="text">
-       <string extracomment="温度列表 ID:">Temperature List ID:</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QLineEdit" name="IDlineEdit">
-      <property name="alignment">
-       <set>Qt::AlignCenter</set>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <spacer name="horizontalSpacer">
-      <property name="orientation">
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeType">
-       <enum>QSizePolicy::Fixed</enum>
-      </property>
-      <property name="sizeHint" stdset="0">
-       <size>
-        <width>45</width>
-        <height>20</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item>
-     <widget class="QPushButton" name="addBut">
-      <property name="text">
-       <string>add</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QPushButton" name="delBut">
-      <property name="text">
-       <string>del</string>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QLabel" name="numbLabe">
+     <property name="styleSheet">
+      <string notr="true">background-color: transparent;
+border: none;</string>
+     </property>
+     <property name="text">
+      <string extracomment="温度列表 ID:">Temperature List ID:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLineEdit" name="IDlineEdit">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>45</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QPushButton" name="addBut">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="cursor">
+      <cursorShape>PointingHandCursor</cursorShape>
+     </property>
+     <property name="toolTip">
+      <string extracomment="添加">add</string>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">image: url(:/images/Program/addMatrix.png);</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPushButton" name="delBut">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="cursor">
+      <cursorShape>PointingHandCursor</cursorShape>
+     </property>
+     <property name="toolTip">
+      <string extracomment="删除">delete</string>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">image: url(:/images/Program/deleteOuter.png);</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+  </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>

View/die-bonder-ui/Src/Program/TempControl/Page/ShowTemperatureWnd.cpp

@@ -9,6 +9,21 @@ ShowTemperatureWnd::ShowTemperatureWnd(QWidget *parent)
     ui.addBut->hide();
     ui.delBut->hide();
 
+    setStyleSheet(
+        "QWidget { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F1F4FD, stop: 1 #E5E4F6); }"
+        "QDoubleSpinBox { background: #FFFFFF; border: 1px solid #BABBDC; border-radius: 6px; padding: 2px 5px; }"
+        "QSpinBox { background: #FFFFFF; border: 1px solid #BABBDC; border-radius: 6px; padding: 2px 5px; }"
+        "QLineEdit { background: #FFFFFF; border: 1px solid #BABBDC; border-radius: 6px; padding: 2px 5px; }"
+        "QCheckBox::indicator { width: 20px; height: 20px; }"
+        "QCheckBox::indicator:unchecked { background-color: #FFFFFF; border-radius: 2px; }"
+        "QComboBox { background: #FFFFFF; border: 1px solid #BABBDC; border-radius: 6px; padding: 2px 5px; }"
+        "QComboBox::drop-down { width: 20px; }"
+
+        "QPushButton { background: #D0D0E8; border: 1px solid #BABBDC; border-radius: 6px; padding: 2px 5px; }"  // Button background color
+        "QPushButton:hover { background-color: #B0B0D8; }" // Lighter color on hover
+        "QPushButton:pressed { background-color: #A0A0C8; }" // Darker color on press
+    );
+
     Init();
 }
 

View/die-bonder-ui/Src/Program/TempControl/Page/ShowTemperatureWnd.ui

@@ -14,7 +14,7 @@
    <string>ShowTemperatureWnd</string>
   </property>
   <property name="styleSheet">
-   <string notr="true"/>
+   <string notr="true">background-color: rgb(240,243,253);</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -50,22 +50,40 @@
        </item>
        <item>
         <widget class="QPushButton" name="reviseBut">
+         <property name="toolTip">
+          <string extracomment="修改值">Modify value</string>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">image: url(:/images/Program/editTemplate.png);</string>
+         </property>
          <property name="text">
-          <string>Check</string>
+          <string/>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="addBut">
+         <property name="toolTip">
+          <string extracomment="添加">add</string>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">image: url(:/images/Program/addMatrix.png);</string>
+         </property>
          <property name="text">
-          <string>Add</string>
+          <string/>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="delBut">
+         <property name="toolTip">
+          <string extracomment="删除">delete</string>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">image: url(:/images/Program/deleteOuter.png);</string>
+         </property>
          <property name="text">
-          <string>Del</string>
+          <string/>
          </property>
         </widget>
        </item>
@@ -174,7 +192,7 @@
        <item row="12" column="0">
         <widget class="QLabel" name="label_18">
          <property name="text">
-          <string>4</string>
+          <string/>
          </property>
         </widget>
        </item>
@@ -272,7 +290,7 @@
        <item row="9" column="0">
         <widget class="QLabel" name="label_14">
          <property name="text">
-          <string>3</string>
+          <string/>
          </property>
         </widget>
        </item>
@@ -300,7 +318,7 @@
        <item row="6" column="0">
         <widget class="QLabel" name="label_9">
          <property name="text">
-          <string>2</string>
+          <string/>
          </property>
         </widget>
        </item>
@@ -314,7 +332,7 @@
        <item row="3" column="0">
         <widget class="QLabel" name="label_5">
          <property name="text">
-          <string>1</string>
+          <string/>
          </property>
         </widget>
        </item>
@@ -335,7 +353,7 @@
        <item row="14" column="0">
         <widget class="QLabel" name="label_21">
          <property name="text">
-          <string>5</string>
+          <string/>
          </property>
         </widget>
        </item>

View/die-bonder-ui/Src/Program/TempControl/TempControlPage.ui

@@ -22,6 +22,9 @@
      <height>951</height>
     </rect>
    </property>
+   <property name="styleSheet">
+    <string notr="true">background-color: rgb(233,233,248);</string>
+   </property>
    <property name="currentIndex">
     <number>-1</number>
    </property>

View/die-bonder-ui/Src/RewriteControl/ControlOperationPage.ui

@@ -62,6 +62,22 @@
     <property name="spacing">
      <number>2</number>
     </property>
+    <item>
+     <widget class="QPushButton" name="runStopCameraBut">
+      <property name="cursor">
+       <cursorShape>PointingHandCursor</cursorShape>
+      </property>
+      <property name="toolTip">
+       <string extracomment="关闭相机">Close Camera</string>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">background-image: url(:/images/light/Camera.png);
+background-repeat: no-repeat;
+background-position: center; /* 可选，使图片居中显示 */
+border: none; /* 可选，移除按钮边框 */</string>
+      </property>
+     </widget>
+    </item>
     <item>
      <widget class="QPushButton" name="ZoomUpButton">
       <property name="text">
@@ -167,22 +183,6 @@ border: none; /* 可选，移除按钮边框 */</string>
       </property>
      </widget>
     </item>
-    <item>
-     <widget class="QPushButton" name="runStopCameraBut">
-      <property name="cursor">
-       <cursorShape>PointingHandCursor</cursorShape>
-      </property>
-      <property name="toolTip">
-       <string extracomment="关闭相机">Close Camera</string>
-      </property>
-      <property name="styleSheet">
-       <string notr="true">background-image: url(:/images/light/Camera.png);
-background-repeat: no-repeat;
-background-position: center; /* 可选，使图片居中显示 */
-border: none; /* 可选，移除按钮边框 */</string>
-      </property>
-     </widget>
-    </item>
    </layout>
   </widget>
   <widget class="ImageWidget" name="Operatewidget" native="true">

View/die-bonder-ui/Src/RewriteControl/LightJoystickSwitchPage.cpp

@@ -415,7 +415,10 @@ void LightJoystickSwitchPage::InitMainCameraBind(CameraBind* pCameraBind, bool b
     }
     if (m_pCameraBind)
     {
-        DeduplicationBox(ui->modeComboBox, m_pCameraBind->m_vecCAxis, 0);
+        if (m_pCameraBind->m_vecCAxis.size() > 0)
+        {
+            DeduplicationBox(ui->modeComboBox, m_pCameraBind->m_vecCAxis, 0);
+        }
     }
 }
 

View/die-bonder-ui/Src/RewriteControl/MsgDlg/CustomMessageDlg.ui

@@ -39,7 +39,9 @@ border-radius: 9px;</string>
     </size>
    </property>
    <property name="styleSheet">
-    <string notr="true">background-color: rgba(88, 91, 221, 1);</string>
+    <string notr="true">background-color: rgba(88, 91, 221, 1);
+border-top-left-radius: 15px;
+border-top-right-radius: 15px;</string>
    </property>
    <property name="text">
     <string/>

View/die-bonder-ui/Src/RewriteControl/MsgDlg/JMessageDlg.cpp

@@ -0,0 +1,119 @@
+#include "JMessageDlg.h"
+#include "ui_JMessageDlg.h"
+#include <QPainter>
+#include <QPainterPath>
+#include <QMouseEvent>
+#include <QApplication>
+
+JMessageDlg::JMessageDlg(QWidget *parent)
+    : QDialog(parent)
+    , ui(new Ui::JMessageDlg),
+    m_dragging(false),
+    m_cornerRadius(15),
+    m_backgroundColor(240, 240, 240)
+{
+    ui->setupUi(this);
+    setWindowFlags(Qt::FramelessWindowHint);
+    setAttribute(Qt::WA_TranslucentBackground);
+
+    ui->textLabel->setWordWrap(true);
+}
+
+JMessageDlg::~JMessageDlg()
+{
+    delete ui;
+}
+
+
+void JMessageDlg::SetTip(const QString& title,const QString& text, MSG_TYPE type/*= MSG_TYPE::question*/)
+{
+    ui->bgTitleLabel->setText(title);
+    ui->textLabel->setText(text);
+
+    QString strType = R"(border-image: url()";
+
+    switch (type)
+    {
+    case question:
+        strType += ":/images/Mess/Mess_tip.png";
+        break;
+    default:
+        break;
+    }
+    strType += ");";
+    ui->lmageLable->setStyleSheet(strType);
+    //border-image: url(:/images/Mess/Mess_tip.png);
+}
+
+void JMessageDlg::paintEvent(QPaintEvent *event)
+{
+    Q_UNUSED(event);
+
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+    painter.setRenderHint(QPainter::SmoothPixmapTransform);
+    QPainterPath path;
+    path.addRoundedRect(rect(), m_cornerRadius, m_cornerRadius);
+    painter.setClipPath(path);
+    painter.fillPath(path, m_backgroundColor);
+
+    // 或者你可以绘制图片作为背景
+    // QPixmap bgPixmap(":/path/to/your/image.png"); // 替换为你的图片路径
+    // painter.drawPixmap(rect(), bgPixmap);
+
+    QPen borderPen(Qt::lightGray);
+    borderPen.setWidth(1);
+    painter.setPen(borderPen);
+    painter.setBrush(Qt::NoBrush);
+    painter.drawPath(path);
+
+    QDialog::paintEvent(event);
+}
+
+void JMessageDlg::mousePressEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton)
+    {
+        m_dragging = true;
+        m_dragPosition = event->globalPos() - frameGeometry().topLeft();
+        event->accept();
+    }
+    QDialog::mousePressEvent(event);
+}
+
+void JMessageDlg::mouseMoveEvent(QMouseEvent *event)
+{
+    if (m_dragging && (event->buttons() & Qt::LeftButton))
+    {
+        move(event->globalPos() - m_dragPosition);
+        event->accept();
+    }
+    QDialog::mouseMoveEvent(event);
+}
+
+void JMessageDlg::mouseReleaseEvent(QMouseEvent *event)
+{
+    Q_UNUSED(event);
+    m_dragging = false;
+    QDialog::mouseReleaseEvent(event);
+}
+
+
+void JMessageDlg::on_closeBut_clicked()
+{
+    m_ret = QMessageBox::No;
+    this->close();
+}
+
+void JMessageDlg::on_yesBut_clicked()
+{
+    m_ret = QMessageBox::Yes;
+    this->close();
+}
+
+void JMessageDlg::on_noBut_clicked()
+{
+    m_ret = QMessageBox::No;
+    this->close();
+}
+

View/die-bonder-ui/Src/RewriteControl/MsgDlg/JMessageDlg.h

@@ -0,0 +1,63 @@
+#ifndef JMESSAGEDLG_H
+#define JMESSAGEDLG_H
+
+#include <QDialog>
+#include <QMessageBox>
+
+//消息类型
+enum MSG_TYPE
+{
+    question,
+
+
+};
+
+
+namespace Ui {
+class JMessageDlg;
+}
+
+class JMessageDlg : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit JMessageDlg(QWidget *parent = nullptr);
+    ~JMessageDlg();
+
+    /**设置提示
+    * @strTitle 标题
+    * @strTip   提示文字
+     */
+    void SetTip(const QString& title,const QString& text, MSG_TYPE type = MSG_TYPE::question);
+protected:
+    void paintEvent(QPaintEvent *event) override;
+
+    void mousePressEvent(QMouseEvent *event) override;
+
+    void mouseMoveEvent(QMouseEvent *event) override;
+
+    void mouseReleaseEvent(QMouseEvent *event) override;
+
+private slots:
+    void on_closeBut_clicked();
+
+    void on_yesBut_clicked();
+
+    void on_noBut_clicked();
+
+private:
+    QPoint m_dragPosition;
+    bool m_dragging;
+    int m_cornerRadius;
+    QColor m_backgroundColor;
+private:
+    Ui::JMessageDlg *ui;
+
+public:
+    /**返回值
+     */
+    QMessageBox::StandardButton m_ret = QMessageBox::NoButton;
+};
+
+#endif // JMESSAGEDLG_H

View/die-bonder-ui/Src/RewriteControl/MsgDlg/JMessageDlg.ui

@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>JMessageDlg</class>
+ <widget class="QDialog" name="JMessageDlg">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>611</width>
+    <height>210</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true"/>
+  </property>
+  <widget class="QLabel" name="bgLabel">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>611</width>
+     <height>48</height>
+    </rect>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>0</width>
+     <height>48</height>
+    </size>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">background-color: rgba(92,99,190, 1);
+border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+/*border-radius: 15px;*/</string>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="closeBut">
+   <property name="geometry">
+    <rect>
+     <x>580</x>
+     <y>11</y>
+     <width>27</width>
+     <height>27</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>0</width>
+     <height>0</height>
+    </size>
+   </property>
+   <property name="maximumSize">
+    <size>
+     <width>27</width>
+     <height>27</height>
+    </size>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">background-color: rgba(92,99,190, 1);</string>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="../../../res.qrc">
+     <normaloff>:/images/Mess/close.png</normaloff>:/images/Mess/close.png</iconset>
+   </property>
+  </widget>
+  <widget class="QLabel" name="bgTitleLabel">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>8</y>
+     <width>191</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">background-color: rgba(92,99,190, 1);
+color: white</string>
+   </property>
+   <property name="text">
+    <string>Process FailuRE</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="yesBut">
+   <property name="geometry">
+    <rect>
+     <x>370</x>
+     <y>160</y>
+     <width>111</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Yes</string>
+   </property>
+  </widget>
+  <widget class="QPushButton" name="noBut">
+   <property name="geometry">
+    <rect>
+     <x>500</x>
+     <y>160</y>
+     <width>101</width>
+     <height>41</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>No</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="textLabel">
+   <property name="geometry">
+    <rect>
+     <x>160</x>
+     <y>60</y>
+     <width>441</width>
+     <height>81</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>TextLabel</string>
+   </property>
+  </widget>
+  <widget class="QLabel" name="lmageLable">
+   <property name="geometry">
+    <rect>
+     <x>40</x>
+     <y>80</y>
+     <width>71</width>
+     <height>71</height>
+    </rect>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">border-image: url(:/images/Mess/Mess_tip.png);</string>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+  </widget>
+ </widget>
+ <resources>
+  <include location="../../../res.qrc"/>
+ </resources>
+ <connections/>
+</ui>

View/die-bonder-ui/Src/common/JMessageTip.cpp

@@ -1,5 +1,6 @@
 #include "JMessageTip.h"
 #include "../RewriteControl/MsgDlg/CustomMessageDlg.h"
+#include "../RewriteControl/MsgDlg/JMessageDlg.h"
 
 JMessageTip::JMessageTip()
 {
@@ -17,7 +18,12 @@ void JMessageTip::Message_information(const QString& strTitle, const QString& st
 
 QMessageBox::StandardButton JMessageTip::Message_question(const QString& strMsg, QWidget* parent /*= nullptr*/)
 {
-    return QMessageBox::information(nullptr, tr("warn","警告"), strMsg, QMessageBox::Yes | QMessageBox::No);
+    JMessageDlg msg;
+    msg.SetTip(tr("warn", "警告"), strMsg);
+    msg.exec();
+
+    return msg.m_ret;
+    //return QMessageBox::information(nullptr, tr("warn", "警告"),strMsg, QMessageBox::Yes | QMessageBox::No);
 }
 
 void JMessageTip::Message_warning(const QString& strMsg, QWidget* parent /*= nullptr*/)

View/die-bonder-ui/res.qrc

@@ -127,5 +127,9 @@
         <file>images/light/CloseCamera.png</file>
         <file>images/light/control.png</file>
         <file>images/light/light.png</file>
+        <file>images/Mess/Mess_ask.png</file>
+        <file>images/Mess/Mess_error.png</file>
+        <file>images/Mess/Mess_tip.png</file>
+        <file>images/Mess/Mess_warn.png</file>
     </qresource>
 </RCC>