diff --git a/client/WorkCameraExport/Forms/WorkRecordForm.Designer.cs b/client/WorkCameraExport/Forms/WorkRecordForm.Designer.cs
index 8a44d32..ff0ff6e 100644
--- a/client/WorkCameraExport/Forms/WorkRecordForm.Designer.cs
+++ b/client/WorkCameraExport/Forms/WorkRecordForm.Designer.cs
@@ -1,4 +1,4 @@
-namespace WorkCameraExport.Forms
+namespace WorkCameraExport.Forms
{
partial class WorkRecordForm
{
@@ -29,16 +29,10 @@ namespace WorkCameraExport.Forms
private void InitializeComponent()
{
components = new System.ComponentModel.Container();
-
- // 图片右键菜单
contextMenuImage = new ContextMenuStrip(components);
menuItemDownloadImage = new ToolStripMenuItem();
menuItemCopyUrl = new ToolStripMenuItem();
-
- // 主面板
panelMain = new Panel();
-
- // 查询条件区域
grpQuery = new GroupBox();
lblStartDate = new Label();
dtpStartDate = new DateTimePicker();
@@ -56,8 +50,6 @@ namespace WorkCameraExport.Forms
cboStatus = new ComboBox();
btnSearch = new Button();
btnReset = new Button();
-
- // 工具栏区域
panelToolbar = new Panel();
btnAdd = new Button();
btnExportAll = new Button();
@@ -65,8 +57,6 @@ namespace WorkCameraExport.Forms
btnDelete = new Button();
chkSelectAll = new CheckBox();
lblSelectedCount = new Label();
-
- // 数据列表区域
dgvWorkRecords = new DataGridView();
colSelect = new DataGridViewCheckBoxColumn();
colId = new DataGridViewTextBoxColumn();
@@ -79,8 +69,6 @@ namespace WorkCameraExport.Forms
colRecordTime = new DataGridViewTextBoxColumn();
colRemarks = new DataGridViewTextBoxColumn();
colOperations = new DataGridViewButtonColumn();
-
- // 分页控件区域
panelPaging = new Panel();
btnFirstPage = new Button();
btnPrevPage = new Button();
@@ -90,16 +78,12 @@ namespace WorkCameraExport.Forms
lblTotalInfo = new Label();
cboPageSize = new ComboBox();
lblPageSize = new Label();
-
- // 状态栏
lblStatusBar = new Label();
-
- // 进度条面板
panelProgress = new Panel();
progressBar = new ProgressBar();
lblProgress = new Label();
btnCancelExport = new Button();
-
+ contextMenuImage.SuspendLayout();
panelMain.SuspendLayout();
grpQuery.SuspendLayout();
panelToolbar.SuspendLayout();
@@ -107,7 +91,26 @@ namespace WorkCameraExport.Forms
panelPaging.SuspendLayout();
panelProgress.SuspendLayout();
SuspendLayout();
-
+ //
+ // contextMenuImage
+ //
+ contextMenuImage.Items.AddRange(new ToolStripItem[] { menuItemDownloadImage, menuItemCopyUrl });
+ contextMenuImage.Name = "contextMenuImage";
+ contextMenuImage.Size = new Size(125, 48);
+ //
+ // menuItemDownloadImage
+ //
+ menuItemDownloadImage.Name = "menuItemDownloadImage";
+ menuItemDownloadImage.Size = new Size(124, 22);
+ menuItemDownloadImage.Text = "下载图片";
+ menuItemDownloadImage.Click += menuItemDownloadImage_Click;
+ //
+ // menuItemCopyUrl
+ //
+ menuItemCopyUrl.Name = "menuItemCopyUrl";
+ menuItemCopyUrl.Size = new Size(124, 22);
+ menuItemCopyUrl.Text = "复制URL";
+ menuItemCopyUrl.Click += menuItemCopyUrl_Click;
//
// panelMain
//
@@ -124,9 +127,8 @@ namespace WorkCameraExport.Forms
panelMain.Padding = new Padding(10);
panelMain.Size = new Size(1200, 700);
panelMain.TabIndex = 0;
-
//
- // grpQuery - 查询条件区域
+ // grpQuery
//
grpQuery.Controls.Add(lblStartDate);
grpQuery.Controls.Add(dtpStartDate);
@@ -146,14 +148,13 @@ namespace WorkCameraExport.Forms
grpQuery.Controls.Add(btnReset);
grpQuery.Dock = DockStyle.Top;
grpQuery.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Bold);
- grpQuery.Location = new Point(10, 10);
+ grpQuery.Location = new Point(10, 55);
grpQuery.Name = "grpQuery";
grpQuery.Padding = new Padding(10);
grpQuery.Size = new Size(1180, 110);
grpQuery.TabIndex = 0;
grpQuery.TabStop = false;
grpQuery.Text = "查询条件";
-
//
// lblStartDate
//
@@ -164,7 +165,6 @@ namespace WorkCameraExport.Forms
lblStartDate.Size = new Size(56, 17);
lblStartDate.TabIndex = 0;
lblStartDate.Text = "开始日期";
-
//
// dtpStartDate
//
@@ -174,7 +174,6 @@ namespace WorkCameraExport.Forms
dtpStartDate.Name = "dtpStartDate";
dtpStartDate.Size = new Size(110, 23);
dtpStartDate.TabIndex = 1;
-
//
// lblEndDate
//
@@ -185,7 +184,6 @@ namespace WorkCameraExport.Forms
lblEndDate.Size = new Size(56, 17);
lblEndDate.TabIndex = 2;
lblEndDate.Text = "结束日期";
-
//
// dtpEndDate
//
@@ -195,7 +193,6 @@ namespace WorkCameraExport.Forms
dtpEndDate.Name = "dtpEndDate";
dtpEndDate.Size = new Size(110, 23);
dtpEndDate.TabIndex = 3;
-
//
// lblDeptName
//
@@ -206,7 +203,6 @@ namespace WorkCameraExport.Forms
lblDeptName.Size = new Size(56, 17);
lblDeptName.TabIndex = 4;
lblDeptName.Text = "部门名称";
-
//
// txtDeptName
//
@@ -216,7 +212,6 @@ namespace WorkCameraExport.Forms
txtDeptName.PlaceholderText = "部门名称";
txtDeptName.Size = new Size(120, 23);
txtDeptName.TabIndex = 5;
-
//
// lblAddress
//
@@ -227,7 +222,6 @@ namespace WorkCameraExport.Forms
lblAddress.Size = new Size(56, 17);
lblAddress.TabIndex = 6;
lblAddress.Text = "拍照地址";
-
//
// txtAddress
//
@@ -237,7 +231,6 @@ namespace WorkCameraExport.Forms
txtAddress.PlaceholderText = "拍照地址";
txtAddress.Size = new Size(140, 23);
txtAddress.TabIndex = 7;
-
//
// lblContent
//
@@ -248,7 +241,6 @@ namespace WorkCameraExport.Forms
lblContent.Size = new Size(56, 17);
lblContent.TabIndex = 8;
lblContent.Text = "工作内容";
-
//
// txtContent
//
@@ -258,7 +250,6 @@ namespace WorkCameraExport.Forms
txtContent.PlaceholderText = "工作内容";
txtContent.Size = new Size(140, 23);
txtContent.TabIndex = 9;
-
//
// lblWorkerName
//
@@ -269,7 +260,6 @@ namespace WorkCameraExport.Forms
lblWorkerName.Size = new Size(56, 17);
lblWorkerName.TabIndex = 10;
lblWorkerName.Text = "施工人员";
-
//
// txtWorkerName
//
@@ -279,7 +269,6 @@ namespace WorkCameraExport.Forms
txtWorkerName.PlaceholderText = "施工人员";
txtWorkerName.Size = new Size(100, 23);
txtWorkerName.TabIndex = 11;
-
//
// lblStatus
//
@@ -290,7 +279,6 @@ namespace WorkCameraExport.Forms
lblStatus.Size = new Size(32, 17);
lblStatus.TabIndex = 12;
lblStatus.Text = "状态";
-
//
// cboStatus
//
@@ -302,7 +290,6 @@ namespace WorkCameraExport.Forms
cboStatus.Name = "cboStatus";
cboStatus.Size = new Size(80, 25);
cboStatus.TabIndex = 13;
-
//
// btnSearch
//
@@ -319,7 +306,6 @@ namespace WorkCameraExport.Forms
btnSearch.Text = "查询";
btnSearch.UseVisualStyleBackColor = false;
btnSearch.Click += btnSearch_Click;
-
//
// btnReset
//
@@ -336,9 +322,8 @@ namespace WorkCameraExport.Forms
btnReset.Text = "重置";
btnReset.UseVisualStyleBackColor = false;
btnReset.Click += btnReset_Click;
-
//
- // panelToolbar - 工具栏区域
+ // panelToolbar
//
panelToolbar.BackColor = Color.FromArgb(248, 249, 250);
panelToolbar.Controls.Add(btnAdd);
@@ -348,17 +333,17 @@ namespace WorkCameraExport.Forms
panelToolbar.Controls.Add(chkSelectAll);
panelToolbar.Controls.Add(lblSelectedCount);
panelToolbar.Dock = DockStyle.Top;
- panelToolbar.Location = new Point(10, 120);
+ panelToolbar.Location = new Point(10, 10);
panelToolbar.Name = "panelToolbar";
panelToolbar.Padding = new Padding(10, 5, 10, 5);
panelToolbar.Size = new Size(1180, 45);
panelToolbar.TabIndex = 1;
-
//
// btnAdd
//
btnAdd.BackColor = Color.FromArgb(40, 167, 69);
btnAdd.Cursor = Cursors.Hand;
+ btnAdd.Visible = false; // 隐藏新增按钮
btnAdd.FlatAppearance.BorderSize = 0;
btnAdd.FlatStyle = FlatStyle.Flat;
btnAdd.Font = new Font("Microsoft YaHei UI", 9F, FontStyle.Bold);
@@ -370,8 +355,6 @@ namespace WorkCameraExport.Forms
btnAdd.Text = "➕ 新增";
btnAdd.UseVisualStyleBackColor = false;
btnAdd.Click += btnAdd_Click;
- btnAdd.Enabled = false; // 禁用新增按钮
-
//
// btnExportAll
//
@@ -388,7 +371,6 @@ namespace WorkCameraExport.Forms
btnExportAll.Text = "📥 导出全部";
btnExportAll.UseVisualStyleBackColor = false;
btnExportAll.Click += btnExportAll_Click;
-
//
// btnExportSelected
//
@@ -406,7 +388,6 @@ namespace WorkCameraExport.Forms
btnExportSelected.Text = "📥 导出所选";
btnExportSelected.UseVisualStyleBackColor = false;
btnExportSelected.Click += btnExportSelected_Click;
-
//
// btnDelete
//
@@ -424,7 +405,6 @@ namespace WorkCameraExport.Forms
btnDelete.Text = "🗑️ 删除";
btnDelete.UseVisualStyleBackColor = false;
btnDelete.Click += btnDelete_Click;
-
//
// chkSelectAll
//
@@ -432,12 +412,11 @@ namespace WorkCameraExport.Forms
chkSelectAll.Font = new Font("Microsoft YaHei UI", 9F);
chkSelectAll.Location = new Point(430, 13);
chkSelectAll.Name = "chkSelectAll";
- chkSelectAll.Size = new Size(63, 21);
+ chkSelectAll.Size = new Size(51, 21);
chkSelectAll.TabIndex = 4;
chkSelectAll.Text = "全选";
chkSelectAll.UseVisualStyleBackColor = true;
chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged;
-
//
// lblSelectedCount
//
@@ -446,12 +425,11 @@ namespace WorkCameraExport.Forms
lblSelectedCount.ForeColor = Color.FromArgb(102, 102, 102);
lblSelectedCount.Location = new Point(510, 14);
lblSelectedCount.Name = "lblSelectedCount";
- lblSelectedCount.Size = new Size(68, 17);
+ lblSelectedCount.Size = new Size(71, 17);
lblSelectedCount.TabIndex = 5;
lblSelectedCount.Text = "已选择 0 条";
-
//
- // dgvWorkRecords - 数据列表
+ // dgvWorkRecords
//
dgvWorkRecords.AllowUserToAddRows = false;
dgvWorkRecords.AllowUserToDeleteRows = false;
@@ -461,9 +439,7 @@ namespace WorkCameraExport.Forms
dgvWorkRecords.BorderStyle = BorderStyle.Fixed3D;
dgvWorkRecords.CellBorderStyle = DataGridViewCellBorderStyle.SingleHorizontal;
dgvWorkRecords.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dgvWorkRecords.Columns.AddRange(new DataGridViewColumn[] {
- colSelect, colId, colDeptName, colImages, colAddress,
- colContent, colWorkers, colStatusName, colRecordTime, colRemarks, colOperations });
+ dgvWorkRecords.Columns.AddRange(new DataGridViewColumn[] { colSelect, colId, colDeptName, colImages, colAddress, colContent, colWorkers, colStatusName, colRecordTime, colRemarks, colOperations });
dgvWorkRecords.Font = new Font("Microsoft YaHei UI", 9F);
dgvWorkRecords.GridColor = Color.FromArgb(230, 230, 230);
dgvWorkRecords.Location = new Point(10, 165);
@@ -476,101 +452,87 @@ namespace WorkCameraExport.Forms
dgvWorkRecords.TabIndex = 2;
dgvWorkRecords.CellClick += dgvWorkRecords_CellClick;
dgvWorkRecords.CellContentClick += dgvWorkRecords_CellContentClick;
- dgvWorkRecords.CellPainting += dgvWorkRecords_CellPainting;
dgvWorkRecords.CellMouseClick += dgvWorkRecords_CellMouseClick;
-
+ dgvWorkRecords.CellPainting += dgvWorkRecords_CellPainting;
//
- // colSelect - 选择列
+ // colSelect
//
colSelect.HeaderText = "";
colSelect.Name = "colSelect";
- colSelect.ReadOnly = false;
+ colSelect.ReadOnly = true;
colSelect.Width = 40;
-
//
- // colId - 主键列
+ // colId
//
colId.HeaderText = "ID";
colId.Name = "colId";
colId.ReadOnly = true;
colId.Width = 60;
-
//
- // colDeptName - 部门名称列
+ // colDeptName
//
colDeptName.HeaderText = "部门名称";
colDeptName.Name = "colDeptName";
colDeptName.ReadOnly = true;
- colDeptName.Width = 100;
-
//
- // colImages - 图片列
+ // colImages
//
colImages.HeaderText = "图片";
colImages.Name = "colImages";
colImages.ReadOnly = true;
colImages.Width = 200;
-
//
- // colAddress - 地址列
+ // colAddress
//
colAddress.HeaderText = "拍照地址";
colAddress.Name = "colAddress";
colAddress.ReadOnly = true;
colAddress.Width = 150;
-
//
- // colContent - 工作内容列
+ // colContent
//
colContent.HeaderText = "工作内容";
colContent.Name = "colContent";
colContent.ReadOnly = true;
colContent.Width = 150;
-
//
- // colWorkers - 施工人员列
+ // colWorkers
//
colWorkers.HeaderText = "施工人员";
colWorkers.Name = "colWorkers";
colWorkers.ReadOnly = true;
- colWorkers.Width = 100;
-
//
- // colStatusName - 状态列
+ // colStatusName
//
colStatusName.HeaderText = "状态";
colStatusName.Name = "colStatusName";
colStatusName.ReadOnly = true;
colStatusName.Width = 60;
-
//
- // colRecordTime - 拍照时间列
+ // colRecordTime
//
colRecordTime.HeaderText = "拍照时间";
colRecordTime.Name = "colRecordTime";
colRecordTime.ReadOnly = true;
colRecordTime.Width = 130;
-
//
- // colRemarks - 备注列
+ // colRemarks
//
colRemarks.HeaderText = "备注";
colRemarks.Name = "colRemarks";
colRemarks.ReadOnly = true;
- colRemarks.Width = 100;
-
//
- // colOperations - 操作列
+ // colOperations
//
colOperations.HeaderText = "操作";
colOperations.Name = "colOperations";
+ colOperations.ReadOnly = true;
colOperations.Text = "编辑";
colOperations.UseColumnTextForButtonValue = true;
colOperations.Width = 70;
- colOperations.ReadOnly = true; // 禁用编辑列
-
+ colOperations.Visible = false; // 隐藏编辑列
//
- // panelPaging - 分页控件区域
+ // panelPaging
//
panelPaging.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
panelPaging.BackColor = Color.FromArgb(248, 249, 250);
@@ -586,7 +548,6 @@ namespace WorkCameraExport.Forms
panelPaging.Name = "panelPaging";
panelPaging.Size = new Size(1180, 40);
panelPaging.TabIndex = 3;
-
//
// btnFirstPage
//
@@ -602,7 +563,6 @@ namespace WorkCameraExport.Forms
btnFirstPage.Text = "首页";
btnFirstPage.UseVisualStyleBackColor = false;
btnFirstPage.Click += btnFirstPage_Click;
-
//
// btnPrevPage
//
@@ -618,7 +578,6 @@ namespace WorkCameraExport.Forms
btnPrevPage.Text = "上页";
btnPrevPage.UseVisualStyleBackColor = false;
btnPrevPage.Click += btnPrevPage_Click;
-
//
// lblPageInfo
//
@@ -629,7 +588,6 @@ namespace WorkCameraExport.Forms
lblPageInfo.TabIndex = 2;
lblPageInfo.Text = "第 1 / 1 页";
lblPageInfo.TextAlign = ContentAlignment.MiddleCenter;
-
//
// btnNextPage
//
@@ -645,7 +603,6 @@ namespace WorkCameraExport.Forms
btnNextPage.Text = "下页";
btnNextPage.UseVisualStyleBackColor = false;
btnNextPage.Click += btnNextPage_Click;
-
//
// btnLastPage
//
@@ -661,7 +618,6 @@ namespace WorkCameraExport.Forms
btnLastPage.Text = "末页";
btnLastPage.UseVisualStyleBackColor = false;
btnLastPage.Click += btnLastPage_Click;
-
//
// lblTotalInfo
//
@@ -673,7 +629,6 @@ namespace WorkCameraExport.Forms
lblTotalInfo.TabIndex = 5;
lblTotalInfo.Text = "共 0 条记录";
lblTotalInfo.TextAlign = ContentAlignment.MiddleLeft;
-
//
// cboPageSize
//
@@ -687,7 +642,6 @@ namespace WorkCameraExport.Forms
cboPageSize.Size = new Size(60, 25);
cboPageSize.TabIndex = 6;
cboPageSize.SelectedIndexChanged += cboPageSize_SelectedIndexChanged;
-
//
// lblPageSize
//
@@ -699,9 +653,8 @@ namespace WorkCameraExport.Forms
lblPageSize.Size = new Size(56, 17);
lblPageSize.TabIndex = 7;
lblPageSize.Text = "每页显示";
-
//
- // lblStatusBar - 状态栏
+ // lblStatusBar
//
lblStatusBar.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
lblStatusBar.Font = new Font("Microsoft YaHei UI", 9F);
@@ -712,9 +665,8 @@ namespace WorkCameraExport.Forms
lblStatusBar.TabIndex = 4;
lblStatusBar.Text = "就绪";
lblStatusBar.TextAlign = ContentAlignment.MiddleLeft;
-
//
- // panelProgress - 进度条面板
+ // panelProgress
//
panelProgress.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
panelProgress.BackColor = Color.FromArgb(248, 249, 250);
@@ -726,7 +678,6 @@ namespace WorkCameraExport.Forms
panelProgress.Size = new Size(1180, 40);
panelProgress.TabIndex = 5;
panelProgress.Visible = false;
-
//
// progressBar
//
@@ -735,7 +686,6 @@ namespace WorkCameraExport.Forms
progressBar.Name = "progressBar";
progressBar.Size = new Size(900, 20);
progressBar.TabIndex = 0;
-
//
// lblProgress
//
@@ -747,7 +697,6 @@ namespace WorkCameraExport.Forms
lblProgress.TabIndex = 1;
lblProgress.Text = "导出中...";
lblProgress.TextAlign = ContentAlignment.MiddleLeft;
-
//
// btnCancelExport
//
@@ -765,32 +714,8 @@ namespace WorkCameraExport.Forms
btnCancelExport.Text = "取消";
btnCancelExport.UseVisualStyleBackColor = false;
btnCancelExport.Click += btnCancelExport_Click;
-
//
// WorkRecordForm
- //
- // contextMenuImage
- //
- contextMenuImage.Items.AddRange(new ToolStripItem[] { menuItemDownloadImage, menuItemCopyUrl });
- contextMenuImage.Name = "contextMenuImage";
- contextMenuImage.Size = new Size(150, 48);
-
- //
- // menuItemDownloadImage
- //
- menuItemDownloadImage.Name = "menuItemDownloadImage";
- menuItemDownloadImage.Size = new Size(149, 22);
- menuItemDownloadImage.Text = "下载图片";
- menuItemDownloadImage.Click += menuItemDownloadImage_Click;
-
- //
- // menuItemCopyUrl
- //
- menuItemCopyUrl.Name = "menuItemCopyUrl";
- menuItemCopyUrl.Size = new Size(149, 22);
- menuItemCopyUrl.Text = "复制URL";
- menuItemCopyUrl.Click += menuItemCopyUrl_Click;
-
//
AutoScaleDimensions = new SizeF(7F, 17F);
AutoScaleMode = AutoScaleMode.Font;
@@ -804,6 +729,7 @@ namespace WorkCameraExport.Forms
Text = "工作记录管理";
FormClosing += WorkRecordForm_FormClosing;
Load += WorkRecordForm_Load;
+ contextMenuImage.ResumeLayout(false);
panelMain.ResumeLayout(false);
grpQuery.ResumeLayout(false);
grpQuery.PerformLayout();
@@ -813,7 +739,6 @@ namespace WorkCameraExport.Forms
panelPaging.ResumeLayout(false);
panelPaging.PerformLayout();
panelProgress.ResumeLayout(false);
- contextMenuImage.ResumeLayout(false);
ResumeLayout(false);
}
diff --git a/client/WorkCameraExport/Forms/WorkRecordForm.cs b/client/WorkCameraExport/Forms/WorkRecordForm.cs
index c5670ef..d9ef88c 100644
--- a/client/WorkCameraExport/Forms/WorkRecordForm.cs
+++ b/client/WorkCameraExport/Forms/WorkRecordForm.cs
@@ -1,4 +1,4 @@
-using WorkCameraExport.Models;
+using WorkCameraExport.Models;
using WorkCameraExport.Services;
using WorkCameraExport.Services.Interfaces;
@@ -1064,7 +1064,7 @@ namespace WorkCameraExport.Forms
btnAdd.Enabled = !loading;
btnExportAll.Enabled = !loading;
dgvWorkRecords.Enabled = !loading;
-
+
if (loading)
{
Cursor = Cursors.WaitCursor;
@@ -1090,7 +1090,6 @@ namespace WorkCameraExport.Forms
btnExportSelected.Enabled = !exporting;
btnDelete.Enabled = !exporting;
dgvWorkRecords.Enabled = !exporting;
-
if (exporting)
{
progressBar.Value = 0;
diff --git a/client/WorkCameraExport/Forms/WorkRecordForm.resx b/client/WorkCameraExport/Forms/WorkRecordForm.resx
index 459ff73..b8d6890 100644
--- a/client/WorkCameraExport/Forms/WorkRecordForm.resx
+++ b/client/WorkCameraExport/Forms/WorkRecordForm.resx
@@ -1,5 +1,64 @@
-
+
+
@@ -58,4 +117,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
+ 17, 17
+
+
\ No newline at end of file
diff --git a/server/Zr.Admin.NET/ZR.Vue/src/views/business/CamWorkers.vue b/server/Zr.Admin.NET/ZR.Vue/src/views/business/CamWorkers.vue
index 6b06f43..59eacde 100644
--- a/server/Zr.Admin.NET/ZR.Vue/src/views/business/CamWorkers.vue
+++ b/server/Zr.Admin.NET/ZR.Vue/src/views/business/CamWorkers.vue
@@ -21,10 +21,10 @@
-
+
{{ $t('btn.export') }}
- 下载照片ZIP
+ 下载照片ZIP
diff --git a/server/Zr.Admin.NET/ZR.Vue/src/views/business/CamWorkrecord.vue b/server/Zr.Admin.NET/ZR.Vue/src/views/business/CamWorkrecord.vue
index 90f4135..2e4617d 100644
--- a/server/Zr.Admin.NET/ZR.Vue/src/views/business/CamWorkrecord.vue
+++ b/server/Zr.Admin.NET/ZR.Vue/src/views/business/CamWorkrecord.vue
@@ -54,10 +54,10 @@
- 导出
+ 导出
- 导出所选
+ 导出所选
diff --git a/uniapp/WorkCameraf/common/server.js b/uniapp/WorkCameraf/common/server.js
index 8016c52..0862062 100644
--- a/uniapp/WorkCameraf/common/server.js
+++ b/uniapp/WorkCameraf/common/server.js
@@ -3,8 +3,8 @@ import {
post
} from "./request";
-// var base_url = "https://camera.api.suigongxj.top/";
-var base_url = "https://watermarkcamera.api.zpc-xy.com/";
+var base_url = "https://camera.api.suigongxj.top/";
+// var base_url = "https://watermarkcamera.api.zpc-xy.com/";
export const getBaseUrl = () => {
return base_url;
}
diff --git a/uniapp/WorkCameraf/manifest.json b/uniapp/WorkCameraf/manifest.json
index 7ac8feb..0fedb0e 100644
--- a/uniapp/WorkCameraf/manifest.json
+++ b/uniapp/WorkCameraf/manifest.json
@@ -2,8 +2,8 @@
"name" : "随工水印相机",
"appid" : "__UNI__37E1E71",
"description" : "",
- "versionName" : "1.0.0",
- "versionCode" : "100",
+ "versionName" : "1.0.5",
+ "versionCode" : 105,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {