首页 发现 帮助
登录
maixinrong
/
Calculation
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

MaiXinRong 5 年之前
父节点
73d9baf87c 65521d340c
当前提交
e6f3bcc15b
共有 3 个文件被更改，包括 59 次插入 和 3 次删除
合并视图 显示文件统计
  1. 1 1
      app/public/js/material_list.js
  2. 1 2
      app/view/layout/layout.ejs
  3. 57 0
      sql/update.sql

+ 1 - 1
app/public/js/material_list.js
查看文件 

@@ -100,7 +100,7 @@ $(document).ready(() => {
 
         cols: [
 
         cols: [
 
             {title: '项目节|编号', colSpan: '2|1', rowSpan: '1|1', field: 'code', hAlign: 0, width: 80, formatter: '@'},
 
             {title: '项目节|编号', colSpan: '2|1', rowSpan: '1|1', field: 'code', hAlign: 0, width: 80, formatter: '@'},
 
             {title: '|项目节名称', colSpan: '|1', rowSpan: '|1', field: 'jldy', hAlign: 0, width: 100, formatter: '@'},
 
             {title: '|项目节名称', colSpan: '|1', rowSpan: '|1', field: 'jldy', hAlign: 0, width: 100, formatter: '@'},
 
-            {title: '部位明细|部位明细', colSpan: '2|1', rowSpan: '1|1', field: 'bwmx', hAlign: 0, width: 100, formatter: '@'},
 
+            {title: '计量单元|计量单元', colSpan: '2|1', rowSpan: '1|1', field: 'bwmx', hAlign: 0, width: 100, formatter: '@'},
 
             {title: '|复核数量', colSpan: '|1', rowSpan: '|1', field: 'quantity', hAlign: 0, width: 80, type: 'Number'},
 
             {title: '|复核数量', colSpan: '|1', rowSpan: '|1', field: 'quantity', hAlign: 0, width: 80, type: 'Number'},
 
             {title: '部位信息|单位工程', colSpan: '3|1', rowSpan: '1|1', field: 'dwgc', hAlign: 0, width: 100, formatter: '@'},
 
             {title: '部位信息|单位工程', colSpan: '3|1', rowSpan: '1|1', field: 'dwgc', hAlign: 0, width: 100, formatter: '@'},
 
             {title: '|分部工程', colSpan: '|1', rowSpan: '|1', field: 'fbgc', hAlign: 0, width: 100, formatter: '@'},
 
             {title: '|分部工程', colSpan: '|1', rowSpan: '|1', field: 'fbgc', hAlign: 0, width: 100, formatter: '@'},

+ 1 - 2
app/view/layout/layout.ejs
查看文件 

@@ -21,8 +21,7 @@
 
     <% } %>
 
     <% } %>
 
 </head>
 
 </head>
 
 
 
-<!--<body oncontextmenu="return false;"> &lt;!&ndash;屏蔽input鼠标右键&ndash;&gt;-->
 
-<body> <!--屏蔽input鼠标右键-->
 
+<body oncontextmenu="return false;">
 
 <div>
 
 <div>
 
 
 
 </div>
 
 </div>

+ 57 - 0
sql/update.sql
查看文件 

@@ -50,6 +50,60 @@ INSERT INTO `zh_maintain` (`id`, `maintain_time`, `duration`, `msg`, `status`) V
 
 (1, '', 2, '', 0);
 
 (1, '', 2, '', 0);
 
 
 
 -- ----------------------------
 
 -- ----------------------------
 
+-- zh_message add column 创建者id
 
+-- ----------------------------
 
+ALTER TABLE `zh_message`
 
+ADD COLUMN `create_uid` int(11) DEFAULT NULL COMMENT '创建者id' AFTER `create_time`;
 
+
 
+-- ----------------------------
 
+-- zh_message add column 项目id
 
+-- ----------------------------
 
+ALTER TABLE `zh_message`
 
+ADD COLUMN `project_id` int(11) DEFAULT NULL COMMENT '项目id，针对项目通知' AFTER `create_uid`;
 
+
 
+-- ----------------------------
 
+-- zh_message add column 是否置顶
 
+-- ----------------------------
 
+ALTER TABLE `zh_message`
 
+ADD COLUMN `istop` varchar(15) NOT NULL DEFAULT '0' COMMENT '是否置顶，0为非置顶，时间戳为置顶时间' AFTER `release_time`;
 
+
 
+-- ----------------------------
 
+-- zh_message change column content
 
+-- ----------------------------
 
+ALTER TABLE `zh_message`
 
+CHANGE `content` `content` text CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '消息内容';
 
+
 
+-- ----------------------------
 
+-- zh_message change column create_time
 
+-- ----------------------------
 
+ALTER TABLE `zh_message`
 
+CHANGE `create_time` `create_time` varchar(15) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '创建时间';
 
+
 
+-- ----------------------------
 
+-- zh_message change column creator
 
+-- ----------------------------
 
+ALTER TABLE `zh_message`
 
+CHANGE `creator` `creator` varchar(15) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '创建者';
 
+
 
+-- ----------------------------
 
+-- zh_message change column type
 
+-- ----------------------------
 
+ALTER TABLE `zh_message`
 
+CHANGE `type` `type` tinyint(1) NOT NULL DEFAULT '1' COMMENT '消息类型 1为项目 2为系统';
 
+
 
+-- ----------------------------
 
+-- zh_message change column status
 
+-- ----------------------------
 
+ALTER TABLE `zh_message`
 
+CHANGE `status` `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '消息状态，1：已发布，2：未发布';
 
+
 
+-- ----------------------------
 
+-- zh_message change column release_time
 
+-- ----------------------------
 
+ALTER TABLE `zh_message`
 
+CHANGE `release_time` `release_time` int(10) NOT NULL DEFAULT '0' COMMENT '发布时间';
 
+
 
+-- ----------------------------
 
 -- zh_project add column 是否定制项目
 
 -- zh_project add column 是否定制项目
 
 -- ----------------------------
 
 -- ----------------------------
 
 ALTER TABLE `zh_project`
 
 ALTER TABLE `zh_project`
 
@@ -79,3 +133,6 @@ ADD COLUMN `bind` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否已绑定定制
 
 INSERT INTO `calculation`.`zh_permission` (`id`, `name`, `controller`, `action`, `pid`, `icon_class`, `create_time`, `isshow`) VALUES ('67', '系统维护', 'maintain', '', '11', '', NULL, '1');
 
 INSERT INTO `calculation`.`zh_permission` (`id`, `name`, `controller`, `action`, `pid`, `icon_class`, `create_time`, `isshow`) VALUES ('67', '系统维护', 'maintain', '', '11', '', NULL, '1');
 
 INSERT INTO `calculation`.`zh_permission` (`id`, `name`, `controller`, `action`, `pid`, `icon_class`, `create_time`, `isshow`) VALUES ('68', '第三方接口', 'project', 'api2other', '38', 'api2other', NULL, '1');
 
 INSERT INTO `calculation`.`zh_permission` (`id`, `name`, `controller`, `action`, `pid`, `icon_class`, `create_time`, `isshow`) VALUES ('68', '第三方接口', 'project', 'api2other', '38', 'api2other', NULL, '1');
 
 INSERT INTO `calculation`.`zh_permission` (`id`, `name`, `controller`, `action`, `pid`, `icon_class`, `create_time`, `isshow`) VALUES ('69', '第三方接口设置', 'project', 'api2otherSave', '38', '', NULL, '1');
 
 INSERT INTO `calculation`.`zh_permission` (`id`, `name`, `controller`, `action`, `pid`, `icon_class`, `create_time`, `isshow`) VALUES ('69', '第三方接口设置', 'project', 'api2otherSave', '38', '', NULL, '1');
 
+
 
+update `calculation`.`zh_permission` set `name` = '消息通知', `isshow` = 1 where `id` = 31;
 
+update `calculation`.`zh_permission` set `create_time` = '1' where `id` = 62;