Browse Source

feat: 第一版

leslie 2 years ago
parent
commit
40c281b82c

+ 107 - 49
ScanUtils/ScanInput.py

@@ -1,28 +1,20 @@
-# coding:utf8
+# -*- coding: utf-8 -*-
 '''
 @Project :Scan 
 @File :ScanInput.py
 @Author :Leslie
 @Date :2023/5/6 9:03 
 '''
-import datetime
 import os
-from PyQt5.QtCore import *
-
 import time
 
-from PyQt5.QtCore import QCoreApplication, QThread, pyqtSignal, QDate
+from PyQt5.QtCore import QCoreApplication
 from PyQt5.QtGui import QIcon
-
-from PyQt5.QtWidgets import QApplication, QWidget, QFileDialog, QPlainTextEdit, QMessageBox
-
-import CRC8
-from ScanUtils import Config
-from ScanUtils.Config import Configuration
-from ScanUtils.Dialogadd import Dialogadd
-
-from ScanUtils.ui.Scan import Ui_Form
-from VersionSet import VersionSet
+from PyQt5.QtWidgets import QFileDialog, QMessageBox
+import Config
+from Config import Configuration
+from Dialogadd import Dialogadd
+from ui.Scan import Ui_Form
 
 softwareIconPath = r'./pic/scan.png'
 folderName = 'material'
@@ -44,27 +36,32 @@ from PyQt5.QtWidgets import *
 
 class ScanInput(QWidget):
 
-    def __init__(self, versionCode,productDate, parent=None, closeToDlg=None):
+    def __init__(self, versionCode='sss',productDate="aaaa",directory="C:/Users/lili/Desktop/material",parent=None, closeToDlg=None):
         super(ScanInput, self).__init__(parent)
         self.ui = Ui_Form()
         self.ui.setupUi(self)
         self.setWindowTitle("物料扫码")
         self.setWindowIcon(QIcon(softwareIconPath))
+
+        self.directory = directory
+
         self.ui.versionCode.setText(versionCode)
         self.ui.Deliverydate.setText(productDate)
 
         self.QComboBoxnit()
 
-        self.ui.save.clicked.connect(self.actSaveTriggered)
+        # self.ui.save.clicked.connect(self.actSaveTriggered)
         self.ui.open.clicked.connect(self.actOpenTriggered)
 
         self.ui.materialType.currentTextChanged.connect(self.materialTypeChanged)
 
+        QMessageBox.information(self, '提示', '请在英文输入法状态下进行扫码操作')
+
         # 创建保存.txt的文件夹
-        self.mkdirFile()
+        # self.mkdirFile()
 
         # 线程传参
-        self.autoSave = AutoSaveThread(self)
+        self.autoSave = AutoSaveThread(self,directory)
         self.autoSave.start()
 
 
@@ -79,6 +76,7 @@ class ScanInput(QWidget):
     def QComboBoxnit(self):
         paramDict = self.getParamDict()
         for item in paramDict:
+            item = str(item)
             self.ui.materialType.addItem(item)
 
     # 打开文件
@@ -97,23 +95,28 @@ class ScanInput(QWidget):
         if QFileName[0]:
 
             fileName = QFileName[0].split("/")[-1].split(".")[0].split("_")
-            versionCode = fileName[0]
-            deliveryDate = fileName[1]
 
-            self.ui.Deliverydate.setText(deliveryDate)
-            self.ui.versionCode.setText(versionCode)
 
-            f = open(QFileName[0], 'r')
-            with f:
-                data = f.read()
-                self.ui.plainTextEdit.setPlainText(data)
+            if len(fileName)==2:
+                versionCode = fileName[0]
+                deliveryDate = fileName[1]
+
+                self.ui.Deliverydate.setText(deliveryDate)
+                self.ui.versionCode.setText(versionCode)
+
+                f = open(QFileName[0], 'r',encoding='utf-8')
+                with f:
+                    data = f.read()
+                    self.ui.plainTextEdit.setPlainText(data)
+            else:
+                QMessageBox.critical(self,'错误','请选择以版本代码+发料日期为名的.txt文件')
 
-    # 文件保存
+    # 文件另存为
     def actSaveTriggered(self):
 
         desktopPath = Configuration().get_desktop()
 
-        # print(VersionSet.getCurrentParam())
+
         versionCode = self.ui.versionCode.text()
         Deliverydate = self.ui.Deliverydate.text()
         filenameStr = versionCode + "_" + Deliverydate + ".txt"
@@ -138,29 +141,27 @@ class ScanInput(QWidget):
             QMessageBox.information(self, "提示", "数据文件保存成功!", QMessageBox.Ok)
             return aFileName, saveFlag
 
-
-
     # 物料类别选择
     def materialTypeChanged(self, materialType):
-        print(materialType)
 
         if not materialType == '无':
             str = "= = = = = = = = = = = = " + materialType + " = = = = = = = = = = = = ="
-            self.ui.plainTextEdit.insertPlainText(str + "\n")
+            self.ui.plainTextEdit.insertPlainText(str +"\n")
             self.ui.plainTextEdit.insertPlainText("\n")
 
 
-    # 创建保存文件的文件夹
-    def mkdirFile(self):
-
-        desktopPath = Configuration().get_desktop()
-
-        folderNamePath = desktopPath + '\\' + folderName
 
-        if not os.path.exists(folderNamePath):
-            os.mkdir(folderNamePath)
-        else:
-            return True
+    # 创建保存文件的文件夹
+    # def mkdirFile(self):
+    #
+    #     desktopPath = Configuration().get_desktop()
+    #
+    #     folderNamePath = desktopPath + '\\' + folderName
+    #
+    #     if not os.path.exists(folderNamePath):
+    #         os.mkdir(folderNamePath)
+    #     else:
+    #         return True
 
     # 添加物料类别的界面 目前没用
     def openDialog(self):
@@ -171,13 +172,61 @@ class ScanInput(QWidget):
         dialog.dialogSignel.connect(self.slot_emit)
         dialog.show()
 
+    def closeThread(self):
+        self.autoSave.stop()
+
+    def closeEvent(self, event):
+        # # desktopPath = Configuration().get_desktop()
+        #
+        versionCode = self.ui.versionCode.text()
+
+        deliveryDate = self.ui.Deliverydate.text()
+
+        filenameStr = versionCode + "_" + deliveryDate + ".txt"
+
+        filePath = self.directory
+
+        filePathName = filePath + '/' + filenameStr
+
+        result = QMessageBox.question(self, "注意:", "将文件保存到"+filePathName, QMessageBox.Ok)
+
+
+        if result == QMessageBox.Ok:
+
+            txt = self.ui.plainTextEdit.toPlainText()
+
+
+
+            file = open(filePathName, 'w',encoding="utf-8")
+
+            file.write(txt)
+
+            file.close()
+
+            #关闭线程
+            self.autoSave.terminate()  # 结束此进程
+
+            self.autoSave.wait()  # 等待结束完成
+
+            if self.autoSave.isFinished():  # 如果当前线程已经完成工作,则删除
+
+                del self.autoSave
+
+            event.accept()
+
+        else:
+            event.ignore()
+            # QMessageBox.information(self, "消息", "谢谢!")
+
+
+
 
 
 # 自动保存 线程任务
 class AutoSaveThread(QThread):
 
     # 初始化传参
-    def __init__(self, inputDiog,parent=None):
+    def __init__(self, inputDiog,directory,parent=None):
         super(AutoSaveThread, self).__init__(parent)
 
         self.inputDiog = inputDiog
@@ -186,27 +235,36 @@ class AutoSaveThread(QThread):
 
         self.deliveryDate = inputDiog.ui.Deliverydate.text()
 
+        self.directory = directory
+
+
 
     def run(self):
         self.loop_monitor()
 
+
+
     def time_printer(self):
 
         # 定时
         if self.inputDiog.ui.plainTextEdit.toPlainText():
 
-            desktopPath = Configuration().get_desktop()
+            # desktopPath = Configuration().get_desktop()
 
             versionCode = self.versionCode
-            deliveryDate = self.Deliverydate
+            deliveryDate = self.deliveryDate
+
+            filePath = self.directory
 
             filenameStr = versionCode+"_"+deliveryDate + ".txt"
 
-            filePathName = desktopPath + '\\' + folderName + '\\' + filenameStr
+            # filePathName = filePath + '\\' + folderName + '\\' + filenameStr
+
+            filePathName = filePath + '/'  + filenameStr
 
             txt = self.inputDiog.ui.plainTextEdit.toPlainText()
 
-            file = open(filePathName, 'w')
+            file = open(filePathName, 'w',encoding="utf-8")
 
             file.write(txt)
 
@@ -217,7 +275,7 @@ class AutoSaveThread(QThread):
             self.loop_monitor()
 
     def loop_monitor(self):
-        time.sleep(20)
+        time.sleep(60*5)
         self.time_printer()
 
 

+ 58 - 8
ScanUtils/VersionSet.py

@@ -1,17 +1,18 @@
-import time
+import os
 
 from PyQt5.QtCore import *
+from PyQt5.QtCore import Qt
 from PyQt5.QtGui import *
 from PyQt5.QtWidgets import *
 
-from ScanUtils import CRC8
+import CRC8
+from Config import Configuration
 
+from ui.VersionSet import Ui_Form
 
-from ScanUtils.ui.VersionSet import Ui_Form
+softwareIconPath = r'D:\PycharmProjects\Scan\ScanUtils\pic\scan.png'
 
-
-
-softwareIconPath = r'./pic/scan.png'
+folderName = 'material'
 
 # class MySlot(QObject):
 #     def get(self,msg):
@@ -135,6 +136,11 @@ class VersionSet(QWidget):
 
         self.updateStatus()
 
+        self.setDirDefault()
+
+        # 创建保存.txt的文件夹
+        self.mkdirFile()
+
         self.ui.chipVer_1.activated.connect(self.updateStatus)
         self.ui.chipVer_2.activated.connect(self.updateStatus)
 
@@ -157,6 +163,7 @@ class VersionSet(QWidget):
 
         # self.ui.copy.clicked.connect(self.copySolf)
         self.ui.commit.clicked.connect(self.open_ScanInput)
+        self.ui.change_dir.clicked.connect(self.select_dir)
         # self.ui.read.clicked.connect(self.readSolf
         # self.ui.write.clicked.connect(self.writeSolf)
         # self.ui.analyst.clicked.connect(self.analystSolf).
@@ -165,15 +172,58 @@ class VersionSet(QWidget):
     def open_ScanInput(self):
         versionCode= self.ui.versionCode.text()
         productDate = self.ui.productDate.text()
-        from ScanUtils.ScanInput import ScanInput
-        self.ScanInput_ui = ScanInput(versionCode,productDate)
+        # 默认路径名
+        directory = self.ui.dir.text()
+
+
+        from ScanInput import ScanInput
+        self.ScanInput_ui = ScanInput(versionCode,productDate,directory)
 
         #self.ScanInput_ui.ui.versionCode.setText(versionCode)
         # self.ScanInput_ui.ui.Deliverydate.setText(productDate)
 
         self.ScanInput_ui.show()
 
+    # 创建默认的文件夹
+    def mkdirFile(self):
+
+        desktopPath = Configuration().get_desktop()
+
+        folderNamePath = desktopPath + '\\' + folderName
+
+        if not os.path.exists(folderNamePath):
+            os.mkdir(folderNamePath)
+        else:
+            return True
+
+    # 更改目录
+    def select_dir(self):
+        filePathName = self.ui.dir.text()
+
+        options = QFileDialog.Options()
+        options |= QFileDialog.ShowDirsOnly
+        # 获取返回在值
+        directory = QFileDialog.getExistingDirectory(self, "选择目录",os.path.expanduser(filePathName), options=options)
+        if not directory:
+            self.ui.dir.setText(filePathName)
+        else:
+            self.ui.dir.setText(directory)
+        # if directory:
+        #     file_name = 'new_file.txt'
+        #     file_path = os.path.join(directory, file_name)
+        #     with open(file_path, 'w') as f:        #         f.write('新文件内容')
+
+
+    # 默认地址
+    def setDirDefault(self):
+
+        desktopPath = Configuration().get_desktop()
+
+        desktopPath = desktopPath.replace('\\','/')
+
+        filePathName = desktopPath + '/' + folderName
 
+        self.ui.dir.setText(filePathName)
 
 
 

+ 0 - 7
ScanUtils/__init__.py

@@ -1,7 +0,0 @@
-# coding:utf8
-'''
-@Project :Scan 
-@File :__init__.py.py
-@Author :Leslie
-@Date :2023/5/5 17:05 
-'''

+ 1 - 1
ScanUtils/main.py

@@ -14,4 +14,4 @@ if __name__ == '__main__':
     app = QApplication(sys.argv)
     ui = VersionSet()
     ui.show()
-    sys.exit(app.exec_())
+    sys.exit(app.exec_())

BIN
ScanUtils/pic/Scan.ico


BIN
ScanUtils/scan.ico


+ 2 - 1
ScanUtils/setting.yml

@@ -2,4 +2,5 @@ materials:
   - 无
   - 电 容
   - 电 阻
-  - 芯 片
+  - 芯 片
+  - 222

+ 29 - 35
ScanUtils/ui/Scan.py

@@ -14,55 +14,50 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_Form(object):
     def setupUi(self, Form):
         Form.setObjectName("Form")
-        Form.resize(998, 811)
+        Form.resize(992, 811)
         self.gridLayout_3 = QtWidgets.QGridLayout(Form)
         self.gridLayout_3.setObjectName("gridLayout_3")
-        self.formLayout = QtWidgets.QFormLayout()
-        self.formLayout.setObjectName("formLayout")
+        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
         self.material = QtWidgets.QLabel(Form)
+        self.material.setMinimumSize(QtCore.QSize(100, 0))
+        self.material.setMaximumSize(QtCore.QSize(100, 16777215))
         font = QtGui.QFont()
         font.setPointSize(14)
         font.setBold(True)
         font.setWeight(75)
         self.material.setFont(font)
         self.material.setObjectName("material")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.material)
+        self.horizontalLayout_2.addWidget(self.material)
         self.materialType = QtWidgets.QComboBox(Form)
         font = QtGui.QFont()
         font.setPointSize(14)
         font.setBold(True)
-        font.setUnderline(False)
         font.setWeight(75)
         self.materialType.setFont(font)
-        self.materialType.setMaxVisibleItems(11)
         self.materialType.setObjectName("materialType")
-        self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.materialType)
-        self.gridLayout_3.addLayout(self.formLayout, 0, 0, 1, 1)
-        self.plainTextEdit = QtWidgets.QPlainTextEdit(Form)
-        font = QtGui.QFont()
-        font.setPointSize(14)
-        self.plainTextEdit.setFont(font)
-        self.plainTextEdit.setPlainText("")
-        self.plainTextEdit.setObjectName("plainTextEdit")
-        self.gridLayout_3.addWidget(self.plainTextEdit, 2, 0, 1, 1)
-        self.splitter_2 = QtWidgets.QSplitter(Form)
-        self.splitter_2.setOrientation(QtCore.Qt.Horizontal)
-        self.splitter_2.setObjectName("splitter_2")
-        self.open = QtWidgets.QPushButton(self.splitter_2)
+        self.horizontalLayout_2.addWidget(self.materialType)
+        self.open = QtWidgets.QPushButton(Form)
+        self.open.setMinimumSize(QtCore.QSize(100, 0))
+        self.open.setMaximumSize(QtCore.QSize(100, 16777215))
         font = QtGui.QFont()
         font.setPointSize(14)
         font.setBold(True)
         font.setWeight(75)
         self.open.setFont(font)
+        self.open.setLayoutDirection(QtCore.Qt.LeftToRight)
         self.open.setObjectName("open")
-        self.save = QtWidgets.QPushButton(self.splitter_2)
+        self.horizontalLayout_2.addWidget(self.open)
+        self.gridLayout_3.addLayout(self.horizontalLayout_2, 0, 0, 1, 1)
+        self.plainTextEdit = QtWidgets.QPlainTextEdit(Form)
+        self.plainTextEdit.setMinimumSize(QtCore.QSize(12, 0))
         font = QtGui.QFont()
+        font.setFamily("宋体")
         font.setPointSize(14)
-        font.setBold(True)
-        font.setWeight(75)
-        self.save.setFont(font)
-        self.save.setObjectName("save")
-        self.gridLayout_3.addWidget(self.splitter_2, 1, 0, 1, 1)
+        self.plainTextEdit.setFont(font)
+        self.plainTextEdit.setPlainText("")
+        self.plainTextEdit.setObjectName("plainTextEdit")
+        self.gridLayout_3.addWidget(self.plainTextEdit, 1, 0, 1, 1)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
         self.gridLayout = QtWidgets.QGridLayout()
@@ -86,12 +81,6 @@ class Ui_Form(object):
         self.horizontalLayout.addItem(spacerItem)
         self.gridLayout_2 = QtWidgets.QGridLayout()
         self.gridLayout_2.setObjectName("gridLayout_2")
-        self.Deliverydate = QtWidgets.QLabel(Form)
-        font = QtGui.QFont()
-        font.setPointSize(14)
-        self.Deliverydate.setFont(font)
-        self.Deliverydate.setObjectName("Deliverydate")
-        self.gridLayout_2.addWidget(self.Deliverydate, 0, 1, 1, 1)
         self.label_5 = QtWidgets.QLabel(Form)
         font = QtGui.QFont()
         font.setPointSize(14)
@@ -100,8 +89,14 @@ class Ui_Form(object):
         self.label_5.setFont(font)
         self.label_5.setObjectName("label_5")
         self.gridLayout_2.addWidget(self.label_5, 0, 0, 1, 1)
+        self.Deliverydate = QtWidgets.QLabel(Form)
+        font = QtGui.QFont()
+        font.setPointSize(14)
+        self.Deliverydate.setFont(font)
+        self.Deliverydate.setObjectName("Deliverydate")
+        self.gridLayout_2.addWidget(self.Deliverydate, 0, 1, 1, 1)
         self.horizontalLayout.addLayout(self.gridLayout_2)
-        self.gridLayout_3.addLayout(self.horizontalLayout, 3, 0, 1, 1)
+        self.gridLayout_3.addLayout(self.horizontalLayout, 2, 0, 1, 1)
 
         self.retranslateUi(Form)
         QtCore.QMetaObject.connectSlotsByName(Form)
@@ -109,10 +104,9 @@ class Ui_Form(object):
     def retranslateUi(self, Form):
         _translate = QtCore.QCoreApplication.translate
         Form.setWindowTitle(_translate("Form", "Form"))
-        self.material.setText(_translate("Form", "物料类型"))
+        self.material.setText(_translate("Form", "物料类型"))
         self.open.setText(_translate("Form", "打开文件"))
-        self.save.setText(_translate("Form", "另保存"))
         self.label.setText(_translate("Form", "版本代码:"))
         self.versionCode.setText(_translate("Form", "1111"))
-        self.Deliverydate.setText(_translate("Form", "1111"))
         self.label_5.setText(_translate("Form", "发料日期:"))
+        self.Deliverydate.setText(_translate("Form", "1111"))

+ 62 - 49
ScanUtils/ui/Scan.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>998</width>
+    <width>992</width>
     <height>811</height>
    </rect>
   </property>
@@ -15,9 +15,21 @@
   </property>
   <layout class="QGridLayout" name="gridLayout_3">
    <item row="0" column="0">
-    <layout class="QFormLayout" name="formLayout">
-     <item row="0" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
       <widget class="QLabel" name="material">
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>100</width>
+         <height>16777215</height>
+        </size>
+       </property>
        <property name="font">
         <font>
          <pointsize>14</pointsize>
@@ -26,31 +38,63 @@
         </font>
        </property>
        <property name="text">
-        <string>物料类型</string>
+        <string>物料类型</string>
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
+     <item>
       <widget class="QComboBox" name="materialType">
        <property name="font">
         <font>
          <pointsize>14</pointsize>
          <weight>75</weight>
          <bold>true</bold>
-         <underline>false</underline>
         </font>
        </property>
-       <property name="maxVisibleItems">
-        <number>11</number>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="open">
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>100</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>14</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="layoutDirection">
+        <enum>Qt::LeftToRight</enum>
+       </property>
+       <property name="text">
+        <string>打开文件</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="2" column="0">
+   <item row="1" column="0">
     <widget class="QPlainTextEdit" name="plainTextEdit">
+     <property name="minimumSize">
+      <size>
+       <width>12</width>
+       <height>0</height>
+      </size>
+     </property>
      <property name="font">
       <font>
+       <family>宋体</family>
        <pointsize>14</pointsize>
       </font>
      </property>
@@ -59,38 +103,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QSplitter" name="splitter_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <widget class="QPushButton" name="open">
-      <property name="font">
-       <font>
-        <pointsize>14</pointsize>
-        <weight>75</weight>
-        <bold>true</bold>
-       </font>
-      </property>
-      <property name="text">
-       <string>打开文件</string>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="save">
-      <property name="font">
-       <font>
-        <pointsize>14</pointsize>
-        <weight>75</weight>
-        <bold>true</bold>
-       </font>
-      </property>
-      <property name="text">
-       <string>另存为</string>
-      </property>
-     </widget>
-    </widget>
-   </item>
-   <item row="3" column="0">
+   <item row="2" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <layout class="QGridLayout" name="gridLayout">
@@ -137,29 +150,29 @@
      </item>
      <item>
       <layout class="QGridLayout" name="gridLayout_2">
-       <item row="0" column="1">
-        <widget class="QLabel" name="Deliverydate">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_5">
          <property name="font">
           <font>
            <pointsize>14</pointsize>
+           <weight>75</weight>
+           <bold>true</bold>
           </font>
          </property>
          <property name="text">
-          <string>1111</string>
+          <string>发料日期:</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_5">
+       <item row="0" column="1">
+        <widget class="QLabel" name="Deliverydate">
          <property name="font">
           <font>
            <pointsize>14</pointsize>
-           <weight>75</weight>
-           <bold>true</bold>
           </font>
          </property>
          <property name="text">
-          <string>发料日期:</string>
+          <string>1111</string>
          </property>
         </widget>
        </item>

+ 150 - 120
ScanUtils/ui/VersionSet.py

@@ -14,12 +14,74 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_Form(object):
     def setupUi(self, Form):
         Form.setObjectName("Form")
-        Form.resize(555, 637)
+        Form.resize(555, 668)
         font = QtGui.QFont()
         font.setPointSize(14)
         Form.setFont(font)
         self.gridLayout = QtWidgets.QGridLayout(Form)
         self.gridLayout.setObjectName("gridLayout")
+        self.groupBox = QtWidgets.QGroupBox(Form)
+        self.groupBox.setObjectName("groupBox")
+        self.horizontalLayout = QtWidgets.QHBoxLayout(self.groupBox)
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.label_2 = QtWidgets.QLabel(self.groupBox)
+        font = QtGui.QFont()
+        font.setPointSize(14)
+        font.setBold(True)
+        font.setWeight(75)
+        self.label_2.setFont(font)
+        self.label_2.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_2.setObjectName("label_2")
+        self.horizontalLayout.addWidget(self.label_2)
+        self.workCapValue = QtWidgets.QComboBox(self.groupBox)
+        self.workCapValue.setObjectName("workCapValue")
+        self.horizontalLayout.addWidget(self.workCapValue)
+        self.label_14 = QtWidgets.QLabel(self.groupBox)
+        font = QtGui.QFont()
+        font.setPointSize(14)
+        font.setBold(True)
+        font.setWeight(75)
+        self.label_14.setFont(font)
+        self.label_14.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_14.setObjectName("label_14")
+        self.horizontalLayout.addWidget(self.label_14)
+        self.workCapVender = QtWidgets.QComboBox(self.groupBox)
+        self.workCapVender.setObjectName("workCapVender")
+        self.horizontalLayout.addWidget(self.workCapVender)
+        self.horizontalLayout.setStretch(1, 1)
+        self.horizontalLayout.setStretch(3, 1)
+        self.gridLayout.addWidget(self.groupBox, 0, 0, 1, 1)
+        self.groupBox_2 = QtWidgets.QGroupBox(Form)
+        self.groupBox_2.setObjectName("groupBox_2")
+        self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.groupBox_2)
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        self.label_3 = QtWidgets.QLabel(self.groupBox_2)
+        font = QtGui.QFont()
+        font.setPointSize(14)
+        font.setBold(True)
+        font.setWeight(75)
+        self.label_3.setFont(font)
+        self.label_3.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_3.setObjectName("label_3")
+        self.horizontalLayout_2.addWidget(self.label_3)
+        self.blastCapValue = QtWidgets.QComboBox(self.groupBox_2)
+        self.blastCapValue.setObjectName("blastCapValue")
+        self.horizontalLayout_2.addWidget(self.blastCapValue)
+        self.label_5 = QtWidgets.QLabel(self.groupBox_2)
+        font = QtGui.QFont()
+        font.setPointSize(14)
+        font.setBold(True)
+        font.setWeight(75)
+        self.label_5.setFont(font)
+        self.label_5.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_5.setObjectName("label_5")
+        self.horizontalLayout_2.addWidget(self.label_5)
+        self.blastCapVender = QtWidgets.QComboBox(self.groupBox_2)
+        self.blastCapVender.setObjectName("blastCapVender")
+        self.horizontalLayout_2.addWidget(self.blastCapVender)
+        self.horizontalLayout_2.setStretch(1, 1)
+        self.horizontalLayout_2.setStretch(3, 1)
+        self.gridLayout.addWidget(self.groupBox_2, 1, 0, 1, 1)
         self.groupBox_6 = QtWidgets.QGroupBox(Form)
         self.groupBox_6.setObjectName("groupBox_6")
         self.horizontalLayout_9 = QtWidgets.QHBoxLayout(self.groupBox_6)
@@ -38,6 +100,35 @@ class Ui_Form(object):
         self.horizontalLayout_9.addWidget(self.capVoltage)
         self.horizontalLayout_9.setStretch(1, 1)
         self.gridLayout.addWidget(self.groupBox_6, 2, 0, 1, 1)
+        self.groupBox_4 = QtWidgets.QGroupBox(Form)
+        self.groupBox_4.setObjectName("groupBox_4")
+        self.horizontalLayout_4 = QtWidgets.QHBoxLayout(self.groupBox_4)
+        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
+        self.label_9 = QtWidgets.QLabel(self.groupBox_4)
+        font = QtGui.QFont()
+        font.setPointSize(14)
+        font.setBold(True)
+        font.setWeight(75)
+        self.label_9.setFont(font)
+        self.label_9.setObjectName("label_9")
+        self.horizontalLayout_4.addWidget(self.label_9)
+        self.chipVer_1 = QtWidgets.QComboBox(self.groupBox_4)
+        self.chipVer_1.setObjectName("chipVer_1")
+        self.horizontalLayout_4.addWidget(self.chipVer_1)
+        self.label_10 = QtWidgets.QLabel(self.groupBox_4)
+        font = QtGui.QFont()
+        font.setPointSize(14)
+        font.setBold(True)
+        font.setWeight(75)
+        self.label_10.setFont(font)
+        self.label_10.setObjectName("label_10")
+        self.horizontalLayout_4.addWidget(self.label_10)
+        self.chipVer_2 = QtWidgets.QComboBox(self.groupBox_4)
+        self.chipVer_2.setObjectName("chipVer_2")
+        self.horizontalLayout_4.addWidget(self.chipVer_2)
+        self.horizontalLayout_4.setStretch(1, 1)
+        self.horizontalLayout_4.setStretch(3, 1)
+        self.gridLayout.addWidget(self.groupBox_4, 3, 0, 1, 1)
         self.groupBox_3 = QtWidgets.QGroupBox(Form)
         self.groupBox_3.setObjectName("groupBox_3")
         self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.groupBox_3)
@@ -114,90 +205,6 @@ class Ui_Form(object):
         self.horizontalLayout_10.setStretch(1, 1)
         self.gridLayout_2.addLayout(self.horizontalLayout_10, 1, 0, 1, 1)
         self.gridLayout.addWidget(self.groupBox_5, 5, 0, 1, 1)
-        self.horizontalLayout_7 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_7.setObjectName("horizontalLayout_7")
-        self.label = QtWidgets.QLabel(Form)
-        font = QtGui.QFont()
-        font.setPointSize(14)
-        font.setBold(True)
-        font.setWeight(75)
-        self.label.setFont(font)
-        self.label.setObjectName("label")
-        self.horizontalLayout_7.addWidget(self.label)
-        self.versionCode = QtWidgets.QLabel(Form)
-        self.versionCode.setObjectName("versionCode")
-        self.horizontalLayout_7.addWidget(self.versionCode)
-        self.commit = QtWidgets.QPushButton(Form)
-        self.commit.setMinimumSize(QtCore.QSize(120, 35))
-        font = QtGui.QFont()
-        font.setPointSize(14)
-        font.setBold(True)
-        font.setWeight(75)
-        self.commit.setFont(font)
-        self.commit.setObjectName("commit")
-        self.horizontalLayout_7.addWidget(self.commit)
-        self.horizontalLayout_7.setStretch(1, 1)
-        self.gridLayout.addLayout(self.horizontalLayout_7, 7, 0, 1, 1)
-        self.groupBox = QtWidgets.QGroupBox(Form)
-        self.groupBox.setObjectName("groupBox")
-        self.horizontalLayout = QtWidgets.QHBoxLayout(self.groupBox)
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.label_2 = QtWidgets.QLabel(self.groupBox)
-        font = QtGui.QFont()
-        font.setPointSize(14)
-        font.setBold(True)
-        font.setWeight(75)
-        self.label_2.setFont(font)
-        self.label_2.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.label_2.setObjectName("label_2")
-        self.horizontalLayout.addWidget(self.label_2)
-        self.workCapValue = QtWidgets.QComboBox(self.groupBox)
-        self.workCapValue.setObjectName("workCapValue")
-        self.horizontalLayout.addWidget(self.workCapValue)
-        self.label_14 = QtWidgets.QLabel(self.groupBox)
-        font = QtGui.QFont()
-        font.setPointSize(14)
-        font.setBold(True)
-        font.setWeight(75)
-        self.label_14.setFont(font)
-        self.label_14.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.label_14.setObjectName("label_14")
-        self.horizontalLayout.addWidget(self.label_14)
-        self.workCapVender = QtWidgets.QComboBox(self.groupBox)
-        self.workCapVender.setObjectName("workCapVender")
-        self.horizontalLayout.addWidget(self.workCapVender)
-        self.horizontalLayout.setStretch(1, 1)
-        self.horizontalLayout.setStretch(3, 1)
-        self.gridLayout.addWidget(self.groupBox, 0, 0, 1, 1)
-        self.groupBox_4 = QtWidgets.QGroupBox(Form)
-        self.groupBox_4.setObjectName("groupBox_4")
-        self.horizontalLayout_4 = QtWidgets.QHBoxLayout(self.groupBox_4)
-        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
-        self.label_9 = QtWidgets.QLabel(self.groupBox_4)
-        font = QtGui.QFont()
-        font.setPointSize(14)
-        font.setBold(True)
-        font.setWeight(75)
-        self.label_9.setFont(font)
-        self.label_9.setObjectName("label_9")
-        self.horizontalLayout_4.addWidget(self.label_9)
-        self.chipVer_1 = QtWidgets.QComboBox(self.groupBox_4)
-        self.chipVer_1.setObjectName("chipVer_1")
-        self.horizontalLayout_4.addWidget(self.chipVer_1)
-        self.label_10 = QtWidgets.QLabel(self.groupBox_4)
-        font = QtGui.QFont()
-        font.setPointSize(14)
-        font.setBold(True)
-        font.setWeight(75)
-        self.label_10.setFont(font)
-        self.label_10.setObjectName("label_10")
-        self.horizontalLayout_4.addWidget(self.label_10)
-        self.chipVer_2 = QtWidgets.QComboBox(self.groupBox_4)
-        self.chipVer_2.setObjectName("chipVer_2")
-        self.horizontalLayout_4.addWidget(self.chipVer_2)
-        self.horizontalLayout_4.setStretch(1, 1)
-        self.horizontalLayout_4.setStretch(3, 1)
-        self.gridLayout.addWidget(self.groupBox_4, 3, 0, 1, 1)
         self.groupBox_7 = QtWidgets.QGroupBox(Form)
         self.groupBox_7.setObjectName("groupBox_7")
         self.horizontalLayout_8 = QtWidgets.QHBoxLayout(self.groupBox_7)
@@ -217,37 +224,57 @@ class Ui_Form(object):
         self.horizontalLayout_8.addWidget(self.productDate)
         self.horizontalLayout_8.setStretch(1, 1)
         self.gridLayout.addWidget(self.groupBox_7, 6, 0, 1, 1)
-        self.groupBox_2 = QtWidgets.QGroupBox(Form)
-        self.groupBox_2.setObjectName("groupBox_2")
-        self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.groupBox_2)
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.label_3 = QtWidgets.QLabel(self.groupBox_2)
+        self.horizontalLayout_6 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_6.setObjectName("horizontalLayout_6")
+        self.lab_dir = QtWidgets.QLabel(Form)
+        self.lab_dir.setMaximumSize(QtCore.QSize(100, 16777215))
         font = QtGui.QFont()
         font.setPointSize(14)
         font.setBold(True)
         font.setWeight(75)
-        self.label_3.setFont(font)
-        self.label_3.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.label_3.setObjectName("label_3")
-        self.horizontalLayout_2.addWidget(self.label_3)
-        self.blastCapValue = QtWidgets.QComboBox(self.groupBox_2)
-        self.blastCapValue.setObjectName("blastCapValue")
-        self.horizontalLayout_2.addWidget(self.blastCapValue)
-        self.label_5 = QtWidgets.QLabel(self.groupBox_2)
+        self.lab_dir.setFont(font)
+        self.lab_dir.setObjectName("lab_dir")
+        self.horizontalLayout_6.addWidget(self.lab_dir)
+        self.dir = QtWidgets.QLabel(Form)
+        self.dir.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
+        self.dir.setObjectName("dir")
+        self.horizontalLayout_6.addWidget(self.dir)
+        self.change_dir = QtWidgets.QPushButton(Form)
+        self.change_dir.setMinimumSize(QtCore.QSize(100, 35))
+        self.change_dir.setMaximumSize(QtCore.QSize(100, 16777215))
         font = QtGui.QFont()
         font.setPointSize(14)
         font.setBold(True)
         font.setWeight(75)
-        self.label_5.setFont(font)
-        self.label_5.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
-        self.label_5.setObjectName("label_5")
-        self.horizontalLayout_2.addWidget(self.label_5)
-        self.blastCapVender = QtWidgets.QComboBox(self.groupBox_2)
-        self.blastCapVender.setObjectName("blastCapVender")
-        self.horizontalLayout_2.addWidget(self.blastCapVender)
-        self.horizontalLayout_2.setStretch(1, 1)
-        self.horizontalLayout_2.setStretch(3, 1)
-        self.gridLayout.addWidget(self.groupBox_2, 1, 0, 1, 1)
+        self.change_dir.setFont(font)
+        self.change_dir.setObjectName("change_dir")
+        self.horizontalLayout_6.addWidget(self.change_dir)
+        self.gridLayout.addLayout(self.horizontalLayout_6, 7, 0, 1, 1)
+        self.horizontalLayout_7 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_7.setObjectName("horizontalLayout_7")
+        self.label = QtWidgets.QLabel(Form)
+        self.label.setMaximumSize(QtCore.QSize(100, 16777215))
+        font = QtGui.QFont()
+        font.setPointSize(14)
+        font.setBold(True)
+        font.setWeight(75)
+        self.label.setFont(font)
+        self.label.setObjectName("label")
+        self.horizontalLayout_7.addWidget(self.label)
+        self.versionCode = QtWidgets.QLabel(Form)
+        self.versionCode.setObjectName("versionCode")
+        self.horizontalLayout_7.addWidget(self.versionCode)
+        self.commit = QtWidgets.QPushButton(Form)
+        self.commit.setMinimumSize(QtCore.QSize(100, 35))
+        self.commit.setMaximumSize(QtCore.QSize(100, 16777215))
+        font = QtGui.QFont()
+        font.setPointSize(14)
+        font.setBold(True)
+        font.setWeight(75)
+        self.commit.setFont(font)
+        self.commit.setObjectName("commit")
+        self.horizontalLayout_7.addWidget(self.commit)
+        self.gridLayout.addLayout(self.horizontalLayout_7, 8, 0, 1, 1)
 
         self.retranslateUi(Form)
         QtCore.QMetaObject.connectSlotsByName(Form)
@@ -255,8 +282,17 @@ class Ui_Form(object):
     def retranslateUi(self, Form):
         _translate = QtCore.QCoreApplication.translate
         Form.setWindowTitle(_translate("Form", "Form"))
+        self.groupBox.setTitle(_translate("Form", "数字电容"))
+        self.label_2.setText(_translate("Form", "容值"))
+        self.label_14.setText(_translate("Form", "品牌"))
+        self.groupBox_2.setTitle(_translate("Form", "起爆电容"))
+        self.label_3.setText(_translate("Form", "容值"))
+        self.label_5.setText(_translate("Form", "品牌"))
         self.groupBox_6.setTitle(_translate("Form", "数字电容和起爆电容"))
         self.label_8.setText(_translate("Form", "耐压"))
+        self.groupBox_4.setTitle(_translate("Form", "芯片"))
+        self.label_9.setText(_translate("Form", "芯片主版本"))
+        self.label_10.setText(_translate("Form", "芯片次版本"))
         self.groupBox_3.setTitle(_translate("Form", "桥丝"))
         self.label_6.setText(_translate("Form", "引火件形式"))
         self.label_7.setText(_translate("Form", "桥丝规格"))
@@ -264,18 +300,12 @@ class Ui_Form(object):
         self.label_15.setText(_translate("Form", "PCB供应商"))
         self.label_12.setText(_translate("Form", "PCB版本流水号"))
         self.label_13.setText(_translate("Form", "脚线连接方式"))
-        self.label.setText(_translate("Form", "版本代码:"))
-        self.versionCode.setText(_translate("Form", "001122"))
-        self.commit.setText(_translate("Form", "确定"))
-        self.groupBox.setTitle(_translate("Form", "数字电容"))
-        self.label_2.setText(_translate("Form", "容值"))
-        self.label_14.setText(_translate("Form", "品牌"))
-        self.groupBox_4.setTitle(_translate("Form", "芯片"))
-        self.label_9.setText(_translate("Form", "芯片主版本"))
-        self.label_10.setText(_translate("Form", "芯片次版本"))
         self.groupBox_7.setTitle(_translate("Form", "发料日期"))
         self.label_16.setText(_translate("Form", "发料日期"))
         self.productDate.setDisplayFormat(_translate("Form", "yyyy年M月d日"))
-        self.groupBox_2.setTitle(_translate("Form", "起爆电容"))
-        self.label_3.setText(_translate("Form", "容值"))
-        self.label_5.setText(_translate("Form", "品牌"))
+        self.lab_dir.setText(_translate("Form", "默认路径:"))
+        self.dir.setText(_translate("Form", "000500"))
+        self.change_dir.setText(_translate("Form", "更改目录"))
+        self.label.setText(_translate("Form", "版本代码:"))
+        self.versionCode.setText(_translate("Form", "001122"))
+        self.commit.setText(_translate("Form", "确定"))

+ 258 - 186
ScanUtils/ui/VersionSet.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>555</width>
-    <height>637</height>
+    <height>668</height>
    </rect>
   </property>
   <property name="font">
@@ -19,6 +19,104 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>数字电容</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,0,1">
+      <item>
+       <widget class="QLabel" name="label_2">
+        <property name="font">
+         <font>
+          <pointsize>14</pointsize>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>容值</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="workCapValue"/>
+      </item>
+      <item>
+       <widget class="QLabel" name="label_14">
+        <property name="font">
+         <font>
+          <pointsize>14</pointsize>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>品牌</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="workCapVender"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>起爆电容</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,1,0,1">
+      <item>
+       <widget class="QLabel" name="label_3">
+        <property name="font">
+         <font>
+          <pointsize>14</pointsize>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>容值</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="blastCapValue"/>
+      </item>
+      <item>
+       <widget class="QLabel" name="label_5">
+        <property name="font">
+         <font>
+          <pointsize>14</pointsize>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>品牌</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="blastCapVender"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="2" column="0">
     <widget class="QGroupBox" name="groupBox_6">
      <property name="title">
@@ -48,6 +146,49 @@
      </layout>
     </widget>
    </item>
+   <item row="3" column="0">
+    <widget class="QGroupBox" name="groupBox_4">
+     <property name="title">
+      <string>芯片</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="0,1,0,1">
+      <item>
+       <widget class="QLabel" name="label_9">
+        <property name="font">
+         <font>
+          <pointsize>14</pointsize>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>芯片主版本</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="chipVer_1"/>
+      </item>
+      <item>
+       <widget class="QLabel" name="label_10">
+        <property name="font">
+         <font>
+          <pointsize>14</pointsize>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>芯片次版本</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="chipVer_2"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="4" column="0">
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
@@ -159,143 +300,6 @@
      </layout>
     </widget>
    </item>
-   <item row="7" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,1,0">
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="font">
-        <font>
-         <pointsize>14</pointsize>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>版本代码:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="versionCode">
-       <property name="text">
-        <string>001122</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="commit">
-       <property name="minimumSize">
-        <size>
-         <width>120</width>
-         <height>35</height>
-        </size>
-       </property>
-       <property name="font">
-        <font>
-         <pointsize>14</pointsize>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>确定</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>数字电容</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,0,1">
-      <item>
-       <widget class="QLabel" name="label_2">
-        <property name="font">
-         <font>
-          <pointsize>14</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>容值</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="workCapValue"/>
-      </item>
-      <item>
-       <widget class="QLabel" name="label_14">
-        <property name="font">
-         <font>
-          <pointsize>14</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>品牌</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="workCapVender"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QGroupBox" name="groupBox_4">
-     <property name="title">
-      <string>芯片</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="0,1,0,1">
-      <item>
-       <widget class="QLabel" name="label_9">
-        <property name="font">
-         <font>
-          <pointsize>14</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>芯片主版本</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="chipVer_1"/>
-      </item>
-      <item>
-       <widget class="QLabel" name="label_10">
-        <property name="font">
-         <font>
-          <pointsize>14</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>芯片次版本</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="chipVer_2"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="6" column="0">
     <widget class="QGroupBox" name="groupBox_7">
      <property name="title">
@@ -343,54 +347,122 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>起爆电容</string>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,1,0,1">
-      <item>
-       <widget class="QLabel" name="label_3">
-        <property name="font">
-         <font>
-          <pointsize>14</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>容值</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="blastCapValue"/>
-      </item>
-      <item>
-       <widget class="QLabel" name="label_5">
-        <property name="font">
-         <font>
-          <pointsize>14</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>品牌</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QComboBox" name="blastCapVender"/>
-      </item>
-     </layout>
-    </widget>
+   <item row="7" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_6">
+     <item>
+      <widget class="QLabel" name="lab_dir">
+       <property name="maximumSize">
+        <size>
+         <width>100</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>14</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>默认路径:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="dir">
+       <property name="text">
+        <string>000500</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="change_dir">
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>35</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>100</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>14</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>更改目录</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="8" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_7">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="maximumSize">
+        <size>
+         <width>100</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>14</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>版本代码:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="versionCode">
+       <property name="text">
+        <string>001122</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="commit">
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>35</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>100</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>14</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>确定</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>