Merge branch 'master' of http://h.gemho.cn:7099/caicaicai/truckDispatching

package.json

@@ -33,7 +33,6 @@
     "url": "https://github.com/elunez/eladmin/issues"
   },
   "dependencies": {
-    "recorder-core": "*",
     "@riophae/vue-treeselect": "0.4.0",
     "axios": "^0.21.1",
     "clipboard": "2.0.4",
@@ -42,14 +41,14 @@
     "core-js": "^2.6.12",
     "echarts": "^4.2.1",
     "echarts-gl": "^1.1.1",
-    "echarts-liquidfill": "^2.0.6",
+    "echarts-liquidfill": "^3.1.0",
     "echarts-wordcloud": "^1.1.3",
-    "element-ui": "^2.13.2",
     "ezuikit-js": "0.0.7",
-    "hls.js": "^1.0.12",
-    "jquery": "^3.6.0",
+    "element-ui":"2.15.8",
     "file-saver": "1.3.8",
     "fuse.js": "3.4.4",
+    "hls.js": "^1.0.12",
+    "jquery": "^3.6.0",
     "js-beautify": "^1.10.2",
     "js-cookie": "2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
@@ -60,6 +59,7 @@
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
     "qs": "^6.9.1",
+    "recorder-core": "*",
     "screenfull": "4.2.0",
     "sortablejs": "1.8.4",
     "vue": "2.6.10",

src/views/carManagement/carInformation/index.vue

@@ -13,7 +13,7 @@
 					<el-option v-for="(obj,index) in selectList" :label="obj.name" :value="obj.name" :key="index"></el-option>
 				</el-select>
 
-				<label class="el-form-item-label" style="font-weight: 500;">卡车类型</label>
+				<label class="el-form-item-label" style="font-weight: 500;">车辆类型</label>
 				<el-select v-model="query.carclass" placeholder="请选择卡车类型" style="width:180px;">
 					<el-option label="挖机" value="挖机"></el-option>
 					<el-option label="铲车" value="铲车"></el-option>

src/views/productionPlanManagement/productionPlan/index.vue

@@ -37,6 +37,39 @@
 				<el-form-item label="生产计划月份" prop="month">
 					<el-date-picker v-model="form.item.month" type="month" placeholder="选择月份" style="width:280px;"></el-date-picker>
 				</el-form-item>
+        <el-table :data="formTable" style="width: 100%">
+            <el-table-column prop="id" label="采区">
+              <template slot-scope="scope">
+                <el-input
+                  size="small"
+                  v-model="scope.row.id"
+                  v-show="scope.row.showEdit"
+                  placeholder="请输入内容"
+                ></el-input>
+                <span v-show="!scope.row.showEdit">{{scope.row.id}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="计划量(kg)">
+              <template slot-scope="scope">
+                <el-input
+                  size="small"
+                  v-model="scope.row.name"
+                  v-show="scope.row.showEdit"
+                  placeholder="请输入内容"
+                ></el-input>
+                <span v-show="!scope.row.showEdit">{{scope.row.name}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button
+                  size="small"
+                  class="btn bg_green"
+                  @click="handleEdit(scope.$index, scope.row)"
+                >{{scope.row.showEdit?'保存':"修改"}}</el-button>
+              </template>
+            </el-table-column>
+        </el-table>
 				<el-form-item label="总计划量(T)" prop="plan">
 					<el-input v-model="form.item.plan" style="width:280px;" placeholder="请输入总计划量(T)"/>
 				</el-form-item>
@@ -49,7 +82,7 @@
 		</el-dialog>
 
 		<!-- 采区计划量设置 -->
-		<el-dialog :title="miningAreaTitle" :visible.sync="dialogTableVisible">
+		<el-dialog :title="miningAreaTitle" :visible.sync="dialogTableVisible" width="60%">
 			<div class="toolbar" style="margin-bottom:15px;">
 				<el-button size="mini" type="primary" icon="el-icon-plus" @click="gradeToAdd">新增</el-button>
 			</div>
@@ -57,6 +90,7 @@
 				<el-table-column property="name" label="采区名称" align="center"></el-table-column>
 				<el-table-column property="plan" label="计划量(T)" align="center"></el-table-column>
 				<el-table-column property="mean" label="平均日产量(T)" align="center"></el-table-column>
+				<el-table-column property="nowPlan" label="今日计划(T)" align="center"></el-table-column>
 				<el-table-column property="total" label="累计完成量(T)" align="center"></el-table-column>
 				<el-table-column property="ratio" label="完成率(%)" align="center"></el-table-column>
 				<el-table-column label="操作" align="center" fixed="right">
@@ -99,6 +133,22 @@ export default {
 	components: {},
 	data() {
 		return {
+      formTable:[
+	    {
+	      id: '采区1',
+	      name: '8000',
+	      showEdit: false
+	    },
+		{
+	      id: '采区2',
+	      name: '5000',
+	      showEdit: false
+	    },
+		{
+	      id: '采区3',
+	      name: '0',
+	      showEdit: false
+	    }], 
 			imgSrcStart:process.env.VUE_APP_LOCAL_API2,
 			loading: false,
 			page: 1,
@@ -146,6 +196,14 @@ export default {
 		})
 	},
 	methods: {
+    handleEdit(index, row) {
+      console.log(index, row);
+      row.showEdit = !row.showEdit;
+      if (!row.showEdit) {
+        console.log("提交");
+        console.log(row);
+       }
+    },
 		//获取生产计划数据
 		loadData() {
 			var sort = 'createTime,desc';

src/views/regionalManagement/regionalCaiDian/index.vue

@@ -218,6 +218,7 @@ export default {
 			this.form.visible = true;
 			this.form.reqType = 'add';
 			this.form.item = {};
+			this.form.item.areapriority = 1;
 		},
 		toEdit(item) {
 			// 请除表单验证

src/views/regionalManagement/regionalType/index.vue

@@ -75,9 +75,9 @@ export default {
 				item:{},
 			},
 			rules: {
-				// time: [
-				// 	{required: true, message: '请输入车辆型号', trigger: 'blur' }
-				// ],
+				classname: [
+					{required: true, message: '请输入类型名称', trigger: 'blur' }
+				],
 			},
 		}
 	},